- Devel - libvirt List Archives

[libvirt] [PATCH v2] qemu: Set reasonable RSS limit on domain startup
by Michal Privoznik 03 Aug '12

03 Aug '12

If there's a memory leak in qemu or qemu is exploited the host's system will sooner or later start trashing instead of killing the bad process. This however has impact on performance and other guests as well. Therefore we should set a reasonable RSS limit even when user hasn't set any. It's better to be secure by default. --- diff to v1: -the expression for reasonable limit adapted to VRAM + XBZRLE (libvirt doesn't override migrate_cache_size yet, so the default 64MB should fit, and it did indeed during my testing) src/qemu/qemu_cgroup.c | 76 +++++++++++++++++++++++++++-------------------- 1 files changed, 44 insertions(+), 32 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index dee9de6..b11d28b 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -339,42 +339,54 @@ int qemuSetupCgroup(struct qemud_driver *driver, } } - if (vm->def->mem.hard_limit != 0 || - vm->def->mem.soft_limit != 0 || - vm->def->mem.swap_hard_limit != 0) { - if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY)) { - if (vm->def->mem.hard_limit != 0) { - rc = virCgroupSetMemoryHardLimit(cgroup, vm->def->mem.hard_limit); - if (rc != 0) { - virReportSystemError(-rc, - _("Unable to set memory hard limit for domain %s"), - vm->def->name); - goto cleanup; - } - } - if (vm->def->mem.soft_limit != 0) { - rc = virCgroupSetMemorySoftLimit(cgroup, vm->def->mem.soft_limit); - if (rc != 0) { - virReportSystemError(-rc, - _("Unable to set memory soft limit for domain %s"), - vm->def->name); - goto cleanup; - } + if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY)) { + unsigned long long hard_limit = vm->def->mem.hard_limit; + + if (!hard_limit) { + /* If there is no hard_limit set, set a reasonable + * one to avoid system trashing caused by exploited qemu. + * As 'reasonable limit' has been chosen: + * (1 + k) * (domain memory + total video memory) + F + * where k = 0.02 and F = 200MB. */ + hard_limit = vm->def->mem.max_balloon; + for (i = 0; i < vm->def->nvideos; i++) + hard_limit += vm->def->videos[i]->vram; + hard_limit = hard_limit * 1.02 + 204800; + } + + rc = virCgroupSetMemoryHardLimit(cgroup, hard_limit); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to set memory hard limit for domain %s"), + vm->def->name); + goto cleanup; + } + if (vm->def->mem.soft_limit != 0) { + rc = virCgroupSetMemorySoftLimit(cgroup, vm->def->mem.soft_limit); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to set memory soft limit for domain %s"), + vm->def->name); + goto cleanup; } + } - if (vm->def->mem.swap_hard_limit != 0) { - rc = virCgroupSetMemSwapHardLimit(cgroup, vm->def->mem.swap_hard_limit); - if (rc != 0) { - virReportSystemError(-rc, - _("Unable to set swap hard limit for domain %s"), - vm->def->name); - goto cleanup; - } + if (vm->def->mem.swap_hard_limit != 0) { + rc = virCgroupSetMemSwapHardLimit(cgroup, vm->def->mem.swap_hard_limit); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to set swap hard limit for domain %s"), + vm->def->name); + goto cleanup; } - } else { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Memory cgroup is not available on this host")); } + } else if (vm->def->mem.hard_limit != 0 || + vm->def->mem.soft_limit != 0 || + vm->def->mem.swap_hard_limit != 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Memory cgroup is not available on this host")); + } else { + VIR_WARN("Could not autoset a RSS limit for domain %s", vm->def->name); } if (vm->def->cputune.shares != 0) { -- 1.7.8.6

2 1

[libvirt] [glib PATCH V1] Add bindings for virDomainSnapshotCreateFlags
by Jovanka Gulicoska 03 Aug '12

03 Aug '12

--- libvirt-gobject/libvirt-gobject-domain.c | 2 +- libvirt-gobject/libvirt-gobject-domain.h | 25 +++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 31aa61a..8820a54 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -1278,7 +1278,7 @@ GList *gvir_domain_get_devices(GVirDomain *domain, * gvir_domain_create_snapshot: * @dom: the domain * @custom_conf: (allow-none): configuration of snapshot or NULL - * @flags: the flags + * @flags: bitwise-OR of #GVirDomainSnapshotCreateFlags * @err: (allow-none):Place-holder for error or NULL * * Returns: (transfer full): snapshot of domain. The returned object should be diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index d10fa8d..f3a36fc 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -130,6 +130,31 @@ typedef enum { GVIR_DOMAIN_SHUTDOWN_GUEST_AGENT = VIR_DOMAIN_SHUTDOWN_GUEST_AGENT, } GVirDomainShutdownFlags; +/** + * GVirDomainSnapshotCreateFlags: + * @GVIR_DOMAIN_SNAPSHOT_NONE: No flags + * @GVIR_DOMAIN_SNAPSHOT_REDEFINE: Restore or alter metadata + * @GVIR_DOMAIN_SNAPSHOT_CURRENT: With redefine, make snapshot current + * @GVIR_DOMAIN_SNAPSHOT_NO_METADATA: Make snapshot without remembering it + * @GVIR_DOMAIN_SNAPSHOT_HALT: Stop running guest after snapshot + * @GVIR_DOMAIN_SNAPSHOT_DISK_ONLY: Disk snapshot, not system checkpoint + * @GVIR_DOMAIN_SNAPSHOT_REUSE_EXT: Reuse any existing external files + * @GVIR_DOMAIN_SNAPSHOT_QUIESCE: Use guest agent to quiesce all mounter + * file systems within the domain + * @GVIR_DOMAIN_SNAPSHOT_ATOMIC: Atomically avoid partial changes + */ +typedef enum { + GVIR_DOMAIN_SNAPSHOT_NONE = 0, + GVIR_DOMAIN_SNAPSHOT_REDEFINE = VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE, + GVIR_DOMAIN_SNAPSHOT_CURRENT = VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT, + GVIR_DOMAIN_SNAPSHOT_NO_METADATA = VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA, + GVIR_DOMAIN_SNAPSHOT_HALT = VIR_DOMAIN_SNAPSHOT_CREATE_HALT, + GVIR_DOMAIN_SNAPSHOT_DISK_ONLY = VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY, + GVIR_DOMAIN_SNAPSHOT_REUSE_EXT = VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT, + GVIR_DOMAIN_SNAPSHOT_QUIESCE = VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE, + GVIR_DOMAIN_SNAPSHOT_ATOMIC = VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC, +} GVirDomainSnapshotCreateFlags; + typedef struct _GVirDomainInfo GVirDomainInfo; struct _GVirDomainInfo { diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 5d15e7a..4e2ef95 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -182,6 +182,7 @@ LIBVIRT_GOBJECT_0.0.9 { LIBVIRT_GOBJECT_0.1.1 { global: gvir_domain_shutdown_flags_get_type; + gvir_domain_snapshot_create_flags_get_type; gvir_domain_xml_flags_get_type; gvir_domain_create_snapshot; -- 1.7.11.2

2 1

[libvirt] [PATCH] build: fix "make rpm"
by Laine Stump 03 Aug '12

03 Aug '12

make rpm was failing with the following error: Entering directory `/home/laine/devel/libvirt/tests' make[2]: *** No rule to make target `viratomicdata.h', needed by `distdir'. Stop. viratomicdata.h is listed in tests/Makefile.am as a dependency of viratomictest, but doesn't exist, is never referenced, and removing that dependency permits make rpm to complete successfully. I'm assuming this was a cut-paste error, or a half-finished idea, but since I didn't know for sure, I didn't push this patch, even though it fixes a broken build. --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index ac26bc5..2fdaace 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -531,7 +531,7 @@ virhashtest_SOURCES = \ virhashtest_LDADD = $(LDADDS) viratomictest_SOURCES = \ - viratomictest.c viratomicdata.h testutils.h testutils.c + viratomictest.c testutils.h testutils.c viratomictest_LDADD = $(LDADDS) jsontest_SOURCES = \ -- 1.7.11.2

2 2

[libvirt] [PATCH] Fix typo s/AM_CLFAGS/AM_CFLAGS/ in sanlock link
by Daniel P. Berrange 03 Aug '12

03 Aug '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Pushed under trivial rule --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index d4c198e..49bcf50 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1455,7 +1455,7 @@ lockdriverdir = $(libdir)/libvirt/lock-driver lockdriver_LTLIBRARIES = sanlock.la sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES) -sanlock_la_CFLAGS = $(AM_CLFAGS) +sanlock_la_CFLAGS = $(AM_CFLAGS) sanlock_la_LDFLAGS = -module -avoid-version sanlock_la_LIBADD = -lsanlock_client \ ../gnulib/lib/libgnu.la -- 1.7.11.2

1 0

[libvirt] [PATCH] Export virUUIDIsValid to libvirt internal code
by Daniel P. Berrange 03 Aug '12

03 Aug '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Pushed under trivial rule --- src/libvirt_private.syms | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 75997fe..44b6652 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1210,6 +1210,7 @@ virGetHostUUID; virSetHostUUIDStr; virUUIDFormat; virUUIDGenerate; +virUUIDIsValid; virUUIDParse; -- 1.7.11.2

1 0

[libvirt] [PATCH] virsh: console: Avoid using stream after being freed.
by Peter Krempa 03 Aug '12

03 Aug '12

The stream object wasn't freed causing a double free attempt. --- tools/console.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/console.c b/tools/console.c index afece27..fee2ce3 100644 --- a/tools/console.c +++ b/tools/console.c @@ -101,6 +101,7 @@ virConsoleShutdown(virConsolePtr con) virStreamEventRemoveCallback(con->st); virStreamAbort(con->st); virStreamFree(con->st); + con->st = NULL; } VIR_FREE(con->streamToTerminal.data); VIR_FREE(con->terminalToStream.data); -- 1.7.8.6

2 2

[libvirt] [PATCH libvirt-glib] gobject: add GVir.DomainShutdownFlags binding
by Marc-André Lureau 03 Aug '12

03 Aug '12

--- libvirt-gobject/libvirt-gobject-domain.c | 2 +- libvirt-gobject/libvirt-gobject-domain.h | 13 +++++++++++++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index ba8e12b..d12ac97 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -509,7 +509,7 @@ gboolean gvir_domain_delete(GVirDomain *dom, /** * gvir_domain_shutdown: * @dom: the domain - * @flags: the flags + * @flags: the %GVirDomainShutdownFlags flags */ gboolean gvir_domain_shutdown(GVirDomain *dom, guint flags G_GNUC_UNUSED, diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 70e7e37..c61a2f5 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -116,6 +116,19 @@ typedef enum { GVIR_DOMAIN_XML_UPDATE_CPU = VIR_DOMAIN_XML_UPDATE_CPU, } GVirDomainXMLFlags; +/** + * GVirDomainShutdownFlags: + * @GVIR_DOMAIN_SHUTDOWN_NONE: No flags, hypervisor choice + * @GVIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN: Send ACPI event + * @GVIR_DOMAIN_SHUTDOWN_GUEST_AGENT: Use guest agent + * + */ +typedef enum { + GVIR_DOMAIN_SHUTDOWN_NONE = 0, + GVIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN = VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN, + GVIR_DOMAIN_SHUTDOWN_GUEST_AGENT = VIR_DOMAIN_SHUTDOWN_GUEST_AGENT, +} GVirDomainShutdownFlags; + typedef struct _GVirDomainInfo GVirDomainInfo; struct _GVirDomainInfo { diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index cc602d3..fe3de97 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -177,6 +177,7 @@ LIBVIRT_GOBJECT_0.0.9 { LIBVIRT_GOBJECT_0.1.1 { global: + gvir_domain_shutdown_flags_get_type; gvir_domain_xml_flags_get_type; } LIBVIRT_GOBJECT_0.0.9; -- 1.7.10.4

2 5

[libvirt] [PATCH] remote: Fill snapshot argument in remoteDomainSnapshotListAllChildren
by Peter Krempa 03 Aug '12

03 Aug '12

The remote driver did not fill the required snapshot parent argument in the RPC call structure that caused a client crash when trying to use this new API. --- src/remote/remote_driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index b9e2127..afd367b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5015,6 +5015,7 @@ remoteDomainSnapshotListAllChildren(virDomainSnapshotPtr parent, args.need_results = !!snapshots; args.flags = flags; + make_nonnull_domain_snapshot(&args.snapshot, parent); memset(&ret, 0, sizeof(ret)); if (call (parent->domain->conn, -- 1.7.8.6

2 2

[libvirt] [glib PATCH V3] Add bindings for virDomainSnapshotCreateXML()
by Jovanka Gulicoska 03 Aug '12

03 Aug '12

--- libvirt-gobject/libvirt-gobject-domain.c | 52 ++++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 7 +++++ libvirt-gobject/libvirt-gobject.sym | 2 ++ 3 files changed, 61 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 861f713..31aa61a 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -1273,3 +1273,55 @@ GList *gvir_domain_get_devices(GVirDomain *domain, return g_list_reverse (ret); } + +/** + * gvir_domain_create_snapshot: + * @dom: the domain + * @custom_conf: (allow-none): configuration of snapshot or NULL + * @flags: the flags + * @err: (allow-none):Place-holder for error or NULL + * + * Returns: (transfer full): snapshot of domain. The returned object should be + * unreffed when no longer needed + */ +GVirDomainSnapshot * +gvir_domain_create_snapshot(GVirDomain *dom, + GVirConfigDomainSnapshot *custom_conf, + guint flags, + GError **err) +{ + GVirDomainPrivate *priv; + virDomainSnapshot *snapshot; + GVirDomainSnapshot *dom_snapshot; + gchar *custom_xml = NULL; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); + + priv = dom->priv; + + if (custom_conf != NULL) + custom_xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(custom_conf)); + + if (!(snapshot = virDomainSnapshotCreateXML(priv->handle, + custom_xml, + flags))) { + const gchar *domain_name = NULL; + domain_name = gvir_domain_get_name(dom); + + gvir_set_error(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to create snapshot of %s", domain_name); + + g_free(custom_xml); + return NULL; + } + + dom_snapshot = GVIR_DOMAIN_SNAPSHOT(g_object_new(GVIR_TYPE_DOMAIN_SNAPSHOT, + "handle", + snapshot, + NULL)); + + g_free(custom_xml); + return dom_snapshot; +} diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index c61a2f5..d10fa8d 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -31,6 +31,7 @@ G_BEGIN_DECLS #include <libvirt-gobject/libvirt-gobject-stream.h> #include <libvirt/libvirt.h> +#include <libvirt-gobject/libvirt-gobject-domain-snapshot.h> #define GVIR_TYPE_DOMAIN (gvir_domain_get_type ()) #define GVIR_DOMAIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_TYPE_DOMAIN, GVirDomain)) @@ -247,6 +248,12 @@ gboolean gvir_domain_get_saved(GVirDomain *dom); GList *gvir_domain_get_devices(GVirDomain *domain, GError **err); +GVirDomainSnapshot * +gvir_domain_create_snapshot(GVirDomain *dom, + GVirConfigDomainSnapshot *custom_conf, + guint flags, + GError **err); + G_END_DECLS #endif /* __LIBVIRT_GOBJECT_DOMAIN_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 8f7bcef..5d15e7a 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -183,6 +183,8 @@ LIBVIRT_GOBJECT_0.1.1 { global: gvir_domain_shutdown_flags_get_type; gvir_domain_xml_flags_get_type; + + gvir_domain_create_snapshot; } LIBVIRT_GOBJECT_0.0.9; # .... define new API here using predicted next version number .... -- 1.7.11.2

3 2

[libvirt] [PATCH v2 0/3] Per-guest S3/S4 configuration
by Martin Kletzander 03 Aug '12

03 Aug '12

There is a way to tell qemu how (not) to advertise S3/S4 ACPI sleep state capability to the guest OS. This series includes the capability to set this in the XML and also covers all the handling from qemu point of view including checking for the support, parameter parsing, command building, checking before sending the signals through guest agent and also tests. -- v2: - Modified the patch to reflect danpb's notes (according to qemu people the setting the disable_s[34] parameter to 0/1 ensures that the states will be enabled/disabled respectively) Martin Kletzander (3): Add per-guest S3/S4 state configuration qemu: Add support for S3/S4 state configuration tests: Add tests for qemu S3/S4 state configuration docs/schemas/domaincommon.rng | 33 ++++++ src/conf/domain_conf.c | 44 +++++++++ src/conf/domain_conf.h | 14 +++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 7 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 103 ++++++++++++++++++++ src/qemu/qemu_driver.c | 17 +++ tests/qemuargv2xmltest.c | 3 + .../qemuxml2argv-misc-disable-s3.args | 4 + .../qemuxml2argv-misc-disable-s3.xml | 27 +++++ .../qemuxml2argv-misc-disable-suspends.args | 4 + .../qemuxml2argv-misc-disable-suspends.xml | 27 +++++ .../qemuxml2argv-misc-enable-s4.args | 4 + .../qemuxml2argv-misc-enable-s4.xml | 27 +++++ tests/qemuxml2argvtest.c | 4 + tests/qemuxml2xmltest.c | 3 + 17 files changed, 325 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml -- 1.7.8.6

4 10