- Devel - libvirt List Archives

[libvirt] [PATCH] Enable JSON and netdev features in QEMU >= 0.13
by Daniel P. Berrange 21 Oct '10

21 Oct '10

The QEMU 0.13 release is finally out and from testing in RHEL-6 we know that its JSON and netdev features are now good enough for us to use by default. * src/qemu/qemu_conf.c: Enable JSON + netdev for QEMU >= 0.13 --- src/qemu/qemu_conf.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 9bb8e95..e2c67a3 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1225,9 +1225,6 @@ static unsigned long long qemudComputeCmdFlags(const char *help, if (strstr(help, "-fsdev")) flags |= QEMUD_CMD_FLAG_FSDEV; - /* Keep disabled till we're actually ready to turn on netdev mode - * The plan is todo it in 0.13.0 QEMU, but lets wait & see... */ -#if 0 if (strstr(help, "-netdev")) { /* Disable -netdev on 0.12 since although it exists, * the corresponding netdev_add/remove monitor commands @@ -1235,7 +1232,7 @@ static unsigned long long qemudComputeCmdFlags(const char *help, if (version >= 13000) flags |= QEMUD_CMD_FLAG_NETDEV; } -#endif + if (strstr(help, "-sdl")) flags |= QEMUD_CMD_FLAG_SDL; if (strstr(help, "cores=") && @@ -1279,12 +1276,14 @@ static unsigned long long qemudComputeCmdFlags(const char *help, if (version >= 10000) flags |= QEMUD_CMD_FLAG_0_10; - /* Keep disabled till we're actually ready to turn on JSON mode - * The plan is todo it in 0.13.0 QEMU, but lets wait & see... */ -#if 0 - if (version >= 13000) + /* While JSON mode was available in 0.12.0, it was too + * incomplete to contemplate using. The 0.13.0 release + * is good enough to use, even though it lacks one or + * two features. The benefits of JSON mode now outweigh + * the downside. + */ + if (version >= 13000) flags |= QEMUD_CMD_FLAG_MONITOR_JSON; -#endif return flags; } -- 1.7.2.3

3 2

[libvirt] Memory ballooning
by Jaromír Červenka 21 Oct '10

21 Oct '10

Hello, is there any possibility to use something like "self-ballooning" in KVM guests? Is there any script/apps which can get actual memory usage from guest and send balloon command to host? Thank you, Jaromir.

1 0

[libvirt] ruby-libvirt and rubygems.org
by Peter Fern 21 Oct '10

21 Oct '10

Hi all, Looking at the ruby-libvirt repository, I can see a 0.2.0 version was tagged in June of this year, however the latest version available on rubygems.org is still 0.1.0 from 2008. Would it be possible for the current maint (Chris?) to take ownership of the gem on rubygems, and push the current version? I can see that some distributions have packaged the new version independently, but life would be made much easier for everyone else if gems were published to rubygems as they're released. Cheers, Pete

2 2

[libvirt] [PATCH] Fix compile errors in remote.c and newly added audit code
by Matthias Bolte 21 Oct '10

21 Oct '10

--- I pushed this under the trivial complie error fix rule :) Matthias daemon/remote.c | 4 ++-- src/util/virtaudit.c | 4 ++-- src/util/virtaudit.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 44609c7..75df9b5 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2233,8 +2233,6 @@ remoteDispatchDomainReboot (struct qemud_server *server ATTRIBUTE_UNUSED, void *ret ATTRIBUTE_UNUSED) { virDomainPtr dom; - char uuidstr[VIR_UUID_STRING_BUFLEN]; - int r; dom = get_nonnull_domain (conn, args->dom); if (dom == NULL) { @@ -2286,6 +2284,8 @@ remoteDispatchDomainResume (struct qemud_server *server ATTRIBUTE_UNUSED, void *ret ATTRIBUTE_UNUSED) { virDomainPtr dom; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + int r; dom = get_nonnull_domain (conn, args->dom); if (dom == NULL) { diff --git a/src/util/virtaudit.c b/src/util/virtaudit.c index 036a8b9..965a6e8 100644 --- a/src/util/virtaudit.c +++ b/src/util/virtaudit.c @@ -1,5 +1,5 @@ /* - * audit.h: auditing support + * virtaudit.c: auditing support * * Copyright (C) 2010 Red Hat, Inc. * @@ -80,7 +80,7 @@ void virAuditSend(const char *file ATTRIBUTE_UNUSED, const char *func, size_t li void virAuditSend(const char *file ATTRIBUTE_UNUSED, const char *func, size_t linenr, const char *clienttty ATTRIBUTE_UNUSED, const char *clientaddr ATTRIBUTE_UNUSED, - enum virAuditRecordType type, bool success, + enum virAuditRecordType type ATTRIBUTE_UNUSED, bool success, const char *fmt, ...) #endif { diff --git a/src/util/virtaudit.h b/src/util/virtaudit.h index b0cb707..f0d9cd7 100644 --- a/src/util/virtaudit.h +++ b/src/util/virtaudit.h @@ -1,5 +1,5 @@ /* - * audit.h: auditing support + * virtaudit.h: auditing support * * Copyright (C) 2010 Red Hat, Inc. * -- 1.7.0.4

3 4

[libvirt] [PATCH] qemu: Exit on first error in qemuDomainGetMemoryParameters
by Matthias Bolte 21 Oct '10

21 Oct '10

There is no point in trying to fill params beyond the first error, because when qemuDomainGetMemoryParameters returns -1 then the caller cannot detect which values in params are valid. --- There is a similar pattern in qemuDomainSetMemoryParameters that tries to apply all given params even if one already failed. From a user's POV it's probably better to apply all params without an error or to apply non at all when one fails. But this is harder to implemeneted and requires a rollback mechanism. src/qemu/qemu_driver.c | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6395c93..ae1d833 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9676,7 +9676,6 @@ static int qemuDomainGetMemoryParameters(virDomainPtr dom, goto cleanup; } - ret = 0; for (i = 0; i < *nparams; i++) { virMemoryParameterPtr param = &params[i]; val = 0; @@ -9689,14 +9688,12 @@ static int qemuDomainGetMemoryParameters(virDomainPtr dom, if (rc != 0) { virReportSystemError(-rc, "%s", _("unable to get memory hard limit")); - ret = -1; - continue; + goto cleanup; } if (virStrcpyStatic(param->field, VIR_DOMAIN_MEMORY_HARD_LIMIT) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field memory hard limit too long for destination")); - ret = -1; - continue; + goto cleanup; } param->value.ul = val; break; @@ -9706,14 +9703,12 @@ static int qemuDomainGetMemoryParameters(virDomainPtr dom, if (rc != 0) { virReportSystemError(-rc, "%s", _("unable to get memory soft limit")); - ret = -1; - continue; + goto cleanup; } if (virStrcpyStatic(param->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field memory soft limit too long for destination")); - ret = -1; - continue; + goto cleanup; } param->value.ul = val; break; @@ -9723,14 +9718,12 @@ static int qemuDomainGetMemoryParameters(virDomainPtr dom, if (rc != 0) { virReportSystemError(-rc, "%s", _("unable to get swap hard limit")); - ret = -1; - continue; + goto cleanup; } if (virStrcpyStatic(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field swap hard limit too long for destination")); - ret = -1; - continue; + goto cleanup; } param->value.ul = val; break; @@ -9741,6 +9734,8 @@ static int qemuDomainGetMemoryParameters(virDomainPtr dom, } } + ret = 0; + cleanup: if (group) virCgroupFree(&group); -- 1.7.0.4

2 2

[libvirt] [PATCH] Fix formatting of the memtune XML element
by Matthias Bolte 21 Oct '10

21 Oct '10

Also output the min_guarantee element when set. --- src/conf/domain_conf.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a997e06..6486f9c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6466,7 +6466,8 @@ char *virDomainDefFormat(virDomainDefPtr def, def->mem.cur_balloon); /* add memtune only if there are any */ - if(def->mem.hard_limit || def->mem.hard_limit || def->mem.hard_limit) + if (def->mem.hard_limit || def->mem.soft_limit || def->mem.min_guarantee || + def->mem.swap_hard_limit) virBufferVSprintf(&buf, " <memtune>\n"); if (def->mem.hard_limit) { virBufferVSprintf(&buf, " <hard_limit>%lu</hard_limit>\n", @@ -6476,11 +6477,16 @@ char *virDomainDefFormat(virDomainDefPtr def, virBufferVSprintf(&buf, " <soft_limit>%lu</soft_limit>\n", def->mem.soft_limit); } + if (def->mem.min_guarantee) { + virBufferVSprintf(&buf, " <min_guarantee>%lu</min_guarantee>\n", + def->mem.min_guarantee); + } if (def->mem.swap_hard_limit) { virBufferVSprintf(&buf, " <swap_hard_limit>%lu</swap_hard_limit>\n", def->mem.swap_hard_limit); } - if(def->mem.hard_limit || def->mem.hard_limit || def->mem.hard_limit) + if (def->mem.hard_limit || def->mem.soft_limit || def->mem.min_guarantee || + def->mem.swap_hard_limit) virBufferVSprintf(&buf, " </memtune>\n"); if (def->mem.hugepage_backed) { -- 1.7.0.4

2 2

[libvirt] [PATCH] virsh: Don't read nparams when virDomainGetMemoryParameters fails
by Matthias Bolte 21 Oct '10

21 Oct '10

Also exit early when nparams is 0. --- tools/virsh.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index d1ef698..3e37b06 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2941,17 +2941,22 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd) if (nparams == 0) { /* get the number of memory parameters */ - if ((virDomainGetMemoryParameters(dom, NULL, &nparams, 0) != 0) && - (nparams != 0)) { + if (virDomainGetMemoryParameters(dom, NULL, &nparams, 0) != 0) { vshError(ctl, "%s", _("Unable to get number of memory parameters")); goto cleanup; } + if (nparams == 0) { + /* nothing to output */ + ret = TRUE; + goto cleanup; + } + /* now go get all the memory parameters */ params = vshMalloc(ctl, sizeof(virMemoryParameter) * nparams); memset(params, 0, sizeof(virMemoryParameter) * nparams); - if (virDomainGetMemoryParameters(dom, params, &nparams, 0)) { + if (virDomainGetMemoryParameters(dom, params, &nparams, 0) != 0) { vshError(ctl, "%s", _("Unable to get memory parameters")); goto cleanup; } @@ -3026,7 +3031,7 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd) } } if (virDomainSetMemoryParameters(dom, params, nparams, 0) != 0) - vshError(ctl, "%s", _("Unable to change Memory Parameters")); + vshError(ctl, "%s", _("Unable to change memory parameters")); else ret = TRUE; } -- 1.7.0.4

2 2

[libvirt] [PATCH] Rename VIR_DOMAIN_SWAP_HARD_LIMIT to VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT
by Matthias Bolte 21 Oct '10

21 Oct '10

To get them under the common VIR_DOMAIN_MEMORY_* prefix. --- include/libvirt/libvirt.h.in | 4 ++-- src/lxc/lxc_driver.c | 4 ++-- src/qemu/qemu_driver.c | 4 ++-- tools/virsh.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 4cdf5b4..81db3a2 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -722,13 +722,13 @@ typedef enum { #define VIR_DOMAIN_MEMORY_MIN_GUARANTEE "min_guarantee" /** - * VIR_DOMAIN_SWAP_HARD_LIMIT: + * VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT: * * Macro for the swap tunable swap_hard_limit: it represents the maximum swap * the guest can use. */ -#define VIR_DOMAIN_SWAP_HARD_LIMIT "swap_hard_limit" +#define VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT "swap_hard_limit" /** * virDomainMemoryParameter: diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 0145d5e..d39b60e 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -746,7 +746,7 @@ static int lxcDomainSetMemoryParameters(virDomainPtr dom, _("unable to set memory soft_limit tunable")); ret = -1; } - } else if (STREQ(param->field, VIR_DOMAIN_SWAP_HARD_LIMIT)) { + } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) { int rc; if (param->type != VIR_DOMAIN_MEMORY_PARAM_ULLONG) { lxcError(VIR_ERR_INVALID_ARG, "%s", @@ -873,7 +873,7 @@ static int lxcDomainGetMemoryParameters(virDomainPtr dom, ret = -1; continue; } - if (virStrcpyStatic(param->field, VIR_DOMAIN_SWAP_HARD_LIMIT) == NULL) { + if (virStrcpyStatic(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT) == NULL) { lxcError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field swap hard limit too long for destination")); ret = -1; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d1ab128..6395c93 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9594,7 +9594,7 @@ static int qemuDomainSetMemoryParameters(virDomainPtr dom, _("unable to set memory soft_limit tunable")); ret = -1; } - } else if (STREQ(param->field, VIR_DOMAIN_SWAP_HARD_LIMIT)) { + } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) { int rc; if (param->type != VIR_DOMAIN_MEMORY_PARAM_ULLONG) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -9726,7 +9726,7 @@ static int qemuDomainGetMemoryParameters(virDomainPtr dom, ret = -1; continue; } - if (virStrcpyStatic(param->field, VIR_DOMAIN_SWAP_HARD_LIMIT) == NULL) { + if (virStrcpyStatic(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT) == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field swap hard limit too long for destination")); ret = -1; diff --git a/tools/virsh.c b/tools/virsh.c index 7fb7fbd..d1ef698 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2894,7 +2894,7 @@ static const vshCmdOptDef opts_memtune[] = { N_("Max memory in kilobytes")}, {VIR_DOMAIN_MEMORY_SOFT_LIMIT, VSH_OT_STRING, VSH_OFLAG_NONE, N_("Memory during contention in kilobytes")}, - {VIR_DOMAIN_SWAP_HARD_LIMIT, VSH_OT_STRING, VSH_OFLAG_NONE, + {VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, VSH_OT_STRING, VSH_OFLAG_NONE, N_("Max swap in kilobytes")}, {VIR_DOMAIN_MEMORY_MIN_GUARANTEE, VSH_OT_STRING, VSH_OFLAG_NONE, N_("Min guaranteed memory in kilobytes")}, @@ -2928,7 +2928,7 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd) nparams++; swap_hard_limit = - vshCommandOptInt(cmd, VIR_DOMAIN_SWAP_HARD_LIMIT, + vshCommandOptInt(cmd, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, &swap_hard_limit); if (swap_hard_limit) nparams++; @@ -3015,7 +3015,7 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd) hard_limit = 0; } else if (swap_hard_limit) { temp->value.ul = swap_hard_limit; - strncpy(temp->field, VIR_DOMAIN_SWAP_HARD_LIMIT, + strncpy(temp->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, sizeof(temp->field)); swap_hard_limit = 0; } else if (min_guarantee) { -- 1.7.0.4

2 2

[libvirt] [PATCH] C#Bindings patch, rename classes
by arnaud.champion＠devatom.fr 21 Oct '10

21 Oct '10

?Hi, here is a new patch. It propose to separate types of function by classes. For example : all virConnect[*] (virConnectOpen, virConnectNumOfDomains, etc...) functions are in the virConnect class. all virDomain[*] (virDomainCreate, virDomainDestroy, etc...) function are in the virDomain class. so we have these classes now : virConnect virDomain virEvent virInterface virLibrary virNetwork virNode virSecret virStoragePool virStorageVol virStream and finally libvirtError I know, the name is not correct, but I can't use virError name because virError is also a structure name :S don't know how to name it. This patch also introduce the DllMap configuration directive in Mono project, with this, the binary library names are correclty automagically changed at runtime (libvirt-0.dll under windows become libvirt.so.0 under linux...) so it guarantee the correct work under windows or linux. Sample code have been updated also to deal with new classes names Regards, Arnaud

3 8

[libvirt] [PATCH] Change/create solution and project for Visual Studio and MonoDevelop for C# bindings
by arnaud.champion＠devatom.fr 21 Oct '10

21 Oct '10

Hi, here are 2 patches for C# libvirt bindings. These patches create a new solution/project couple for Visual Studio 2010 with also a sample code and a solution/project couple for MonoDevelop with a sample code also. The sample code have been tested under .Net/Windows, Mono/Windows and Mono/Linux. And it works, the sample code consist of the using au virConnectOpenAuth and callback handling. It connect to a URI (I have made my tests with ESX hypervisor only) and list domains in a listbox. So, to summarize, code work under linux or windows, the binary library name depends of a project directive (a kind of pragma). When the directive WINDOWS is declared, DllImport will try to find "libvirt-0.dll" (for windows) otherwise it looks for "libvirt.so.0" (for linux). For now, in the same manner, when the directive WINDOWS is declared, we find _strdup in "msvcrt.dll" otherwise we look in "libc.so.6". I'm currently trying to remove strdup call by Custom Marshaling but it seems that .Net (or Mono anyway) doesn't allow to use custom marshaler with structure (and we need it for virConnectCredential structure). If anyone had an idea... Arnaud

2 7