- Devel - libvirt List Archives

[libvirt] [PATCH] docs: improve documents for domxml-from-native and domxml-to-native commands
by ajia＠redhat.com 20 Dec '11

20 Dec '11

From: Alex Jia <ajia(a)redhat.com> * tools/virsh.pod: improve virsh man page for domxml-from-native and domxml-to-native commands. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.pod | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index dbe5165..ca0b993 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -670,12 +670,16 @@ seconds elapsed since the control interface entered its current state. =item B<domxml-from-native> I<format> I<config> Convert the file I<config> in the native guest configuration format -named by I<format> to a domain XML format. +named by I<format> to a domain XML format. For QEMU/KVM hypervisor, +the I<format> argument must be B<qemu-argv>. For Xen hypervisor, the +I<format> argument may be B<xen-xm> or B<xen-sxpr>. =item B<domxml-to-native> I<format> I<xml> Convert the file I<xml> in domain XML format to the native guest -configuration format named by I<format>. +configuration format named by I<format>. For QEMU/KVM hypervisor, +the I<format> argument must be B<qemu-argv>. For Xen hypervisor, the +I<format> argument may be B<xen-xm> or B<xen-sxpr>. =item B<dump> I<domain-id> I<corefilepath> [I<--bypass-cache>] { [I<--live>] | [I<--crash>] | [I<--reset>] } -- 1.7.1

2 1

[libvirt] [PATCH] virsh: plug memory leaks on cmdDomXMLFromNative and cmdDomXMLToNative
by ajia＠redhat.com 20 Dec '11

20 Dec '11

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. Leaks introduced in commit 4d5383f. * tools/virsh.c: fix memory leaks on cmdDomXMLFromNative and cmdDomXMLToNative. * how to reproduce? % virsh dumpxml ${guest} > foo.xml % valgrind -v --leak-check=full virsh domxml-from-native qemu-argv foo.xml % valgrind -v --leak-check=full virsh domxml-to-native qemu-argv foo.xml * actual valgrind results: ==9724== 8,193 bytes in 1 blocks are definitely lost in loss record 31 of 33 ==9724== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==9724== by 0x4A06167: realloc (vg_replace_malloc.c:525) ==9724== by 0x4C7510B: virReallocN (memory.c:161) ==9724== by 0x4C84679: virFileReadLimFD (util.c:394) ==9724== by 0x4C84815: virFileReadAll (util.c:455) ==9724== by 0x41A89F: cmdDomXMLFromNative (virsh.c:5532) ==9724== by 0x414872: vshCommandRun (virsh.c:16464) ==9724== by 0x425623: main (virsh.c:17971) ==9724== ==9724== LEAK SUMMARY: ==9724== definitely lost: 8,193 bytes in 1 blocks ==9724== indirectly lost: 0 bytes in 0 blocks ==9724== possibly lost: 0 bytes in 0 blocks ==9724== still reachable: 127,128 bytes in 1,347 blocks ==7409== 8,193 bytes in 1 blocks are definitely lost in loss record 31 of 33 ==7409== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==7409== by 0x4A06167: realloc (vg_replace_malloc.c:525) ==7409== by 0x4C7510B: virReallocN (memory.c:161) ==7409== by 0x4C84679: virFileReadLimFD (util.c:394) ==7409== by 0x4C84815: virFileReadAll (util.c:455) ==7409== by 0x41A7AF: cmdDomXMLToNative (virsh.c:5578) ==7409== by 0x414892: vshCommandRun (virsh.c:16463) ==7409== by 0x425633: main (virsh.c:17970) ==7409== ==7409== LEAK SUMMARY: ==7409== definitely lost: 8,193 bytes in 1 blocks ==7409== indirectly lost: 0 bytes in 0 blocks ==7409== possibly lost: 0 bytes in 0 blocks ==7409== still reachable: 127,128 bytes in 1,347 blocks Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 583ec6d..784e4f2 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -5540,6 +5540,7 @@ cmdDomXMLFromNative(vshControl *ctl, const vshCmd *cmd) ret = false; } + VIR_FREE(configData); return ret; } @@ -5586,6 +5587,7 @@ cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd) ret = false; } + VIR_FREE(xmlData); return ret; } -- 1.7.1

2 1

[libvirt] [PATCHv2] console: plug memory leaks
by ajia＠redhat.com 20 Dec '11

20 Dec '11

From: Alex Jia <ajia(a)redhat.com> Using 'virReallocN' to allocate memory on virConsoleEventOnStdin, virConsoleEventOnStdout and virConsoleEventOnStream, however, the cleanup function virConsoleShutdown hasn't released these memory. * tools/console.c: fix memory leaks on virConsoleShutdown. https://bugzilla.redhat.com/show_bug.cgi?id=767488 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/console.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/console.c b/tools/console.c index e6118a0..63e51ce 100644 --- a/tools/console.c +++ b/tools/console.c @@ -101,6 +101,10 @@ virConsoleShutdown(virConsolePtr con) virStreamAbort(con->st); virStreamFree(con->st); } + if (con->streamToTerminal.data) + VIR_FREE(con->streamToTerminal.data); + if (con->terminalToStream.data) + VIR_FREE(con->terminalToStream.data); if (con->stdinWatch != -1) virEventRemoveHandle(con->stdinWatch); if (con->stdoutWatch != -1) -- 1.7.1

2 1

[libvirt] [PATCH] qemu: Add a capability flag for -no-acpi
by Michael Ellerman 20 Dec '11

20 Dec '11

Currently non-x86 guests must have <acpi/> defined in <features> to prevent libvirt from running qemu with -no-acpi. Although it works, it is a hack. Instead add a capability flag which indicates whether qemu understands the -no-acpi option. Use it to control whether libvirt emits -no-acpi. Current versions of qemu always display -no-acpi in their help output, so this patch has no effect. However the development version of qemu has been modified such that -no-acpi is only displayed when it is actually supported. Signed-off-by: Michael Ellerman <michael(a)ellerman.id.au> --- src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 6 ++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e69d601..de2bc13 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -142,6 +142,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "cache-unsafe", /* 75 */ "rombar", "ich9-ahci", + "no-acpi", ); struct qemu_feature_flags { @@ -1066,6 +1067,8 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_RTC_TD_HACK); if (strstr(help, "-no-hpet")) qemuCapsSet(flags, QEMU_CAPS_NO_HPET); + if (strstr(help, "-no-acpi")) + qemuCapsSet(flags, QEMU_CAPS_NO_ACPI); if (strstr(help, "-no-kvm-pit-reinjection")) qemuCapsSet(flags, QEMU_CAPS_NO_KVM_PIT); if (strstr(help, "-tdf")) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 00e5214..08d8457 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -115,6 +115,7 @@ enum qemuCapsFlags { QEMU_CAPS_DRIVE_CACHE_UNSAFE = 75, /* Is cache=unsafe supported? */ QEMU_CAPS_PCI_ROMBAR = 76, /* -device rombar=0|1 */ QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */ + QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 92a5955..b241147 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4035,8 +4035,10 @@ qemuBuildCommandLine(virConnectPtr conn, if (monitor_json && qemuCapsGet(qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) virCommandAddArg(cmd, "-no-shutdown"); - if (!(def->features & (1 << VIR_DOMAIN_FEATURE_ACPI))) - virCommandAddArg(cmd, "-no-acpi"); + if (qemuCapsGet(qemuCaps, QEMU_CAPS_NO_ACPI)) { + if (!(def->features & (1 << VIR_DOMAIN_FEATURE_ACPI))) + virCommandAddArg(cmd, "-no-acpi"); + } if (!def->os.bootloader) { /* -- 1.7.7.3

2 1

[libvirt] [PATCHv3 0/8] add command numatune
by Hu Tao 20 Dec '11

20 Dec '11

This series adds a new command numatune to get/set numatune parameters. Besides libnuma, cpuset cgroup parameters are also set according to numatune parameters. But for now, only cpuset.mems is supported. Hu Tao (8): Add functions to set/get cgroup cpuset parameters use cpuset to manage numa add new API virDomain{G,S}etNumaParameters Implement main entries of virDomain{G,S}etNumaParameters Add virDomain{G,S}etNumaParameters support to the remote driver Implement virDomain{G,S}etNumaParameters for the qemu driver add new command numatune to virsh Add document for new command numatune. daemon/remote.c | 64 ++++++++ include/libvirt/libvirt.h.in | 23 +++ python/generator.py | 2 + src/driver.h | 15 ++ src/libvirt.c | 113 ++++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 6 + src/qemu/qemu_cgroup.c | 19 +++ src/qemu/qemu_driver.c | 334 ++++++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 50 +++++++ src/remote/remote_protocol.x | 24 +++- src/remote_protocol-structs | 16 ++ src/util/cgroup.c | 32 ++++ src/util/cgroup.h | 3 + tools/virsh.c | 181 +++++++++++++++++++++++ tools/virsh.pod | 13 ++ 16 files changed, 896 insertions(+), 1 deletions(-) -- 1.7.3.1

3 35

[libvirt] [PATCH] console: plug memory leaks
by ajia＠redhat.com 20 Dec '11

20 Dec '11

From: Alex Jia <ajia(a)redhat.com> Using 'virReallocN' to allocate memory on virConsoleEventOnStdin, virConsoleEventOnStdout and virConsoleEventOnStream, however, the cleanup function virConsoleShutdown hasn't released these memory. * tools/console.c: fix memory leaks on virConsoleShutdown. https://bugzilla.redhat.com/show_bug.cgi?id=767488 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/console.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/console.c b/tools/console.c index e6118a0..86376e4 100644 --- a/tools/console.c +++ b/tools/console.c @@ -101,6 +101,12 @@ virConsoleShutdown(virConsolePtr con) virStreamAbort(con->st); virStreamFree(con->st); } + if (con->streamToTerminal.data) { + VIR_FREE(con->streamToTerminal.data); + } + if (con->terminalToStream.data) { + VIR_FREE(con->terminalToStream.data); + } if (con->stdinWatch != -1) virEventRemoveHandle(con->stdinWatch); if (con->stdoutWatch != -1) -- 1.7.1

3 2

[libvirt] [PATCHv4 0/6] add numatune command
by Eric Blake 20 Dec '11

20 Dec '11

Not quite polished - see my complaints that will require a v5: https://www.redhat.com/archives/libvir-list/2011-December/msg00843.html I'm hoping Hu can help cover the remaining points, as I've already spent quite a bit of time cleaning it up to here. Hu Tao (6): Add functions to set/get cgroup cpuset parameters use cpuset to manage numa add new API virDomain{G, S}etNumaParameters Add virDomain{G, S}etNumaParameters support to the remote driver Implement virDomain{G, S}etNumaParameters for the qemu driver add new command numatune to virsh daemon/remote.c | 64 ++++++++++ include/libvirt/libvirt.h.in | 39 ++++++ python/generator.py | 2 + src/conf/domain_conf.h | 8 -- src/driver.h | 15 +++ src/libvirt.c | 129 +++++++++++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 6 + src/qemu/qemu_cgroup.c | 19 +++ src/qemu/qemu_driver.c | 262 ++++++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 50 ++++++++ src/remote/remote_protocol.x | 24 ++++- src/remote_protocol-structs | 22 ++++ src/util/cgroup.c | 32 +++++ src/util/cgroup.h | 3 + tools/virsh.c | 159 +++++++++++++++++++++++++ tools/virsh.pod | 19 +++ 17 files changed, 846 insertions(+), 9 deletions(-) -- 1.7.7.4

2 10

[libvirt] [PATCH] virsh: Fix a regression of detaching device
by Osier Yang 20 Dec '11

20 Dec '11

Since for node <address>, the values for attrs "domain", "bus", "slot", "function" are all converted to heximal when parsing the XML. However commit ea7182c29 tries to examine if the device represented by the XML from user exists in the domain XML earlier before the XML parsing, and thus if the user use different base to represent the device address, e.g. <address type='pci' domain='0' bus='0' slot='7'/> vshCompleteXMLFromDomain won't find the device, and quit with error "no such device" even if the device does exist. --- tools/virsh.c | 41 +++++++++++++++++++++++++++++++++++------ 1 files changed, 35 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 3654589..5c78995 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -12107,12 +12107,14 @@ vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) { xmlNodePtr child1, child2; xmlAttrPtr attr; - char *prop1, *prop2; + char *prop1 = NULL; + char *prop2 = NULL; bool found; bool visited; bool ret = false; long n1_child_size, n2_child_size, n1_iter; - virBitmapPtr bitmap; + virBitmapPtr bitmap = NULL; + unsigned int prop1_ui, prop2_ui; if (!n1 && !n2) return true; @@ -12129,13 +12131,36 @@ vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) if (attr->type == XML_ATTRIBUTE_NODE) { prop1 = virXMLPropString(n1, (const char *) attr->name); prop2 = virXMLPropString(n2, (const char *) attr->name); - if (STRNEQ_NULLABLE(prop1, prop2)) { - xmlFree(prop1); - xmlFree(prop2); - return false; + + if (STREQ((const char *)n2->name, "address") && + prop1 && prop2 && + (STREQ((const char *)attr->name, "domain") || + STREQ((const char *)attr->name, "bus") || + STREQ((const char *)attr->name, "slot") || + STREQ((const char *)attr->name, "function"))) { + if (virStrToLong_ui(prop1, NULL, 0, &prop1_ui) < 0) { + vshError(NULL, _("can't parse value for %s"), attr->name); + goto cleanup; + } + + if (virStrToLong_ui(prop2, NULL, 0, &prop2_ui) < 0) { + vshError(NULL, _("can't parse value for %s"), attr->name); + goto cleanup; + } + + if (prop1_ui != prop2_ui) { + goto cleanup; + } + } else { + if (STRNEQ_NULLABLE(prop1, prop2)) { + goto cleanup; + } } + xmlFree(prop1); + prop1 = NULL; xmlFree(prop2); + prop2 = NULL; } attr = attr->next; } @@ -12207,6 +12232,10 @@ vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) ret = true; cleanup: + if (prop1) + xmlFree(prop1); + if (prop2) + xmlFree(prop2); virBitmapFree(bitmap); return ret; } -- 1.7.7.3

2 3

[libvirt] [PATCH] virsh: simply printing of typed parameters
by Eric Blake 20 Dec '11

20 Dec '11

No need to repeat code for formatting typed parameters. * tools/virsh.c (vshGetTypedParamValue): Support strings. (cmdSchedinfo, cmdBlkiotune, cmdMemtune, cmdBlkdeviotune): Use it for less code. --- tools/virsh.c | 134 +++++++++------------------------------------------------ 1 files changed, 21 insertions(+), 113 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 3654589..a3ec7e9 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2975,28 +2975,9 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) ret_val = true; for (i = 0; i < nparams; i++) { - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - vshPrint(ctl, "%-15s: %d\n", params[i].field, params[i].value.i); - break; - case VIR_TYPED_PARAM_UINT: - vshPrint(ctl, "%-15s: %u\n", params[i].field, params[i].value.ui); - break; - case VIR_TYPED_PARAM_LLONG: - vshPrint(ctl, "%-15s: %lld\n", params[i].field, params[i].value.l); - break; - case VIR_TYPED_PARAM_ULLONG: - vshPrint(ctl, "%-15s: %llu\n", params[i].field, params[i].value.ul); - break; - case VIR_TYPED_PARAM_DOUBLE: - vshPrint(ctl, "%-15s: %f\n", params[i].field, params[i].value.d); - break; - case VIR_TYPED_PARAM_BOOLEAN: - vshPrint(ctl, "%-15s: %d\n", params[i].field, params[i].value.b); - break; - default: - vshPrint(ctl, "not implemented scheduler parameter type\n"); - } + char *str = vshGetTypedParamValue(ctl, &params[i]); + vshPrint(ctl, "%-15s: %s\n", params[i].field, str); + VIR_FREE(str); } } @@ -4935,38 +4916,9 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) } for (i = 0; i < nparams; i++) { - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - vshPrint(ctl, "%-15s: %d\n", params[i].field, - params[i].value.i); - break; - case VIR_TYPED_PARAM_UINT: - vshPrint(ctl, "%-15s: %u\n", params[i].field, - params[i].value.ui); - break; - case VIR_TYPED_PARAM_LLONG: - vshPrint(ctl, "%-15s: %lld\n", params[i].field, - params[i].value.l); - break; - case VIR_TYPED_PARAM_ULLONG: - vshPrint(ctl, "%-15s: %llu\n", params[i].field, - params[i].value.ul); - break; - case VIR_TYPED_PARAM_DOUBLE: - vshPrint(ctl, "%-15s: %f\n", params[i].field, - params[i].value.d); - break; - case VIR_TYPED_PARAM_BOOLEAN: - vshPrint(ctl, "%-15s: %d\n", params[i].field, - params[i].value.b); - break; - case VIR_TYPED_PARAM_STRING: - vshPrint(ctl, "%-15s: %s\n", params[i].field, - params[i].value.s); - break; - default: - vshPrint(ctl, "unimplemented blkio parameter type\n"); - } + char *str = vshGetTypedParamValue(ctl, &params[i]); + vshPrint(ctl, "%-15s: %s\n", params[i].field, str); + VIR_FREE(str); } } else { /* set the blkio parameters */ @@ -5112,36 +5064,13 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd) } for (i = 0; i < nparams; i++) { - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - vshPrint(ctl, "%-15s: %d\n", params[i].field, - params[i].value.i); - break; - case VIR_TYPED_PARAM_UINT: - vshPrint(ctl, "%-15s: %u\n", params[i].field, - params[i].value.ui); - break; - case VIR_TYPED_PARAM_LLONG: - vshPrint(ctl, "%-15s: %lld\n", params[i].field, - params[i].value.l); - break; - case VIR_TYPED_PARAM_ULLONG: - if (params[i].value.ul == VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) - vshPrint(ctl, "%-15s: unlimited\n", params[i].field); - else - vshPrint(ctl, "%-15s: %llu kB\n", params[i].field, - params[i].value.ul); - break; - case VIR_TYPED_PARAM_DOUBLE: - vshPrint(ctl, "%-15s: %f\n", params[i].field, - params[i].value.d); - break; - case VIR_TYPED_PARAM_BOOLEAN: - vshPrint(ctl, "%-15s: %d\n", params[i].field, - params[i].value.b); - break; - default: - vshPrint(ctl, "unimplemented memory parameter type\n"); + if (params[i].type == VIR_TYPED_PARAM_ULLONG && + params[i].value.ul == VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) { + vshPrint(ctl, "%-15s: unlimited\n", params[i].field); + } else { + char *str = vshGetTypedParamValue(ctl, &params[i]); + vshPrint(ctl, "%-15s: %s\n", params[i].field, str); + VIR_FREE(str); } } @@ -6562,34 +6491,9 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) } for (i = 0; i < nparams; i++) { - switch(params[i].type) { - case VIR_TYPED_PARAM_INT: - vshPrint(ctl, "%-15s: %d\n", params[i].field, - params[i].value.i); - break; - case VIR_TYPED_PARAM_UINT: - vshPrint(ctl, "%-15s: %u\n", params[i].field, - params[i].value.ui); - break; - case VIR_TYPED_PARAM_LLONG: - vshPrint(ctl, "%-15s: %lld\n", params[i].field, - params[i].value.l); - break; - case VIR_TYPED_PARAM_ULLONG: - vshPrint(ctl, "%-15s: %llu\n", params[i].field, - params[i].value.ul); - break; - case VIR_TYPED_PARAM_DOUBLE: - vshPrint(ctl, "%-15s: %f\n", params[i].field, - params[i].value.d); - break; - case VIR_TYPED_PARAM_BOOLEAN: - vshPrint(ctl, "%-15s: %d\n", params[i].field, - params[i].value.b); - break; - default: - vshPrint(ctl, "unimplemented block I/O throttle parameter type\n"); - } + char *str = vshGetTypedParamValue(ctl, &params[i]); + vshPrint(ctl, "%-15s: %s\n", params[i].field, str); + VIR_FREE(str); } ret = true; @@ -17086,8 +16990,12 @@ vshGetTypedParamValue(vshControl *ctl, virTypedParameterPtr item) ret = virAsprintf(&str, "%s", item->value.b ? _("yes") : _("no")); break; + case VIR_TYPED_PARAM_STRING: + str = vshStrdup (ctl, item->value.s); + ret = str ? 0 : -1; + default: - vshError(ctl, _("unimplemented block statistics parameter type")); + vshError(ctl, _("unimplemented parameter type %d"), item->type); } if (ret < 0) -- 1.7.7.4

2 2

[libvirt] polkit-auth question
by Jim Fehlig 19 Dec '11

19 Dec '11

While debugging a PolicyKit issue I noticed that libvirt would proceed with authentication even though polkit-auth failed: testusr@xen134:~> virsh list --all Attempting to obtain authorization for org.libvirt.unix.manage. polkit-grant-helper: given auth type (8 -> yes) is bogus Failed to obtain authorization for org.libvirt.unix.manage. Id Name State ---------------------------------- 0 Domain-0 running - sles11sp1-pv shut off Hmm, authorization failed but domains listed anyway. testusr@xen134:~> virsh start sles11sp1-pv Attempting to obtain authorization for org.libvirt.unix.manage. polkit-grant-helper: given auth type (8 -> yes) is bogus Failed to obtain authorization for org.libvirt.unix.manage. Domain sles11sp1-pv started Ok, authorization failed but testusr was able to start the domain! Checking virConnectAuthGainPolkit() in src/libvirt.c cmd = virCommandNewArgList(POLKIT_AUTH, "--obtain", privilege, NULL); if (virCommandRun(cmd, &status) < 0 || status > 1) goto cleanup; Why the check for status > 1? I looked at polkit-auth source in PolicyKit 0.9 and AFAICT it sets its default return code to 1, only changing it to 0 in success code paths. Unfortunately, the polkit-auth docs make no mention of return codes. Thanks, Jim

1 0

[libvirt] [PATCH] docs: document <qemu:commandline> xml
by Eric Blake 19 Dec '11

19 Dec '11

Even though we technically don't support <qemu:commandline> (as in, if you mis-use things, you get to keep the pieces), we should at least document how to use it. * docs/drvqemu.html.in (qemucommand): New section. --- I wrote this in response to an IRC comment lamenting that the only existing documentation was reading the examples in the testsuite. docs/drvqemu.html.in | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 4da3817..d6effb5 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -513,6 +513,67 @@ $ virsh domxml-to-native qemu-argv demo.xml -serial none -parallel none -usb </pre> + <h2><a name="qemucommand">Pass-through of arbitrary qemu + commands</a></h2> + + <p>Libvirt provides an optional + library <code>libvirt-qemu.so</code> for dealing specifically + with qemu. This library is <b>unsupported</b>, in that it is + not guaranteed to have a stable API, and that mis-using the + library may result in inconsistent state the crashes libvirtd. + However, when used correctly, this library allows testing + specific qemu features that have not yet been ported to the + generic libvirt XML and API interfaces. + </p> + <p>The library provides two + API: <code>virDomainQemuMonitorCommand</code>, for sending an + arbitrary monitor command (in either HMP or QMP format) to a + qemu guest (<span class="since">Since 0.8.3</span>), + and <code>virDomainQemuAttach</code>, for registering a qemu + domain that was manually started so that it can then be managed + by libvirtd (<span class="since">Since 0.9.4</span>). + </p> + <p>Additionally, the following XML additions allow fine-tuning of + the command line given to qemu when starting a domain + (<span class="since">Since 0.8.3</span>). In order to use the + XML additions, it is necessary to issue an XML namespace request + (the special <code>xmlns:<i>name</i></code> attribute) that + pulls in <code>http://libirt.org/schemas/domain/qemu/1.0</code>; + typically, the namespace is given the name + of <code>qemu</code>. With the namespace in place, it is then + possible to add an element <code><qemu:commandline></code> + under <code>driver</code>, with the following sub-elements + repeated as often as needed: + <dl> + <dt><code>qemu:arg</code></dt> + <dd>Add an additional command-line argument to the qemu + process when starting the domain, given by the value of the + attribute <code>value</code>. + </dd> + <dt><code>qemu:env</code></dt> + <dd>Add an additional environment variable to the qemu + process when starting the domain, given with the name-value + pair recorded in the attributes <code>name</code> + and <code>value</code>.</dd> + </dl> + + <p>Example:</p><pre> +<domain type='qemu' xmlns:qemu='http://libirt.org/schemas/domain/qemu/1.0'> + <name>QEmu-fedora-i686</name> + <memory>219200</memory> + <os> + <type arch='i686' machine='pc'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + </devices> + <qemu:commandline> + <qemu:arg value='-newarg'/> + <qemu:env name='QEMU_ENV' value='VAL'/> + </qemu:commandline> +</domain> +</pre> + <h2><a name="xmlconfig">Example domain XML config</a></h2> <h3>QEMU emulated guest on x86_64</h3> -- 1.7.7.4

2 2

[libvirt] [PATCH] python: plug memory leak on libvirt_virConnectOpenAuth
by ajia＠redhat.com 19 Dec '11

19 Dec '11

From: Alex Jia <ajia(a)redhat.com> * Detected by valgrind. Leak introduced in commit 5ab109f. * python/libvirt-override.c: avoid memory leak on libvirt_virConnectOpenAuth. * How to reproduce? % valgrind -v --leak-check=full virt-clone --print-xml Note: it can hit the issue although options are incomplete. * Actual valgrind result: ==1801== 12 bytes in 1 blocks are definitely lost in loss record 25 of 3,270 ==1801== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==1801== by 0xCF1F60E: libvirt_virConnectOpenAuth (libvirt-override.c:1507) ==1801== by 0x3AFEEDE7F3: PyEval_EvalFrameEx (ceval.c:3794) ==1801== by 0x3AFEEDF99E: PyEval_EvalFrameEx (ceval.c:3880) ==1801== by 0x3AFEEDF99E: PyEval_EvalFrameEx (ceval.c:3880) ==1801== by 0x3AFEEDF99E: PyEval_EvalFrameEx (ceval.c:3880) ==1801== by 0x3AFEEDF99E: PyEval_EvalFrameEx (ceval.c:3880) ==1801== by 0x3AFEEE0466: PyEval_EvalCodeEx (ceval.c:3044) ==1801== by 0x3AFEEE0541: PyEval_EvalCode (ceval.c:545) ==1801== by 0x3AFEEFB88B: run_mod (pythonrun.c:1351) ==1801== by 0x3AFEEFB95F: PyRun_FileExFlags (pythonrun.c:1337) ==1801== by 0x3AFEEFCE4B: PyRun_SimpleFileExFlags (pythonrun.c:941) Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 4aee628..8a643a3 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1520,6 +1520,7 @@ libvirt_virConnectOpenAuth(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { c_retval = virConnectOpenAuth(name, &auth, flags); LIBVIRT_END_ALLOW_THREADS; + free(auth.credtype); py_retval = libvirt_virConnectPtrWrap((virConnectPtr) c_retval); return(py_retval); } -- 1.7.1

3 2

[libvirt] [PATCH 0/2] Introduce two new virsh commands
by Osier Yang 19 Dec '11

19 Dec '11

These two patches is to introduce two new virsh commands, one is eject-media, which is to eject media from CD or floppy drive, the other is insert-media, which is to insert media into CD or floppy drive. There are commands existed can be used to eject/insert media, such as "update-device", but it's not quite easy to use. That's the original intention of these patches. Both of the two commands only allow to operate on CDROM or floppy disk. [PATCH 1/2] virsh: Introduce two new commands to insert or eject media [PATCH 2/2] doc: Add docs for two new introduced commands Regards Osier

3 6

[libvirt] [PATCH] Fix typo in storage pool documentation
by Christophe Fergeau 19 Dec '11

19 Dec '11

Remove 2 words that shouldn't be here. --- docs/formatstorage.html.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index f13ca6a..0dcf6df 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -13,7 +13,7 @@ volumes. Some may have constraints on volume size, or placement. </p> <p> - The is the top level tag for a storage pool document is 'pool'. It has + The top level tag for a storage pool document is 'pool'. It has a single attribute <code>type</code>, which is one of <code>dir</code>, <code>fs</code>,<code>netfs</code>,<code>disk</code>,<code>iscsi</code>, <code>logical</code>. This corresponds to the storage backend drivers -- 1.7.7.4

2 1

[libvirt] [PATCHv2] build: let autobuild check more code
by Eric Blake 19 Dec '11

19 Dec '11

Many times, we don't notice a bug in src/libvirt_private.syms until someone attempts a build with modules enabled. Likewise, some gcc warnings about no % in a printf format string only appear under --disable-nls. And configure.ac should automatically be excluding modules on mingw without us having to be explicit. Improving autobuild.sh to stress more combinations can only help. * autobuild.sh: Add --with-driver-modules and --disable-nls. Update mingw build to rely more on configure.ac detection. --- Wow, I've been sitting on this one for a while, and dusted it off from one of my side branches. This might not address all of Daniel's comments on v1, but it is better than nothing. v1: https://www.redhat.com/archives/libvir-list/2011-March/msg01072.html v2: in response to: https://www.redhat.com/archives/libvir-list/2011-December/msg00620.html autobuild.sh | 23 ++++++----------------- 1 files changed, 6 insertions(+), 17 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index 9853287..eef67f4 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -15,8 +15,12 @@ rm -rf build mkdir build cd build +# Run with options not normally exercised by the rpm build, for +# more complete code coverage. ../autogen.sh --prefix="$AUTOBUILD_INSTALL_ROOT" \ + --with-driver-modules \ --enable-test-coverage \ + --disable-nls \ --enable-compile-warnings=error # If the MAKEFLAGS envvar does not yet include a -j option, @@ -61,6 +65,7 @@ if [ -f /usr/bin/rpmbuild ]; then -ba --clean libvirt.spec fi +# Test mingw cross-compile if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then make distclean @@ -71,23 +76,7 @@ if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then --host=i686-pc-mingw32 \ --prefix="$AUTOBUILD_INSTALL_ROOT/i686-pc-mingw32/sys-root/mingw" \ --enable-compile-warnings=error \ - --without-xen \ - --without-qemu \ - --without-openvz \ - --without-lxc \ - --without-vbox \ - --without-xenapi \ - --without-uml \ - --without-sasl \ - --without-avahi \ - --without-polkit \ - --without-python \ - --without-libvirtd \ - --without-phyp \ - --without-hyperv \ - --without-netcf \ - --without-audit \ - --without-dtrace \ + --without-libvirtd make make install -- 1.7.7.4

2 9

[libvirt] ANNOUNCE: libvirt-glib release 0.0.3
by Daniel P. Berrange 19 Dec '11

19 Dec '11

I am pleased to announce that a new release of the libvirt-glib package, version 0.0.3 is now available from ftp://libvirt.org/libvirt/glib/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) New in this release: - Flesh out API in libvirt-gconfig to allow basic domain configuration - Don't memset private data fields, since glib already ensures this - Fix VPATH builds - Add syntax-check rules ensuring coding style compliance - Describe coding style in HACKING file - Expand libvirt-gobject API to allow watches on streams - Simplify debug system with new glib - Fix libvirt-gobject pkg-config file - Fix domain event handlig wrt transient guests - Don't crash if given a NULL uri to connect to - Expand libvirt-gobject API for storage pools & volumes - Fix some crashes in error paths where GError instance was NULL - Add vala files to the RPM - Add binding for open domain consoles & graphics libvirt-glib comprises three distinct libraries: - libvirt-glib - Integrate with the GLib event loop and error handling - libvirt-gconfig - Representation of libvirt XML documents as GObjects - libvirt-gobject - Mapping of libvirt APIs into the GObject type system NB: While libvirt aims to be API/ABI stable, for the first few releases, we are *NOT* guaranteeing that libvirt-glib libraries are API/ABI stable. ABI stability will only be guaranteed once the bulk of the APIs have been fleshed out and proved in non-trivial application usage. We anticipate this will be within the next 6 months in order to line up with Fedora 17. Follow up comments about libvirt-glib should be directed to the regular libvir-list(a)redhat.com development list. Thanks to all the people involved in contributing to this release. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH 0/8] Refactor event state handling to fix crash
by Daniel P. Berrange 19 Dec '11

19 Dec '11

When running while true ; do date ; ../tools/virsh -q -c test:///default 'shutdown test; undefine test; dominfo test' ; done we often experiance hangs or crashes or memory corruption in glibc. The reason is that when the virConnectPtr is free'd this in turn frees the event state, which in turn unregisters the event timer. The timer may, however, still fire one last time and it is possible this occurs after the event state has been freed. The solution in this series is to only register the timer when the first callback is added and unregister the timer, when the last callback is removed. In doing this patch, I decide to unify more of the event handling across drivers, and simplify the API usage by drivers, and hide all the impl details.

4 25

[libvirt] [PATCH] [TCK] nwfilter: Add tests to detect unnecessarily created ebtables chains
by Stefan Berger 17 Dec '11

17 Dec '11

This patch adds a couple of test to detect unnecessarily created ebtables chains in the case where only iptables chains should have been created. Stefan --- scripts/nwfilter/nwfilterxml2fwallout/sctp-ipv6-test.fwall | 4 ++++ scripts/nwfilter/nwfilterxml2fwallout/sctp-test.fwall | 4 ++++ scripts/nwfilter/nwfilterxml2fwallout/tcp-ipv6-test.fwall | 4 ++++ scripts/nwfilter/nwfilterxml2fwallout/tcp-test.fwall | 4 ++++ scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall | 4 ++++ scripts/nwfilter/nwfilterxml2fwallout/udp-test.fwall | 4 ++++ 6 files changed, 24 insertions(+) Index: libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/tcp-test.fwall =================================================================== --- libvirt-tck.orig/scripts/nwfilter/nwfilterxml2fwallout/tcp-test.fwall +++ libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/tcp-test.fwall @@ -28,3 +28,7 @@ FI-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [got ACCEPT all -- 0.0.0.0/0 0.0.0.0/0 PHYSDEV match --physdev-in vnet0 #iptables -L libvirt-out -n | grep vnet0 | tr -s " " FO-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-out vnet0 +#ebtables -t nat -L libvirt-O-vnet0 2>/dev/null | grep -v "table:" | grep -v "^$" +#ebtables -t nat -L libvirt-I-vnet0 2>/dev/null | grep -v "table:" | grep -v "^$" +#ebtables -t nat -L PREROUTING | grep vnet0 +#ebtables -t nat -L POSTROUTING | grep vnet0 Index: libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/sctp-ipv6-test.fwall =================================================================== --- libvirt-tck.orig/scripts/nwfilter/nwfilterxml2fwallout/sctp-ipv6-test.fwall +++ libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/sctp-ipv6-test.fwall @@ -26,3 +26,7 @@ FI-vnet0 all ::/0 ::/0 [goto] PHYSDEV ma ACCEPT all ::/0 ::/0 PHYSDEV match --physdev-in vnet0 #ip6tables -L libvirt-out -n | grep vnet0 | tr -s " " FO-vnet0 all ::/0 ::/0 [goto] PHYSDEV match --physdev-out vnet0 +#ebtables -t nat -L libvirt-O-vnet0 2>/dev/null | grep -v "table:" | grep -v "^$" +#ebtables -t nat -L libvirt-I-vnet0 2>/dev/null | grep -v "table:" | grep -v "^$" +#ebtables -t nat -L PREROUTING | grep vnet0 +#ebtables -t nat -L POSTROUTING | grep vnet0 Index: libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/sctp-test.fwall =================================================================== --- libvirt-tck.orig/scripts/nwfilter/nwfilterxml2fwallout/sctp-test.fwall +++ libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/sctp-test.fwall @@ -24,3 +24,7 @@ FI-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [got ACCEPT all -- 0.0.0.0/0 0.0.0.0/0 PHYSDEV match --physdev-in vnet0 #iptables -L libvirt-out -n | grep vnet0 | tr -s " " FO-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-out vnet0 +#ebtables -t nat -L libvirt-O-vnet0 2>/dev/null | grep -v "table:" | grep -v "^$" +#ebtables -t nat -L libvirt-I-vnet0 2>/dev/null | grep -v "table:" | grep -v "^$" +#ebtables -t nat -L PREROUTING | grep vnet0 +#ebtables -t nat -L POSTROUTING | grep vnet0 Index: libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/tcp-ipv6-test.fwall =================================================================== --- libvirt-tck.orig/scripts/nwfilter/nwfilterxml2fwallout/tcp-ipv6-test.fwall +++ libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/tcp-ipv6-test.fwall @@ -26,3 +26,7 @@ FI-vnet0 all ::/0 ::/0 [goto] PHYSDEV ma ACCEPT all ::/0 ::/0 PHYSDEV match --physdev-in vnet0 #ip6tables -L libvirt-out -n | grep vnet0 | tr -s " " FO-vnet0 all ::/0 ::/0 [goto] PHYSDEV match --physdev-out vnet0 +#ebtables -t nat -L libvirt-O-vnet0 2>/dev/null | grep -v "table:" | grep -v "^$" +#ebtables -t nat -L libvirt-I-vnet0 2>/dev/null | grep -v "table:" | grep -v "^$" +#ebtables -t nat -L PREROUTING | grep vnet0 +#ebtables -t nat -L POSTROUTING | grep vnet0 Index: libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall =================================================================== --- libvirt-tck.orig/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall +++ libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall @@ -26,3 +26,7 @@ FI-vnet0 all ::/0 ::/0 [goto] PHYSDEV ma ACCEPT all ::/0 ::/0 PHYSDEV match --physdev-in vnet0 #ip6tables -L libvirt-out -n | grep vnet0 | tr -s " " FO-vnet0 all ::/0 ::/0 [goto] PHYSDEV match --physdev-out vnet0 +#ebtables -t nat -L libvirt-O-vnet0 2>/dev/null | grep -v "table:" | grep -v "^$" +#ebtables -t nat -L libvirt-I-vnet0 2>/dev/null | grep -v "table:" | grep -v "^$" +#ebtables -t nat -L PREROUTING | grep vnet0 +#ebtables -t nat -L POSTROUTING | grep vnet0 Index: libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/udp-test.fwall =================================================================== --- libvirt-tck.orig/scripts/nwfilter/nwfilterxml2fwallout/udp-test.fwall +++ libvirt-tck/scripts/nwfilter/nwfilterxml2fwallout/udp-test.fwall @@ -24,3 +24,7 @@ FI-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [got ACCEPT all -- 0.0.0.0/0 0.0.0.0/0 PHYSDEV match --physdev-in vnet0 #iptables -L libvirt-out -n | grep vnet0 | tr -s " " FO-vnet0 all -- 0.0.0.0/0 0.0.0.0/0 [goto] PHYSDEV match --physdev-out vnet0 +#ebtables -t nat -L libvirt-O-vnet0 2>/dev/null | grep -v "table:" | grep -v "^$" +#ebtables -t nat -L libvirt-I-vnet0 2>/dev/null | grep -v "table:" | grep -v "^$" +#ebtables -t nat -L PREROUTING | grep vnet0 +#ebtables -t nat -L POSTROUTING | grep vnet0

2 2

[libvirt] [PATCH] nwfilter: do not create ebtables chain unnecessarily
by Stefan Berger 17 Dec '11

17 Dec '11

If only iptables rules are created then two unnecessary ebtables chains are also created. This patch fixes this. The chains had been cleaned up properly when the interface disappeared, though. --- src/nwfilter/nwfilter_ebiptables_driver.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) Index: libvirt-iterator/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-iterator.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-iterator/src/nwfilter/nwfilter_ebiptables_driver.c @@ -3622,10 +3622,12 @@ ebiptablesApplyNewRules(const char *ifna NWFILTER_SET_EBTABLES_SHELLVAR(&buf); /* create needed chains */ - if (ebtablesCreateTmpRootAndSubChains(&buf, ifname, chains_in_set , 1, - &ebtChains, &nEbtChains) < 0 || - ebtablesCreateTmpRootAndSubChains(&buf, ifname, chains_out_set, 0, - &ebtChains, &nEbtChains) < 0) { + if ((virHashSize(chains_in_set) > 0 && + ebtablesCreateTmpRootAndSubChains(&buf, ifname, chains_in_set , 1, + &ebtChains, &nEbtChains) < 0) || + (virHashSize(chains_out_set) > 0 && + ebtablesCreateTmpRootAndSubChains(&buf, ifname, chains_out_set, 0, + &ebtChains, &nEbtChains) < 0)) { goto tear_down_tmpebchains; }

2 2

[libvirt] [PATCH] add a default event handle, to passthough the new events come from qemu
by shaohef＠linux.vnet.ibm.com 16 Dec '11

16 Dec '11

From: Shaohe Feng <shaohef(a)linux.vnet.ibm.com> Basically, this feature can go along with qemu monitor passthrough. That way, if we use new commands in the monitor that generate new events, we want some way to receive those new events too. In order to test this patch, see the attached python test case. When domains are started, it will be able to catch RESUME events. Signed-off-by: Shaohe Feng <shaohef(a)linux.vnet.ibm.com> --- daemon/remote.c | 34 ++++++++++++++++++++++ include/libvirt/libvirt.h.in | 14 +++++++++ python/libvirt-override-virConnect.py | 12 ++++++++ python/libvirt-override.c | 50 +++++++++++++++++++++++++++++++++ src/conf/domain_event.c | 46 ++++++++++++++++++++++++++++++ src/conf/domain_event.h | 5 +++ src/libvirt_private.syms | 2 + src/qemu/qemu_monitor.c | 9 ++++++ src/qemu/qemu_monitor.h | 6 ++++ src/qemu/qemu_monitor_json.c | 31 ++++++++++++++++++++ src/qemu/qemu_process.c | 23 +++++++++++++++ src/remote/remote_driver.c | 31 ++++++++++++++++++++ src/remote/remote_protocol.x | 8 ++++- src/remote_protocol-structs | 5 +++ 14 files changed, 275 insertions(+), 1 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 245d41c..ef7d513 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -426,6 +426,38 @@ mem_error: return -1; } +static int remoteRelayDomainEventDefault(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *rawEvent, + void *opaque) +{ + virNetServerClientPtr client = opaque; + remote_domain_event_default_event_msg data; + + if (!client) + return -1; + + VIR_DEBUG("Relaying domain default event event %s %d %s", + dom->name, dom->id, rawEvent); + + /* build return data */ + memset(&data, 0, sizeof data); + data.rawEvent = (char*)strdup(rawEvent); + if (data.rawEvent == NULL) + goto mem_error; + make_nonnull_domain(&data.dom, dom); + remoteDispatchDomainEventSend(client, remoteProgram, + REMOTE_PROC_DOMAIN_EVENT_DEFAULT_EVENT, + (xdrproc_t)xdr_remote_domain_event_default_event_msg, &data); + + return 0; + +mem_error: + virReportOOMError(); + VIR_FREE(data.rawEvent); + return -1; +} + static int remoteRelayDomainEventControlError(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainPtr dom, @@ -461,6 +493,8 @@ static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventIOErrorReason), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventControlError), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventBlockJob), + VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventDefault), + }; verify(ARRAY_CARDINALITY(domainEventCallbacks) == VIR_DOMAIN_EVENT_ID_LAST); diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 07617be..5ccf8c7 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2975,6 +2975,19 @@ typedef void (*virConnectDomainEventBlockJobCallback)(virConnectPtr conn, int type, int status, void *opaque); +/** + * virConnectDomainEventDefaultCallback: + * @conn: connection object + * @dom: domain on which the event occurred + * @rawEvent: the content of the unknow or un-implementation event + * + * The callback signature to use when registering for an event of type + * VIR_DOMAIN_EVENT_ID_DEFAULT with virConnectDomainEventRegisterAny() + */ +typedef void (*virConnectDomainEventDefaultCallback)(virConnectPtr conn, + virDomainPtr dom, + const char *rawEvent, + void *opaque); /** * VIR_DOMAIN_EVENT_CALLBACK: @@ -2995,6 +3008,7 @@ typedef enum { VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON = 6, /* virConnectDomainEventIOErrorReasonCallback */ VIR_DOMAIN_EVENT_ID_CONTROL_ERROR = 7, /* virConnectDomainEventGenericCallback */ VIR_DOMAIN_EVENT_ID_BLOCK_JOB = 8, /* virConnectDomainEventBlockJobCallback */ + VIR_DOMAIN_EVENT_ID_DEFAULT = 9, /* virConnectDomainEventDefaultCallback */ /* * NB: this enum value will increase over time as new events are diff --git a/python/libvirt-override-virConnect.py b/python/libvirt-override-virConnect.py index 65b5342..f00cbb9 100644 --- a/python/libvirt-override-virConnect.py +++ b/python/libvirt-override-virConnect.py @@ -125,6 +125,18 @@ except AttributeError: pass + def dispatchDomainEventDefaultCallback(self, dom, path, cbData): + """Dispatches events to python user Default event callbacks + """ + try: + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virDomain(self, _obj=dom), path, opaque) + return 0 + except AttributeError: + pass + def domainEventDeregisterAny(self, callbackID): """Removes a Domain Event Callback. De-registering for a domain callback will disable delivery of this event type """ diff --git a/python/libvirt-override.c b/python/libvirt-override.c index d65423d..c674390 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -4329,6 +4329,53 @@ libvirt_virConnectDomainEventBlockJobCallback(virConnectPtr conn ATTRIBUTE_UNUSE return ret; } +static int +libvirt_virConnectDomainEventDefaultCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *rawEvent, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_dom; + PyObject *pyobj_ret; + PyObject *pyobj_conn; + PyObject *dictKey; + int ret = -1; + + LIBVIRT_ENSURE_THREAD_STATE; + + /* Create a python instance of this virDomainPtr */ + virDomainRef(dom); + pyobj_dom = libvirt_virDomainPtrWrap(dom); + Py_INCREF(pyobj_cbData); + + dictKey = libvirt_constcharPtrWrap("conn"); + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"dispatchDomainEventDefaultCallback", + (char*)"OsO", + pyobj_dom, rawEvent, pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_dom); + + if (!pyobj_ret) { +#if DEBUG_ERROR + printf("%s - ret:%p\n", __FUNCTION__, pyobj_ret); +#endif + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + ret = 0; + } + + LIBVIRT_RELEASE_THREAD_STATE; + return ret; +} + static PyObject * libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject * self, PyObject * args) @@ -4386,6 +4433,9 @@ libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject * self, case VIR_DOMAIN_EVENT_ID_BLOCK_JOB: cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventBlockJobCallback); break; + case VIR_DOMAIN_EVENT_ID_DEFAULT: + cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventDefaultCallback); + break; } if (!cb) { diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 3189346..04f44fb 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -88,6 +88,9 @@ struct _virDomainEvent { int type; int status; } blockJob; + struct { + char *rawEvent; + }defaultEvent; } data; }; @@ -509,6 +512,9 @@ void virDomainEventFree(virDomainEventPtr event) case VIR_DOMAIN_EVENT_ID_BLOCK_JOB: VIR_FREE(event->data.blockJob.path); break; + case VIR_DOMAIN_EVENT_ID_DEFAULT: + VIR_FREE(event->data.defaultEvent.rawEvent); + break; } VIR_FREE(event->dom.name); @@ -923,6 +929,40 @@ virDomainEventPtr virDomainEventBlockJobNewFromDom(virDomainPtr dom, path, type, status); } +static virDomainEventPtr +virDomainEventDefaultNew(int id, const char *name, unsigned char *uuid, + const char *rawEvent) +{ + virDomainEventPtr ev = + virDomainEventNewInternal(VIR_DOMAIN_EVENT_ID_DEFAULT, + id, name, uuid); + if (ev) { + if (!(ev->data.defaultEvent.rawEvent = strdup(rawEvent))) { + virReportOOMError(); + VIR_FREE(ev->dom.name); + VIR_FREE(ev); + return NULL; + } + } + + return ev; +} + +virDomainEventPtr virDomainEventDefaultNewFromObj(virDomainObjPtr obj, + const char *rawEvent) +{ + + return virDomainEventDefaultNew(obj->def->id, obj->def->name, + obj->def->uuid, rawEvent); +} + +virDomainEventPtr virDomainEventDefaultNewFromDom(virDomainPtr dom, + const char *rawEvent) +{ + return virDomainEventDefaultNew(dom->id, dom->name, dom->uuid, + rawEvent); +} + virDomainEventPtr virDomainEventControlErrorNewFromDom(virDomainPtr dom) { virDomainEventPtr ev = @@ -1083,6 +1123,12 @@ void virDomainEventDispatchDefaultFunc(virConnectPtr conn, cbopaque); break; + case VIR_DOMAIN_EVENT_ID_DEFAULT: + ((virConnectDomainEventDefaultCallback)cb)(conn, dom, + event->data.defaultEvent.rawEvent, + cbopaque); + break; + default: VIR_WARN("Unexpected event ID %d", event->eventID); break; diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index b06be16..401f781 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -178,6 +178,11 @@ virDomainEventPtr virDomainEventBlockJobNewFromDom(virDomainPtr dom, int type, int status); +virDomainEventPtr virDomainEventDefaultNewFromObj(virDomainObjPtr obj, + const char *rawEvent); +virDomainEventPtr virDomainEventDefaultNewFromDom(virDomainPtr dom, + const char *rawEvent); + int virDomainEventQueuePush(virDomainEventQueuePtr evtQueue, virDomainEventPtr event); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1ac486f..1dcfc3e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -457,6 +457,8 @@ virDomainWatchdogModelTypeToString; # domain_event.h virDomainEventBlockJobNewFromObj; virDomainEventBlockJobNewFromDom; +virDomainEventDefaultNewFromObj; +virDomainEventDefaultNewFromDom; virDomainEventCallbackListAdd; virDomainEventCallbackListAddID; virDomainEventCallbackListCount; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index c9dd69e..a2b4036 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -976,6 +976,15 @@ int qemuMonitorEmitBlockJob(qemuMonitorPtr mon, return ret; } +int qemuMonitorEmitDefaultEvent(qemuMonitorPtr mon, + const char *rawEvent) +{ + int ret = -1; + VIR_DEBUG("mon=%p", mon); + QEMU_MONITOR_CALLBACK(mon, ret, domainDefaultEvent, mon->vm, + rawEvent); + return ret; +} int qemuMonitorSetCapabilities(qemuMonitorPtr mon) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 3ec78ad..23a03e5 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -123,6 +123,9 @@ struct _qemuMonitorCallbacks { const char *diskAlias, int type, int status); + int (*domainDefaultEvent)(qemuMonitorPtr mon, + virDomainObjPtr vm, + const char *rawEvent) }; @@ -194,6 +197,9 @@ int qemuMonitorEmitBlockJob(qemuMonitorPtr mon, int type, int status); +int qemuMonitorEmitDefaultEvent(qemuMonitorPtr mon, + const char *rawEvent); + int qemuMonitorStartCPUs(qemuMonitorPtr mon, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3d383c8..dab03cd 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -58,6 +58,7 @@ static void qemuMonitorJSONHandleVNCConnect(qemuMonitorPtr mon, virJSONValuePtr static void qemuMonitorJSONHandleVNCInitialize(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleVNCDisconnect(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleBlockJob(qemuMonitorPtr mon, virJSONValuePtr data); +static void qemuMonitorJSONHandleDefaultEvent(qemuMonitorPtr mon, virJSONValuePtr data); struct { const char *type; @@ -74,6 +75,7 @@ struct { { "VNC_INITIALIZED", qemuMonitorJSONHandleVNCInitialize, }, { "VNC_DISCONNECTED", qemuMonitorJSONHandleVNCDisconnect, }, { "BLOCK_JOB_COMPLETED", qemuMonitorJSONHandleBlockJob, }, + { "DEFAULT_UNKNOW_EVENT", qemuMonitorJSONHandleDefaultEvent, }, }; @@ -83,6 +85,7 @@ qemuMonitorJSONIOProcessEvent(qemuMonitorPtr mon, { const char *type; int i; + int findEventFlag = -1; VIR_DEBUG("mon=%p obj=%p", mon, obj); type = virJSONValueObjectGetString(obj, "event"); @@ -98,9 +101,24 @@ qemuMonitorJSONIOProcessEvent(qemuMonitorPtr mon, VIR_DEBUG("handle %s handler=%p data=%p", type, eventHandlers[i].handler, data); (eventHandlers[i].handler)(mon, data); + findEventFlag = 0; break; } } + if (findEventFlag != 0) { + if (!STREQ(eventHandlers[ARRAY_CARDINALITY(eventHandlers)-1].type, "DEFAULT_UNKNOW_EVENT")) { + VIR_ERROR("the last element is not the default event handler"); + } + else { + char *event = NULL; + event = virJSONValueToString(obj); + if (event != NULL){ + VIR_DEBUG("Unknow event,call default event handler %s",event); + free(event); + } + (eventHandlers[ARRAY_CARDINALITY(eventHandlers)-1].handler)(mon, obj); + } + } return 0; } @@ -720,6 +738,19 @@ out: } +static void qemuMonitorJSONHandleDefaultEvent(qemuMonitorPtr mon, virJSONValuePtr data) +{ + char *defaultEventStr = NULL; + defaultEventStr = virJSONValueToString(data); + if (defaultEventStr == NULL){ + VIR_ERROR("Can not get string form JSONValue"); + return; + } + qemuMonitorEmitDefaultEvent(mon, defaultEventStr); + free(defaultEventStr); +} + + int qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon, const char *cmd_str, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a7fe86c..46881eb 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -713,6 +713,28 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, } static int +qemuProcessHandleDefaultEvent(qemuMonitorPtr mon ATTRIBUTE_UNUSED, + virDomainObjPtr vm, + const char *rawEvent) +{ + struct qemud_driver *driver = qemu_driver; + virDomainEventPtr event = NULL; + + virDomainObjLock(vm); + event = virDomainEventDefaultNewFromObj(vm, rawEvent); + + virDomainObjUnlock(vm); + + if (event) { + qemuDriverLock(driver); + qemuDomainEventQueue(driver, event); + qemuDriverUnlock(driver); + } + + return 0; +} + +static int qemuProcessHandleGraphics(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm, int phase, @@ -829,6 +851,7 @@ static qemuMonitorCallbacks monitorCallbacks = { .domainIOError = qemuProcessHandleIOError, .domainGraphics = qemuProcessHandleGraphics, .domainBlockJob = qemuProcessHandleBlockJob, + .domainDefaultEvent = qemuProcessHandleDefaultEvent, }; static int diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 2b2f41e..9648661 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -228,6 +228,11 @@ remoteDomainBuildEventBlockJob(virNetClientProgramPtr prog, virNetClientPtr client, void *evdata, void *opaque); +static void +remoteDomainBuildEventDefaultEvent(virNetClientProgramPtr prog, + virNetClientPtr client, + void *evdata, void *opaque); + static virNetClientProgramEvent remoteDomainEvents[] = { { REMOTE_PROC_DOMAIN_EVENT_RTC_CHANGE, remoteDomainBuildEventRTCChange, @@ -265,6 +270,10 @@ static virNetClientProgramEvent remoteDomainEvents[] = { remoteDomainBuildEventBlockJob, sizeof(remote_domain_event_block_job_msg), (xdrproc_t)xdr_remote_domain_event_block_job_msg }, + { REMOTE_PROC_DOMAIN_EVENT_DEFAULT_EVENT, + remoteDomainBuildEventDefaultEvent, + sizeof(remote_domain_event_default_event_msg), + (xdrproc_t)xdr_remote_domain_event_default_event_msg }, }; enum virDrvOpenRemoteFlags { @@ -3220,6 +3229,28 @@ remoteDomainBuildEventBlockJob(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, } static void +remoteDomainBuildEventDefaultEvent(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, + virNetClientPtr client ATTRIBUTE_UNUSED, + void *evdata, void *opaque) +{ + virConnectPtr conn = opaque; + struct private_data *priv = conn->privateData; + remote_domain_event_default_event_msg *msg = evdata; + virDomainPtr dom; + virDomainEventPtr event = NULL; + + dom = get_nonnull_domain(conn, msg->dom); + if (!dom) + return; + + event = virDomainEventDefaultNewFromDom(dom, msg->rawEvent); + + virDomainFree(dom); + + remoteDomainEventQueue(priv, event); +} + +static void remoteDomainBuildEventGraphics(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, virNetClientPtr client ATTRIBUTE_UNUSED, void *evdata, void *opaque) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index c8a92fd..81c6a4e 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2010,6 +2010,11 @@ struct remote_domain_event_block_job_msg { int status; }; +struct remote_domain_event_default_event_msg { + remote_nonnull_domain dom; + remote_nonnull_string rawEvent; +}; + struct remote_domain_managed_save_args { remote_nonnull_domain dom; unsigned int flags; @@ -2525,7 +2530,8 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_MIGRATE_GET_MAX_SPEED = 242, /* autogen autogen */ REMOTE_PROC_DOMAIN_BLOCK_STATS_FLAGS = 243, /* skipgen skipgen */ REMOTE_PROC_DOMAIN_SNAPSHOT_GET_PARENT = 244, /* autogen autogen */ - REMOTE_PROC_DOMAIN_RESET = 245 /* autogen autogen */ + REMOTE_PROC_DOMAIN_RESET = 245, /* autogen autogen */ + REMOTE_PROC_DOMAIN_EVENT_DEFAULT_EVENT = 246 /* skipgen skipgen */ /* * Notice how the entries are grouped in sets of 10 ? diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 69175cc..7d0d0d4 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1509,6 +1509,10 @@ struct remote_domain_event_block_job_msg { int type; int status; }; +struct remote_domain_event_default_event_msg { + remote_nonnull_domain dom; + remote_nonnull_string rawEvent; +}; struct remote_domain_managed_save_args { remote_nonnull_domain dom; u_int flags; @@ -1971,4 +1975,5 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_BLOCK_STATS_FLAGS = 243, REMOTE_PROC_DOMAIN_SNAPSHOT_GET_PARENT = 244, REMOTE_PROC_DOMAIN_RESET = 245, + REMOTE_PROC_DOMAIN_EVENT_DEFAULT_EVENT = 246, }; -- 1.7.6

9 15

[libvirt] [PATCH] migration: Add more specific error code/message on migration abort
by Peter Krempa 16 Dec '11

16 Dec '11

A generic error code was returned, if the user aborted a migration job. This made it hard to distinguish between a user requested abort and an error that might have occured. This patch introduces a new error code, which is returned if a migration API call fails. This makes it easier to distinguish between failure while mirgrating and an user requested abort. * include/libvirt/virterror.h: - add new error code * src/util/virterror.c: - add message for the new error code * src/qemu/qemu_migration.h: - Emit operation aborted error instead of operation failed, on migration abort --- include/libvirt/virterror.h | 2 ++ src/qemu/qemu_migration.c | 2 +- src/util/virterror.c | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index 7063ef6..e896d67 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -241,6 +241,8 @@ typedef enum { VIR_ERR_STORAGE_POOL_BUILT = 76, /* storage pool already built */ VIR_ERR_SNAPSHOT_REVERT_RISKY = 77, /* force was not requested for a risky domain snapshot revert */ + VIR_ERR_OPERATION_ABORTED = 78, /* operation on a domain was + canceled/aborted by user */ } virErrorNumber; /** diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8c4ecc8..7e4135b 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -905,7 +905,7 @@ qemuMigrationUpdateJobStatus(struct qemud_driver *driver, case QEMU_MONITOR_MIGRATION_STATUS_CANCELLED: priv->job.info.type = VIR_DOMAIN_JOB_CANCELLED; - qemuReportError(VIR_ERR_OPERATION_FAILED, + qemuReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"), job, _("canceled by client")); break; } diff --git a/src/util/virterror.c b/src/util/virterror.c index 44a276a..380dc56 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1213,6 +1213,12 @@ virErrorMsg(virErrorNumber error, const char *info) else errmsg = _("revert requires force: %s"); break; + case VIR_ERR_OPERATION_ABORTED: + if (info == NULL) + errmsg = _("operation aborted"); + else + errmsg = _("operation aborted: %s"); + break; } return (errmsg); } -- 1.7.3.4

2 2

[libvirt] [PATCH] qemu: detect truncated file as invalid save image
by Eric Blake 16 Dec '11

16 Dec '11

If managed save fails at the right point in time, then the save image can end up with 0 bytes in length (no valid header), and our attempts in commit 55d88def to detect and skip invalid save files missed this case. * src/qemu/qemu_driver.c (qemuDomainSaveImageOpen): Also unlink empty file as corrupt. Reported by Dennis Householder. --- src/qemu/qemu_driver.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 725b593..0d99ce4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3852,6 +3852,15 @@ qemuDomainSaveImageOpen(struct qemud_driver *driver, goto error; if (saferead(fd, &header, sizeof(header)) != sizeof(header)) { + if (unlink_corrupt) { + if (VIR_CLOSE(fd) < 0 || unlink(path) < 0) { + virReportSystemError(errno, + _("cannot remove corrupt file: %s"), + path); + goto error; + } + return -3; + } qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", _("failed to read qemu header")); goto error; -- 1.7.7.4

2 2

[libvirt] [PATCH] qemu: Don't drop hostdev config until security label restore
by Michal Privoznik 16 Dec '11

16 Dec '11

Currently, on device detach, we parse given XML, find the device in domain object, free it and try to restore security labels. However, in some cases (e.g. usb hostdev) parsed XML contains less information than freed device. In usb case it is bus & device IDs. These are needed during label restoring as a symlink into /dev/bus is generated from them. Therefore don't drop device configuration until security labels are restored. --- src/qemu/qemu_hotplug.c | 38 ++++++++++++++++++++++++++------------ src/qemu/qemu_hotplug.h | 6 ------ 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b28a8cb..4067bb0 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1952,9 +1952,11 @@ cleanup: return ret; } -int qemuDomainDetachHostPciDevice(struct qemud_driver *driver, - virDomainObjPtr vm, - virDomainDeviceDefPtr dev) +static int +qemuDomainDetachHostPciDevice(struct qemud_driver *driver, + virDomainObjPtr vm, + virDomainDeviceDefPtr dev, + virDomainHostdevDefPtr *detach_ret) { virDomainHostdevDefPtr detach = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -2050,14 +2052,19 @@ int qemuDomainDetachHostPciDevice(struct qemud_driver *driver, VIR_FREE(vm->def->hostdevs); vm->def->nhostdevs = 0; } - virDomainHostdevDefFree(detach); + if (detach_ret) + *detach_ret = detach; + else + virDomainHostdevDefFree(detach); return ret; } -int qemuDomainDetachHostUsbDevice(struct qemud_driver *driver, - virDomainObjPtr vm, - virDomainDeviceDefPtr dev) +static int +qemuDomainDetachHostUsbDevice(struct qemud_driver *driver, + virDomainObjPtr vm, + virDomainDeviceDefPtr dev, + virDomainHostdevDefPtr *detach_ret) { virDomainHostdevDefPtr detach = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -2129,7 +2136,10 @@ int qemuDomainDetachHostUsbDevice(struct qemud_driver *driver, VIR_FREE(vm->def->hostdevs); vm->def->nhostdevs = 0; } - virDomainHostdevDefFree(detach); + if (detach_ret) + *detach_ret = detach; + else + virDomainHostdevDefFree(detach); return ret; } @@ -2139,6 +2149,7 @@ int qemuDomainDetachHostDevice(struct qemud_driver *driver, virDomainDeviceDefPtr dev) { virDomainHostdevDefPtr hostdev = dev->data.hostdev; + virDomainHostdevDefPtr detach = NULL; int ret; if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) { @@ -2150,10 +2161,10 @@ int qemuDomainDetachHostDevice(struct qemud_driver *driver, switch (hostdev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: - ret = qemuDomainDetachHostPciDevice(driver, vm, dev); + ret = qemuDomainDetachHostPciDevice(driver, vm, dev, &detach); break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: - ret = qemuDomainDetachHostUsbDevice(driver, vm, dev); + ret = qemuDomainDetachHostUsbDevice(driver, vm, dev, &detach); break; default: qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -2162,10 +2173,13 @@ int qemuDomainDetachHostDevice(struct qemud_driver *driver, return -1; } - if (virSecurityManagerRestoreHostdevLabel(driver->securityManager, - vm, dev->data.hostdev) < 0) + if (ret == 0 && + virSecurityManagerRestoreHostdevLabel(driver->securityManager, + vm, detach) < 0) VIR_WARN("Failed to restore host device labelling"); + virDomainHostdevDefFree(detach); + return ret; } diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 6c69225..0310361 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -92,12 +92,6 @@ int qemuDomainDetachPciControllerDevice(struct qemud_driver *driver, int qemuDomainDetachNetDevice(struct qemud_driver *driver, virDomainObjPtr vm, virDomainDeviceDefPtr dev); -int qemuDomainDetachHostPciDevice(struct qemud_driver *driver, - virDomainObjPtr vm, - virDomainDeviceDefPtr dev); -int qemuDomainDetachHostUsbDevice(struct qemud_driver *driver, - virDomainObjPtr vm, - virDomainDeviceDefPtr dev); int qemuDomainDetachHostDevice(struct qemud_driver *driver, virDomainObjPtr vm, virDomainDeviceDefPtr dev); -- 1.7.3.4

2 2

[libvirt] [PATCH v4] virsh: Add option to undefine storage with domains
by Peter Krempa 16 Dec '11

16 Dec '11

Add an option for virsh undefine command, to remove associated storage volumes while undefining a domain. This patch allows the user to remove associated (libvirt managed ) storage volumes while undefining a domain. The new option --storage for the undefine command takes a string argument that consists of comma separated list of target or source path of volumes to be undefined. Volumes are removed after the domain has been successfully undefined, If a volume is not part of a storage pool, the user is warned to remove the volume in question himself. Option --wipe-storage may be specified along with this, that ensures the image is wiped before removing. Option --remove-all-storage enables the user to remove all storage. The name is chosen long as the users should be aware what they're about to do. --- Changes to v3: - fix ton'o'typos (I should install a spell checker.) - add a new variable to hold copy of argument to avoid confusion, typecasting ... - break volume string into tokens just once and store it in an array - add both target and source as volume description ( both are needed, as the user should know which volume he shoud delete, if the domain vanishes ) - reformat argument string in man - add example containing source path tools/virsh.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 18 ++++++ 2 files changed, 198 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index f6571f7..84b5e61 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1924,6 +1924,13 @@ static const vshCmdInfo info_undefine[] = { static const vshCmdOptDef opts_undefine[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name or uuid")}, {"managed-save", VSH_OT_BOOL, 0, N_("remove domain managed state file")}, + {"storage", VSH_OT_DATA, VSH_OFLAG_NONE, + N_("remove associated storage volumes (comma separated list of targets " + "or source paths) (see domblklist)")}, + {"remove-all-storage", VSH_OT_BOOL, 0, + N_("remove all associated storage volumes (use with caution)")}, + {"wipe-storage", VSH_OT_BOOL, VSH_OFLAG_NONE, + N_("wipe data on the removed volumes")}, {"snapshots-metadata", VSH_OT_BOOL, 0, N_("remove all domain snapshot metadata, if inactive")}, {NULL, 0, 0, NULL} @@ -1940,6 +1947,9 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) /* User-requested actions. */ bool managed_save = vshCommandOptBool(cmd, "managed-save"); bool snapshots_metadata = vshCommandOptBool(cmd, "snapshots-metadata"); + bool wipe_storage = vshCommandOptBool(cmd, "wipe-storage"); + bool remove_storage = false; + bool remove_all_storage = vshCommandOptBool(cmd, "remove-all-storage"); /* Positive if these items exist. */ int has_managed_save = 0; int has_snapshots_metadata = 0; @@ -1949,6 +1959,24 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) bool snapshots_safe = false; int rc = -1; int running; + /* list of volumes to remove along with this domain */ + const char *volumes_arg = NULL; + char *volumes = NULL; + char **volume_tokens = NULL; + char *volume_tok = NULL; + int nvolume_tokens = 0; + char *def = NULL; + char *source = NULL; + char *target = NULL; + int vol_i; + int tok_i; + xmlDocPtr doc = NULL; + xmlXPathContextPtr ctxt = NULL; + xmlNodePtr *vol_nodes = NULL; + int nvolumes = 0; + virStorageVolPtr vol = NULL; + bool vol_del_failed = false; if (managed_save) { flags |= VIR_DOMAIN_UNDEFINE_MANAGED_SAVE; @@ -1965,6 +1993,17 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false; + /* check if a string that should contain list of volumes to remove is present */ + if (vshCommandOptString(cmd, "storage", &volumes_arg) > 0) { + volumes = vshStrdup(ctl, volumes_arg); + + if (remove_all_storage) { + vshError(ctl, _("Specified both --storage and --remove-all-storage")); + goto cleanup; + } + remove_storage = true; + } + /* Do some flag manipulation. The goal here is to disable bits * from flags to reduce the likelihood of a server rejecting * unknown flag bits, as well as to track conditions which are @@ -2027,6 +2066,20 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) snapshots_safe = true; } + /* Stash domain description for later use */ + if (remove_storage || remove_all_storage) { + if (running) { + vshError(ctl, _("Storage volume deletion is supported only on stopped domains")); + goto cleanup; + } + + if (!(def = virDomainGetXMLDesc(dom, 0))) { + vshError(ctl, _("Could not retrieve domain XML description")); + goto cleanup; + } + } + /* Generally we want to try the new API first. However, while * virDomainUndefineFlags was introduced at the same time as * VIR_DOMAIN_UNDEFINE_MANAGED_SAVE in 0.9.4, the @@ -2076,9 +2129,138 @@ out: ret = true; } else { vshError(ctl, _("Failed to undefine domain %s"), name); + goto cleanup; + } + + /* try to undefine storage volumes associated with this domain, if it's requested */ + if (remove_storage || remove_all_storage) { + ret = false; + + /* tokenize the string from user and save it's parts into an array */ + if (volumes) { + /* count the delimiters */ + volume_tok = volumes; + nvolume_tokens = 1; /* we need at least one member */ + while (*volume_tok) { + if (*volume_tok == ',') + nvolume_tokens++; + volume_tok++; + } + + volume_tokens = vshCalloc(ctl, nvolume_tokens, sizeof(char *)); + + /* tokenize the input string */ + nvolume_tokens = 0; + volume_tok = volumes; + do { + volume_tokens[nvolume_tokens] = strsep(&volume_tok, ","); + nvolume_tokens++; + } while (volume_tok); + } + + doc = virXMLParseStringCtxt(def, _("(domain_definition)"), &ctxt); + if (!doc) + goto cleanup; + + nvolumes = virXPathNodeSet("./devices/disk", ctxt, &vol_nodes); + + if (nvolumes < 0) + goto cleanup; + + for (vol_i = 0; vol_i < nvolumes; vol_i++) { + ctxt->node = vol_nodes[vol_i]; + VIR_FREE(target); + VIR_FREE(source); + if (vol) { + virStorageVolFree(vol); + vol = NULL; + } + + /* get volume source and target paths */ + if (!(target = virXPathString("string(./target/@dev)", ctxt))) { + vshError(ctl, _("Failed to enumerate devices")); + goto cleanup; + } + + if (!(source = virXPathString("string(" + "./source/@file|" + "./source/@dir|" + "./source/@name|" + "./source/@dev)", ctxt)) && + virGetLastError()) + goto cleanup; + + /* lookup if volume was selected by user */ + if (volumes) { + volume_tok = NULL; + for (tok_i = 0; tok_i < nvolume_tokens; tok_i++) { + if (volume_tokens[tok_i] && + (STREQ_NULLABLE(volume_tokens[tok_i], target) || + STREQ_NULLABLE(volume_tokens[tok_i], source))) { + volume_tok = volume_tokens[tok_i]; + volume_tokens[tok_i] = NULL; + break; + } + } + if (!volume_tok) + continue; + } + + if (!source) + continue; + + if (!(vol = virStorageVolLookupByPath(ctl->conn, source))) { + vshPrint(ctl, + _("Storage volume '%s'(%s) is not managed by libvirt. " + "Remove it manually.\n"), target, source); + virResetLastError(); + continue; + } + + if (wipe_storage) { + vshPrint(ctl, _("Wiping volume '%s'(%s) ... "), target, source); + fflush(stdout); + if (virStorageVolWipe(vol, 0) < 0) { + vshError(ctl, _("Failed! Volume not removed.")); + vol_del_failed = true; + continue; + } else { + vshPrint(ctl, _("Done.\n")); + } + } + + /* delete the volume */ + if (virStorageVolDelete(vol, 0) < 0) { + vshError(ctl, _("Failed to remove storage volume '%s'(%s)"), + target, source); + vol_del_failed = true; + } + vshPrint(ctl, _("Volume '%s' removed.\n"), volume_tok?volume_tok:source); + } + + /* print volumes specified by user that were not found in domain definition */ + if (volumes) { + for (tok_i = 0; tok_i < nvolume_tokens; tok_i++) { + if (volume_tokens[tok_i]) + vshPrint(ctl, _("Volume '%s' was not found in domain's " + "definition.\n"), + volume_tokens[tok_i]); + } + } + + if (!vol_del_failed) + ret = true; } cleanup: + VIR_FREE(source); + VIR_FREE(target); + VIR_FREE(volumes); + VIR_FREE(volume_tokens); + VIR_FREE(def); + VIR_FREE(vol_nodes); + xmlFreeDoc(doc); + xmlXPathFreeContext(ctxt); virDomainFree(dom); return ret; } diff --git a/tools/virsh.pod b/tools/virsh.pod index c468f13..3976166 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1181,6 +1181,7 @@ Output the device used for the TTY console of the domain. If the information is not available the processes will provide an exit code of 1. =item B<undefine> I<domain-id> [I<--managed-save>] [I<--snapshots-metadata>] +[I<--storage> B<volumes> | I<--remove-all-storage> I<--wipe-storage>] Undefine a domain. If the domain is running, this converts it to a transient domain, without stopping it. If the domain is inactive, @@ -1196,6 +1197,23 @@ domain. Without the flag, attempts to undefine an inactive domain with snapshot metadata will fail. If the domain is active, this flag is ignored. +The I<--storage> flag takes a parameter B<volumes>, that is a comma separated +list of volume target names or source paths of storage volumes to be removed +along with the undefined domain. Volumes can be undefined and thus removed only +on inactive domains. Volume deletion is only attempted after the domain is +undefined; if not all of the requested volumes could be deleted, the +error message indicates what still remains behind. If a volume path is not +found in the domain definition, it's treated as if the volume was successfully +deleteted. +(See B<domblklist> for list of target names associated to a domain). +Example: --storage vda,/path/to/storage.img + +The I<--remove-all-storage> flag specifies that all of the domain's storage +volumes should be deleted. + +The flag I<--wipe-storage> specifies that the storage volumes should be +wiped before removal. + NOTE: For an inactive domain, the domain name or UUID must be used as the I<domain-id>. -- 1.7.3.4

2 2

[libvirt] possible 0.9.8 regression?
by Jim Fehlig 16 Dec '11

16 Dec '11

Hi All, I've noticed a regression in libvirt 0.9.8 on some of my kvm test machines # virsh start opensuse12 error: Failed to start domain opensuse12 error: Cannot open network interface control socket: Permission denied Opening a control socket for setting MAC addr, etc. failed with EACCES. In 0.9.7, the socket was opened with domain AF_INET, type SOCK_STREAM, which of course works on this system. In 0.9.8, the socket is opened with AF_PACKET, SOCK_DGRAM. Interestingly, a small test program calling 'socket(AF_PACKET, SOCK_DGRAM, 0)' works on this system. libvirt is built with '--without-capng --without-apparmor --without-selinux' and libvirtd is running with uid=euid=0. I'm really baffled why this fails in libvirtd but works otherwise. Any ideas? Thanks, Jim #include <stdio.h> #include <stdlib.h> #include <string.h> #include <errno.h> #include <unistd.h> #include <sys/socket.h> #include <netpacket/packet.h> #include <net/ethernet.h> int main(int argc, char **argv) { int fd; printf("Testing socket(2)...\n"); printf("Opening AF_INET, SOCK_STREAM socket\n"); fd = socket(AF_INET, SOCK_STREAM, 0); if (fd < 0) { printf("socket(2) failed with %s\n", strerror(errno)); exit(1); } close(fd); printf("Opening AF_PACKET, SOCK_DGRAM socket\n"); fd = socket(AF_PACKET, SOCK_DGRAM, 0); if (fd < 0) { printf("socket(2) failed with %s\n", strerror(errno)); exit(1); } close(fd); printf("Done!\n"); exit(0); }

1 0

[libvirt] [PATCH] Fix default migration speed in qemu driver
by Jim Fehlig 15 Dec '11

15 Dec '11

In commit 6f84e110 I mistakenly set default migration speed to 33554432 Mb! The units of migMaxBandwidth is Mb, with conversion handled in qemuMonitor{JSON,Text}SetMigrationSpeed(). Also, remove definition of QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX since it is no longer used after reverting commit ef1065cf. --- src/qemu/qemu_domain.h | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 35f9440..f40fa09 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -36,14 +36,7 @@ (1 << VIR_DOMAIN_VIRT_KVM) | \ (1 << VIR_DOMAIN_VIRT_XEN)) -# define QEMU_DOMAIN_DEFAULT_MIG_BANDWIDTH_MAX (32 << 20) -# if ULONG_MAX == 4294967295 -/* Qemu has a 64-bit limit, but we are limited by our historical choice of - * representing bandwidth in a long instead of a 64-bit int. */ -# define QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX ULONG_MAX -# else -# define QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX (INT64_MAX / (1024 * 1024)) -# endif +# define QEMU_DOMAIN_DEFAULT_MIG_BANDWIDTH_MAX 32 # define JOB_MASK(job) (1 << (job - 1)) # define DEFAULT_JOB_MASK \ -- 1.7.7

2 2

[libvirt] Need source for sanlock and libvirt-lock-sanlock
by Upendra Moturi 15 Dec '11

15 Dec '11

Hello Can some please point me the location of sanlock and libvirt-lock-sanlock source. And also install them from source. -- Thanks and Regards, Upendra.M As a leading developer of IT infrastructure software solutions, Hexagrid developed the first cloud computing platform that directly aligns with the real-world IT delivery models of both solution providers and enterprises. Hexagrid provides all the software and support that IT organizations need to successfully build public, private, or hybrid clouds that fit their specific business and end-user requirements. Hexagrid cloud solutions truly simplify and expedite virtual IT management, empowering successful cloud computing strategies that quickly increase profits by pooling resources, delivering control, and building value. Our Software, Your Cloud. For more information, visit www.hexagrid.com and follow @Hexagrid on Twitter

2 1

[libvirt] [libvirt-glib] Add annotations for gvir_stream_add_watch{_full}
by Christophe Fergeau 15 Dec '11

15 Dec '11

This should silence this compile warning: GEN LibvirtGObject-1.0.gir libvirt-gobject-stream.c:603: Warning: LibvirtGObject: gvir_stream_add_watch: argument func: Missing (scope) annotation for callback without GDestroyNotify (valid: call, async) This also adds API documentation for these functions. --- libvirt-gobject/libvirt-gobject-stream.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 6d8bbb8..6b75819 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -613,6 +613,18 @@ GSourceFuncs gvir_stream_source_funcs = { .finalize = gvir_stream_source_finalize, }; + +/** + * gvir_stream_add_watch: (skip): + * @stream: the stream + * @cond: the conditions to watch for (bitfield of #GVirStreamIOCondition) + * @func: (closure opaque): the function to call when the condition is satisfied + * @opaque: (closure): user data to pass to @func + * + * Adds a watch for @stream to the mainloop + * + * Returns: the event source id + */ guint gvir_stream_add_watch(GVirStream *stream, GVirStreamIOCondition cond, GVirStreamIOFunc func, @@ -626,6 +638,20 @@ guint gvir_stream_add_watch(GVirStream *stream, NULL); } +/** + * gvir_stream_add_watch_full: + * @stream: the stream + * @priority: the priority of the #GVirStream source + * @cond: the conditions to watch for (bitfield of #GVirStreamIOCondition) + * @func: (closure opaque): the function to call when the condition is satisfied + * @opaque: (closure): user data to pass to @func + * @notify: the function to call when the source is removed + * + * Adds a watch for @stream to the mainloop + * + * Returns: the event source id + * Rename to: gvir_stream_add_watch + */ guint gvir_stream_add_watch_full(GVirStream *stream, gint priority, GVirStreamIOCondition cond, -- 1.7.7.3

2 2

[libvirt] [PATCH libvirt-glib 1/2] Add binding for virDomainOpenConsole
by Daniel P. Berrange 15 Dec '11

15 Dec '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> --- libvirt-gobject/libvirt-gobject-domain.c | 48 ++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 6 ++++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 55 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 7bfb0ae..331a533 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -589,3 +589,51 @@ end: virStreamFree(st); return mime; } + + +/** + * gvir_domain_open_console: + * @dom: (transfer none): the domain + * @devname: (transfer none)(allow-none): the device name + * @stream: (transfer none): stream to use as output + * @flags: extra flags, currently unused + * + * Open a text console for the domain @dom, connecting it to the + * stream @stream. If @devname is NULL, the default console will + * be opened, otherwise @devname can be used to specify a non-default + * console device. + * + * Returns: TRUE if the console was opened, FALSE otherwise. + */ +gboolean gvir_domain_open_console(GVirDomain *dom, + GVirStream *stream, + const gchar *devname, + guint flags, + GError **err) +{ + GVirDomainPrivate *priv; + virStreamPtr st = NULL; + gboolean ret = FALSE; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(GVIR_IS_STREAM(stream), FALSE); + + priv = dom->priv; + g_object_get(stream, "handle", &st, NULL); + + if (virDomainOpenConsole(priv->handle, + devname, + st, + flags) < 0) { + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to open console"); + goto cleanup; + } + + ret = TRUE; +cleanup: + if (st != NULL) + virStreamFree(st); + return ret; +} diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index b9e39dd..3a4dd02 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -141,6 +141,12 @@ gchar *gvir_domain_screenshot(GVirDomain *dom, guint flags, GError **err); +gboolean gvir_domain_open_console(GVirDomain *dom, + GVirStream *stream, + const gchar *devname, + 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 d0444bd..caef28d 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -52,6 +52,7 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_domain_resume; gvir_domain_stop; gvir_domain_delete; + gvir_domain_open_console; gvir_domain_shutdown; gvir_domain_reboot; gvir_domain_get_config; -- 1.7.7.3

2 4

[libvirt] Storage pool/volume support in libvirt-gconfig
by Christophe Fergeau 15 Dec '11

15 Dec '11

Hi, This patch series adds configuration of storage pools and volumes to libvirt-gconfig. Nothing particularly exciting in there, just more gobjects and setters using the existing helpers. Maybe it would be worth introducing a gvir_config_object_set_content_with_attributes to factor some redundant code. Christophe

2 24

[libvirt] Transitioning from HMP to QMP for QEMU
by Stefan Hajnoczi 15 Dec '11

15 Dec '11

What is the status of QEMU's transition from HMP to the QMP interface? My current understanding is that QEMU provides new HMP commands for humans, but HMP is being phased out as an API. Management tools should rely only on QMP for new commands. That would mean new HMP commands are not guaranteed to produce backwards-compatible output because tools are not supposed to parse the output. On the libvirt side, new QEMU features should only be supported via the json monitor in the future (i.e. human monitor patches should not be sent/merged)? Existing HMP commands will still need the human monitor support in order to handle old QEMU versions gracefully, but I'm thinking about new commands only. Does everyone agree on this? I think this is an important discussion if we want our management interface to get better and more consistent in the future. Stefan

7 16

Re: [libvirt] FW: macvtap not working on rhel 6.1 x86 machine
by Amit Tewari 15 Dec '11

15 Dec '11

Hi, Can you please tell me what step iam missing? -----Original Message----- From: Gerhard Stenzel [mailto:gstenzel@linux.vnet.ibm.com] Sent: Thursday, December 15, 2011 5:03 PM To: Amit Tewari Cc: libvir-list(a)redhat.com Subject: RE: [libvirt] FW: macvtap not working on rhel 6.1 x86 machine On Thu, 2011-12-15 at 15:54 +0530, Amit Tewari wrote: > hi, > > i want the kvm guest machine to connect to network using macvtap.. > I tried this vepa mode it is also not working. where is your DHCP server? On the network or on your host? > eth0 has same mac address as that of macvatap0 that is 52:54:00:55:AE:B5 this is correct. The mac address of eth0 in the guest is the same as that of the macvtap device of the host. > due to this guest is not able to get dhcp address nor static ip address is working. it works for me. I am on 6.2 now, but this worked on 6.1 as well. -- Best regards, Gerhard Stenzel, ----------------------------------------------------------------------------------------------------------------------------------- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294 DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

1 0

Re: [libvirt] FW: macvtap not working on rhel 6.1 x86 machine
by Amit Tewari 15 Dec '11

15 Dec '11

hi, i want the kvm guest machine to connect to network using macvtap.. I tried this vepa mode it is also not working. My test environment Host os=rhel6.1 Guest os = rhel6.1 Libvirt=0.8.7 Kvm hypervisor I have made this entry in guest xml file <interface type='direct'> <source dev='eth0' mode='bridge'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> Now when I start the guest #virsh start guest Following macvtap0 is created on host and is shown below #ip link show macvtap0 51: macvtap0@eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UNKNOWN qlen 500 link/ether 52:54:00:55:AE:B5brd ff:ff:ff:ff:ff:ff but when the guest is up and I try to perform # ifup eth0 eth0 has same mac address as that of macvatap0 that is 52:54:00:55:AE:B5 due to this guest is not able to get dhcp address nor static ip address is working. Please let me know how macvtap work on kvm. -----Original Message----- From: Gerhard Stenzel [mailto:gstenzel@linux.vnet.ibm.com] Sent: Thursday, December 15, 2011 3:47 PM To: Amit Tewari Cc: libvir-list(a)redhat.com Subject: Re: [libvirt] FW: macvtap not working on rhel 6.1 x86 machine On Thu, 2011-12-15 at 15:20 +0530, Amit Tewari wrote: > > > Hi all, > > > > My test environment > > Host os=rhel6.1 x86 machine > > Guest os = rhel6.1 > > Libvirt=0.8.7 > > Kvm hypervisor > Hi, maybe it would help if you try to explain first, what you are trying to achieve, what your setup looks like (including your DHCP setup and switch infrastructure). Here (http://libvirt.org/formatdomain.html) you will find the following xml sample, which works: ... <devices> <interface type='direct'> <source dev='eth0' mode='vepa'/> </interface> </devices> ... This will connect your VM directly to the same network as eth0. Please be aware that, depending on your switch configuration (supports hair pin mode or not), your host might not be able to talk to your VM and vice versa. -- Best regards, Gerhard Stenzel, ----------------------------------------------------------------------------------------------------------------------------------- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294 DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

2 1

[libvirt] [PATCH] qemu: Fix race between async and query jobs
by Jiri Denemark 15 Dec '11

15 Dec '11

If an async job run on a domain will stop the domain at the end of the job, a concurrently run query job can hang in qemu monitor nothing can be done with that domain from this point on. An attempt to start such domain results in "Timed out during operation: cannot acquire state change lock" error. However, quite a few things have to happen at the right time... There must be an async job running, which stops a domain at the end. This race was with dump --crash but other similar jobs, such as (managed)save and migration, should be able to trigger this bug as well. While this async job is processing its last monitor command, that is a query-migrate to which qemu replies with status "completed", a new libvirt API that results in a query job must arrive and stay waiting until the query-migrate command finishes. Once query-migrate is done but before the async job closes qemu monitor while stopping the domain, the other thread needs to wake up and call qemuMonitorSend to send its command to qemu. Before qemu gets a chance to respond to this command, the async job needs to close the monitor. At this point, the query job thread is waiting for a condition that no-one will ever signal so it never finishes the job. --- src/qemu/qemu_monitor.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 4141fb7..35648ae 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -750,6 +750,20 @@ void qemuMonitorClose(qemuMonitorPtr mon) VIR_FORCE_CLOSE(mon->fd); } + /* In case another thread is waiting for its monitor command to be + * processed, we need to wake it up with appropriate error set. + */ + if (mon->msg) { + if (mon->lastError.code == VIR_ERR_OK) { + qemuReportError(VIR_ERR_OPERATION_FAILED, + _("Qemu monitor was closed")); + virCopyLastError(&mon->lastError); + virResetLastError(); + } + mon->msg->finished = 1; + virCondSignal(&mon->notify); + } + if (qemuMonitorUnref(mon) > 0) qemuMonitorUnlock(mon); } -- 1.7.8

2 2

[libvirt] FW: macvtap not working on rhel 6.1 x86 machine
by Amit Tewari 15 Dec '11

15 Dec '11

Hi all, My test environment Host os=rhel6.1 x86 machine Guest os = rhel6.1 Libvirt=0.8.7 Kvm hypervisor I am creating macvtap interface on host machine ip link add link eth1 name macvtap0 type macvtap ip link set macvtap0 up ip link show macvtap0 25: macvtap0@eth1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UNKNOWN qlen 500 link/ether a2:70:4e:05:4a:4e brd ff:ff:ff:ff:ff:ff Now when use arp -a to check macvtap0 hardware address entry it shows ? (10.0.7.1) at <incomplete> on macvtap0 If I assign ip address to macvtap and then ping on network , it says "destination not reachable" ping 10.0.7.1 -I macvtap0 PING 10.0.7.1 (10.0.7.1) from 10.0.1.61 macvtap0: 56(84) bytes of data. >From 10.0.1.61 icmp_seq=2 Destination Host Unreachable >From 10.0.1.61 icmp_seq=3 Destination Host Unreachable If I use tcpdump -I eth1 it shows packets 14:42:39.967158 ARP, Request who-has 10.0.7.1 tell 10.0.7.4, length 28 14:42:39.967257 ARP, Reply 10.0.7.1 is-at 00:16:35:65:b5:1e (oui Unknown), length 46 14:42:40.967167 ARP, Request who-has 10.0.7.1 tell 10.0.7.4, length 28 14:42:40.967229 ARP, Reply 10.0.7.1 is-at 00:16:35:65:b5:1e (oui Unknown), length 46 So macvtap0 is unknown interface. Request does go to eth1 inteface. Please let me know redhat 6.1 support macvtap or not?... I have to use it for kvm virtual machine.. DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

2 1

[libvirt] [PATCH 0/4] Add new public API virDomainGetPcpusUsage and pcpuinfo command in virsh
by Lai Jiangshan 15 Dec '11

15 Dec '11

"virt-top -1" can call virDomainGetPcpusUsage() periodically and get the CPU activities per CPU. (still require virt-top site patch). virsh is also added a pcpuinfo command which calls virDomainGetPcpusUsage(), it gets information about the physic CPUs, such as the usage of CPUs, the current attached vCPUs. # virsh pcpuinfo rhel6 CPU: 0 Curr VCPU: - Usage: 47.3 CPU: 1 Curr VCPU: 1 Usage: 46.8 CPU: 2 Curr VCPU: 0 Usage: 52.7 CPU: 3 Curr VCPU: - Usage: 44.1 Lai Jiangshan (4): Add new public API virDomainGetPcpusUsage remote: support new API virDomainGetPcpusUsage for remote driver qemu: implemnt new API virDomainGetPcpusUsage for qemu driver Enable the pcpuinfo command in virsh daemon/remote.c | 68 ++++++++++++++++++++++++++++++ include/libvirt/libvirt.h.in | 5 ++ python/generator.py | 1 + src/driver.h | 7 +++ src/libvirt.c | 51 +++++++++++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu.conf | 5 +- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_driver.c | 74 +++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 51 +++++++++++++++++++++++ src/remote/remote_protocol.x | 17 +++++++- src/remote_protocol-structs | 13 ++++++ src/util/cgroup.c | 7 +++ src/util/cgroup.h | 1 + tools/virsh.c | 93 ++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 5 ++ 16 files changed, 402 insertions(+), 4 deletions(-) -- 1.7.4.4

2 7

Re: [libvirt] macvtap nt working on kvm
by Amit Tewari 15 Dec '11

15 Dec '11

Hi Stefan, May be you can try again this test of macvtap on your environment, but please remove the bridge from eth0. because macvtap doesent work with bridge setup. -----Original Message----- From: Amit Tewari Sent: Thursday, December 15, 2011 9:05 AM To: 'Laine Stump'; libvir-list(a)redhat.com Subject: RE: [libvirt] macvtap nt working on kvm Hi, Actually macvatap doesn't work with bridge. So once the physical device is attached to a bridge, a macvtap attached to that device no longer works. In my case there is no bridge on the interface. but still guest os is not able to get ip address. Is there no support for macvtap on red hat 6.1 x_86 platforms? -----Original Message----- From: libvir-list-bounces(a)redhat.com [mailto:libvir-list-bounces@redhat.com] On Behalf Of Laine Stump Sent: Thursday, December 15, 2011 2:31 AM To: libvir-list(a)redhat.com Subject: Re: [libvirt] macvtap nt working on kvm On 12/14/2011 02:26 PM, Stefan Berger wrote: > On 12/14/2011 07:40 AM, Amit Tewari wrote: >> >> Hi all, >> >> My test environment >> >> Host os=rhel6.1 >> >> Guest os = rhel6.1 >> >> Libvirt=0.8.7 >> >> Kvm hypervisor >> >> I have made this entry in guest xml file >> >> <interface type='direct'> >> >> <source dev='eth0' mode='bridge'/> >> >> <model type='virtio'/> >> >> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' >> function='0x0'/> >> >> </interface> >> >> Now when I start the guest >> >> *#virsh start guest* >> >> Following macvtap0 is created on host and is shown below >> >> #*ip link show macvtap0* >> >> 51: macvtap0@eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc >> mq state UNKNOWN qlen 500 >> >> link/ether 52:54:00:55:AE:B5brd ff:ff:ff:ff:ff:ff >> >> but when the guest is up and I try to perform >> >> ** >> >> *# ifup eth0* >> >> *eth0 has same mac address as that of macvatap0 that is >> 52:54:00:55:AE:B5* >> >> ** >> >> *due to this guest is not able to get dhcp address nor static ip >> address is working*. >> >> Please let me know how macvtap work on kvm. >> > > I have tried your setup on my machine with the following host > configuration: > > # brctl show > bridge name bridge id STP enabled interfaces > br0 8000.001a64d00016 no eth0 > virbr0 8000.000000000000 yes > > If I use the configuration as you have shown it doesn't work for me, > either. However, if I use > > <source dev='br0' mode='bridge'/> > > then it works as expected. Do you happen to have a similar > configuration on the host with the interface the macvtap device wants > to use as 'source' being bridged? Interesting. So you're saying that once the physical device is attached to a bridge, a macvtap attached to that device no longer works? That's useful to know :-) -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

1 0

Re: [libvirt] macvtap nt working on kvm
by Amit Tewari 15 Dec '11

15 Dec '11

Hi, Actually macvatap doesn't work with bridge. So once the physical device is attached to a bridge, a macvtap attached to that device no longer works. In my case there is no bridge on the interface. but still guest os is not able to get ip address. Is there no support for macvtap on red hat 6.1 x_86 platforms? -----Original Message----- From: libvir-list-bounces(a)redhat.com [mailto:libvir-list-bounces@redhat.com] On Behalf Of Laine Stump Sent: Thursday, December 15, 2011 2:31 AM To: libvir-list(a)redhat.com Subject: Re: [libvirt] macvtap nt working on kvm On 12/14/2011 02:26 PM, Stefan Berger wrote: > On 12/14/2011 07:40 AM, Amit Tewari wrote: >> >> Hi all, >> >> My test environment >> >> Host os=rhel6.1 >> >> Guest os = rhel6.1 >> >> Libvirt=0.8.7 >> >> Kvm hypervisor >> >> I have made this entry in guest xml file >> >> <interface type='direct'> >> >> <source dev='eth0' mode='bridge'/> >> >> <model type='virtio'/> >> >> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' >> function='0x0'/> >> >> </interface> >> >> Now when I start the guest >> >> *#virsh start guest* >> >> Following macvtap0 is created on host and is shown below >> >> #*ip link show macvtap0* >> >> 51: macvtap0@eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc >> mq state UNKNOWN qlen 500 >> >> link/ether 52:54:00:55:AE:B5brd ff:ff:ff:ff:ff:ff >> >> but when the guest is up and I try to perform >> >> ** >> >> *# ifup eth0* >> >> *eth0 has same mac address as that of macvatap0 that is >> 52:54:00:55:AE:B5* >> >> ** >> >> *due to this guest is not able to get dhcp address nor static ip >> address is working*. >> >> Please let me know how macvtap work on kvm. >> > > I have tried your setup on my machine with the following host > configuration: > > # brctl show > bridge name bridge id STP enabled interfaces > br0 8000.001a64d00016 no eth0 > virbr0 8000.000000000000 yes > > If I use the configuration as you have shown it doesn't work for me, > either. However, if I use > > <source dev='br0' mode='bridge'/> > > then it works as expected. Do you happen to have a similar > configuration on the host with the interface the macvtap device wants > to use as 'source' being bridged? Interesting. So you're saying that once the physical device is attached to a bridge, a macvtap attached to that device no longer works? That's useful to know :-) -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

1 0

[libvirt] [PATCH RESEND] qemu: Do not free the device from activePciHostdevs if it's in use
by Osier Yang 15 Dec '11

15 Dec '11

* src/qemu/qemu_hostdev.c (qemuDomainReAttachHostdevDevices): pciDeviceListFree(pcidevs) in the end free()s the device even if it's in use by other domain, which can cause rase. How to reproduce: <script> virsh nodedev-dettach pci_0000_00_19_0 virsh start test virsh attach-device test hostdev.xml virsh start test2 for i in {1..5}; do echo "[ -- ${i}th time --]" virsh nodedev-reattach pci_0000_00_19_0 done echo "clean up" virsh destroy test virsh nodedev-reattach pci_0000_00_19_0 </script> Device pci_0000_00_19_0 dettached Domain test started Device attached successfully error: Failed to start domain test2 error: Requested operation is not valid: PCI device 0000:00:19.0 is in use by domain test [ -- 1th time --] Device pci_0000_00_19_0 re-attached [ -- 2th time --] Device pci_0000_00_19_0 re-attached [ -- 3th time --] Device pci_0000_00_19_0 re-attached [ -- 4th time --] Device pci_0000_00_19_0 re-attached [ -- 5th time --] Device pci_0000_00_19_0 re-attached clean up Domain test destroyed Device pci_0000_00_19_0 re-attached The patch also fixes another problem, there won't be error like "qemuDomainReAttachHostdevDevices: Not reattaching active device 0000:00:19.0" in daemon log if some device is in active. As pciResetDevice and pciReattachDevice won't be called for the device anymore. This is sensiable as we already reported error when preparing the device if it's active. Blindly trying to pciResetDevice & pciReattachDevice on the device and getting an error is just redundant. --- src/qemu/qemu_hostdev.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 9137388..60401f0 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -414,8 +414,10 @@ void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, */ activeDev = pciDeviceListFind(driver->activePciHostdevs, dev); if (activeDev && - STRNEQ_NULLABLE(name, pciDeviceGetUsedBy(activeDev))) + STRNEQ_NULLABLE(name, pciDeviceGetUsedBy(activeDev))) { + pciDeviceListSteal(pcidevs, dev); continue; + } /* pciDeviceListFree() will take care of freeing the dev. */ pciDeviceListSteal(driver->activePciHostdevs, dev); -- 1.7.7.3

2 2

[libvirt] [PATCH RESEND] qemu: Honor the original properties of PCI device when detaching
by Osier Yang 15 Dec '11

15 Dec '11

This patch fixes two problems: 1) The device will be reattached to host even if it's not managed, as there is a "pciDeviceSetManaged". 2) The device won't be reattached to host with original driver properly. As it doesn't honor the device original properties which are maintained by driver->activePciHostdevs. --- src/qemu/qemu_hotplug.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 96c0070..19e4a41 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1960,6 +1960,7 @@ int qemuDomainDetachHostPciDevice(struct qemud_driver *driver, qemuDomainObjPrivatePtr priv = vm->privateData; int i, ret; pciDevice *pci; + pciDevice *activePci; for (i = 0 ; i < vm->def->nhostdevs ; i++) { if (vm->def->hostdevs[i]->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || @@ -2019,16 +2020,16 @@ int qemuDomainDetachHostPciDevice(struct qemud_driver *driver, detach->source.subsys.u.pci.bus, detach->source.subsys.u.pci.slot, detach->source.subsys.u.pci.function); - if (!pci) - ret = -1; - else { - pciDeviceSetManaged(pci, detach->managed); - pciDeviceListDel(driver->activePciHostdevs, pci); - if (pciResetDevice(pci, driver->activePciHostdevs, NULL) < 0) + if (pci) { + activePci = pciDeviceListSteal(driver->activePciHostdevs, pci); + if (pciResetDevice(activePci, driver->activePciHostdevs, NULL)) + qemuReattachPciDevice(activePci, driver); + else ret = -1; - pciDeviceReAttachInit(pci); - qemuReattachPciDevice(pci, driver); pciFreeDevice(pci); + pciFreeDevice(activePci); + } else { + ret = -1; } if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE) && -- 1.7.7.3

2 2

[libvirt] [PATCH 0/4] Add support for QEMU guest agent control
by Daniel P. Berrange 15 Dec '11

15 Dec '11

The QEMU guest agent "/usr/bin/qemu-ga" has some handy functions for controlling the guest, not least, shutdown/reboot and filesystem freeze/thaw. In Fedora 15/16 the semantics of the ACPI power button have been changed to suspend-to-RAM which breaks our current shutdown implementation. By adding support for the agent we gain a more predictable way to shutdown / reboot guests. NB: the code currently has the same "flaw" as the monitor, in so much as we wait forever for a guest agent reply. We need to add a timeout ability to the agent code

3 17

[libvirt] macvtap nt working on kvm
by Amit Tewari 14 Dec '11

14 Dec '11

Hi all, My test environment Host os=rhel6.1 Guest os = rhel6.1 Libvirt=0.8.7 Kvm hypervisor I have made this entry in guest xml file <interface type='direct'> <source dev='eth0' mode='bridge'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> Now when I start the guest #virsh start guest Following macvtap0 is created on host and is shown below #ip link show macvtap0 51: macvtap0@eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UNKNOWN qlen 500 link/ether 52:54:00:55:AE:B5brd ff:ff:ff:ff:ff:ff but when the guest is up and I try to perform # ifup eth0 eth0 has same mac address as that of macvatap0 that is 52:54:00:55:AE:B5 due to this guest is not able to get dhcp address nor static ip address is working. Please let me know how macvtap work on kvm. DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

3 3

Re: [libvirt] libvirt support on QNX
by Chandrashekhar Jamadarkhani (cjamadar) 14 Dec '11

14 Dec '11

Config.h file is missing in qnx. What is the path to config.h in linux ? Build Error (pasted here for one file only) src/util/iptables.c:22:20: error: config.h: No such file or directory Thanks, Chandrashekhar -----Original Message----- From: Chandrashekhar Jamadarkhani (cjamadar) Sent: Wednesday, December 14, 2011 3:24 PM To: 'Daniel P. Berrange' Subject: RE: libvirt support on QNX Thanks Daniel ! We are using Jamfile instead of Makefile in our build environment. Let me check how can I build the same in our build environment. Thanks, Chandarshekhar -----Original Message----- From: Daniel P. Berrange [mailto:berrange@redhat.com] Sent: Wednesday, December 14, 2011 2:56 PM To: Chandrashekhar Jamadarkhani (cjamadar) Subject: Re: libvirt support on QNX On Wed, Dec 14, 2011 at 02:50:31PM +0530, Chandrashekhar Jamadarkhani (cjamadar) wrote: > Thanks Daniel. I should port only src/rpc to QNX or anything else I need to port to QNX ? You basically want to build with ./configure \ --enable-compile-warnings=error \ --without-xen \ --without-qemu \ --without-openvz \ --without-lxc \ --without-vbox \ --without-xenapi \ --without-esx \ --without-uml \ --without-sasl \ --without-avahi \ --without-polkit \ --without-python \ --without-libvirtd \ --without-phyp \ --without-hyperv \ --without-netcf \ --without-audit \ --without-dtrace And then fix whatever fails to build (if anything). This should only be stuff in src/util src/conf src/rpc src/remote Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 1

[libvirt] [PATCH 0/3] spec file fixes
by Eric Blake 14 Dec '11

14 Dec '11

Several spec file patches that I've noticed by comparing against open BZs and existing RPMs. Probably all worth including in 0.9.8, but I'm not comfortable pushing them without a review. Eric Blake (3): spec: always autoreconf when building rpm spec: add dmidecode as prereq spec: fix sanlock dependency libvirt.spec.in | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) -- 1.7.7.3

5 25

[libvirt] [PATCH] python: Expose blockPeek and memoryPeek in Python binding
by Osier Yang 14 Dec '11

14 Dec '11

An simple example to show to use it: \#! /usr/bin/python import os import sys import libvirt disk = "/var/lib/libvirt/images/test.img" conn = libvirt.open(None) dom = conn.lookupByName('test') mem_contents = dom.memoryPeek(0, 128, libvirt.VIR_MEMORY_VIRTUAL); sys.stdout.write(mem_contents) % python test.py | hexdump 0000000 1660 0209 0000 0000 0000 0000 0000 0000 0000010 0000 0000 0000 0000 d3a0 01d0 0000 0000 0000020 --- python/generator.py | 1 + python/libvirt-override-api.xml | 17 +++++++++ python/libvirt-override.c | 75 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+), 0 deletions(-) diff --git a/python/generator.py b/python/generator.py index 88c52b9..1657f4f 100755 --- a/python/generator.py +++ b/python/generator.py @@ -262,6 +262,7 @@ py_types = { 'unsigned char *': ('z', None, "charPtr", "char *"), 'char *': ('z', None, "charPtr", "char *"), 'const char *': ('z', None, "charPtrConst", "const char *"), + 'size_t': ('n', None, "size_t", "size_t"), 'virDomainPtr': ('O', "virDomain", "virDomainPtr", "virDomainPtr"), 'const virDomainPtr': ('O', "virDomain", "virDomainPtr", "virDomainPtr"), diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index 7c18763..2e0c7cb 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -405,5 +405,22 @@ <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainModificationImpact'/> <return type='int' info='0 in case of success, -1 in case of failure'/> </function> + <function name='virDomainBlockPeek' file='python'> + <info>Read the contents of domain's disk device</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='disk' type='const char *' info='disk name'/> + <arg name='offset' type='unsigned long long' info='offset within block device'/> + <arg name='size' type='size_t' info='size to read'/> + <arg name='flags' type='unsigned int' info='unused, always passed 0'/> + <return type='char *' info='the returned buffer or None in case of error'/> + </function> + <function name='virDomainMemoryPeek' file='python'> + <info>Read the contents of domain's memory</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='start' type='unsigned long long' info='start of memory to peek'/> + <arg name='size' type='size_t' info='size of memory to peek'/> + <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainMemoryFlags'/> + <return type='char *' info='the returned buffer or None in case of error'/> + </function> </symbols> </api> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 9e98918..64d7943 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -5017,6 +5017,79 @@ libvirt_virDomainMigrateGetMaxSpeed(PyObject *self ATTRIBUTE_UNUSED, PyObject *a return(py_retval); } +static PyObject * +libvirt_virDomainBlockPeek(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + PyObject *py_retval = NULL; + int c_retval; + virDomainPtr domain; + PyObject *pyobj_domain; + const char *disk; + unsigned long long offset; + size_t size; + char *buf; + unsigned int flags; + + if (!PyArg_ParseTuple(args, (char *)"OzLni:virDomainBlockPeek", &pyobj_domain, + &disk, &offset, &size, &flags)) + return(NULL); + + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if ((buf = malloc(size)) == NULL) + return VIR_PY_NONE; + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainBlockPeek(domain, disk, offset, size, buf, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + goto cleanup; + + py_retval = PyString_FromStringAndSize(buf, size); + +cleanup: + memset(buf, 0, size); + free(buf); + return py_retval; +} + +static PyObject * +libvirt_virDomainMemoryPeek(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + PyObject *py_retval = NULL; + int c_retval; + virDomainPtr domain; + PyObject *pyobj_domain; + unsigned long long start; + size_t size; + char *buf; + unsigned int flags; + + if (!PyArg_ParseTuple(args, (char *)"OLni:virDomainMemoryPeek", &pyobj_domain, + &start, &size, &flags)) + return(NULL); + + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if ((buf = malloc(size)) == NULL) + return VIR_PY_NONE; + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainMemoryPeek(domain, start, size, buf, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + goto cleanup; + + py_retval = PyString_FromStringAndSize(buf, size); + +cleanup: + memset(buf, 0, size); + free(buf); + return py_retval; +} + /************************************************************************ * * * The registration stuff * @@ -5112,6 +5185,8 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainGetBlockIoTune", libvirt_virDomainGetBlockIoTune, METH_VARARGS, NULL}, {(char *) "virDomainSendKey", libvirt_virDomainSendKey, METH_VARARGS, NULL}, {(char *) "virDomainMigrateGetMaxSpeed", libvirt_virDomainMigrateGetMaxSpeed, METH_VARARGS, NULL}, + {(char *) "virDomainBlockPeek", libvirt_virDomainBlockPeek, METH_VARARGS, NULL}, + {(char *) "virDomainMemoryPeek", libvirt_virDomainMemoryPeek, METH_VARARGS, NULL}, {NULL, NULL, 0, NULL} }; -- 1.7.1

2 2

[libvirt] [PATCH] rpc: retry to call dup() if fcntl with CLOEXEC fails
by dongsu.park＠profitbricks.com 14 Dec '11

14 Dec '11

From: Dongsu Park <dongsu.park(a)profitbricks.com> If fcntl with F_DUPFD_CLOEXEC fails, we need to try again to use dup() to get the fd, instead of giving up right away. Signed-off-by: Dongsu Park <dongsu.park(a)profitbricks.com> Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> --- src/rpc/virnetsocket.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index af4fc5e..25c7891 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -778,8 +778,15 @@ int virNetSocketDupFD(virNetSocketPtr sock, bool cloexec) { int fd; - if (cloexec) + if (cloexec) { fd = fcntl(sock->fd, F_DUPFD_CLOEXEC); + /* retry to use dup if fcntl fails */ + if (fd < 0) { + virReportSystemError(errno, "%s", + _("fcntl failed, reverting to dup")); + fd = dup(sock->fd); + } + } else fd = dup(sock->fd); if (fd < 0) { -- 1.7.7.2

2 1

[libvirt] Fwd: [MacPorts] #32523: libvirt: update to 0.9.8
by Justin Clift 14 Dec '11

14 Dec '11

Hi all, Just an FYI. Libvirt is now available through the Mac "MacPorts" package system, as well as HomeBrew. Hope that's useful. :) Regards and best wishes, Justin Clift Begin forwarded message: > From: MacPorts <noreply(a)macports.org> > Subject: Re: [MacPorts] #32523: libvirt: update to 0.9.8 > Date: 14 December 2011 3:39:10 PM AEDT > To: ryandesign(a)macports.org, jclift(a)redhat.com > Cc: macports-tickets(a)lists.macosforge.org > Reply-To: macports-dev(a)lists.macosforge.org > > #32523: libvirt: update to 0.9.8 > --------------------------------------+------------------------------------- > Reporter: ryandesign@… | Owner: jclift@… > Type: defect | Status: closed > Priority: Normal | Milestone: > Component: ports | Version: 2.0.3 > Resolution: fixed | Keywords: haspatch > Port: libvirt | > --------------------------------------+------------------------------------- > Changes (by ryandesign@…): > > * status: new => closed > * resolution: => fixed > > > Comment: > > r87956. > > -- > Ticket URL: <https://trac.macports.org/ticket/32523#comment:4> > MacPorts <http://www.macports.org/> > Ports system for Mac OS -- Aeolus Community Manager http://www.aeolusproject.org

1 0

Re: [libvirt] libvirt support on QNX
by Chandrashekhar Jamadarkhani (cjamadar) 14 Dec '11

14 Dec '11

In which dir the source code for libvirt RPC client driver located to port it to QNX ? Is it in libvirt-0.9.8/src/remote ? Thanks, Chandrashekhar Hi Daniel, Thanks Daniel for the info. I was talking only about porting libvirt RPC client driver to QNX for starting/monitoring VMs running on remote RHEL based host. Let me try porting the libvirt RPC client driver to QNX. Thanks, Chandrashekhar -----Original Message----- From: Daniel P. Berrange [mailto:berrange redhat com] Sent: Wednesday, November 16, 2011 4:07 PM To: Chandrashekhar Jamadarkhani (cjamadar) Cc: libvir-list redhat com Subject: Re: [libvirt] libvirt support on QNX On Wed, Nov 16, 2011 at 03:32:19PM +0530, Chandrashekhar Jamadarkhani (cjamadar) wrote: > Hi, > > > > I'm planning to use libvirt in a remote machine which is running on QNX > RTOS. Whether libvirt is ported to QNX, if not any problems in porting > libvirt lib to QNX ? AFAIK, no one has ever said they've tried libvirt on QNX. I presume you are talking about the libvirt RPC client driver only, or are you planning to create some kind of hypervisor driver too ? The libvirt RPC client driver is probably the most portable bit of our code, only depending on a good sockets layer implementation & GNUTLS. So if you pass flags to configure to disable all drivers, except for the remote driver, you should be able to build it without undue trouble. Regards, Daniel

2 1

[libvirt] [test-API][PATCH 1/2] Add support for spice graphics
by Nan Zhang 14 Dec '11

14 Dec '11

* utils/Python/xmlgenerator.py: This extends graphics element for spice XML composing, and support sub-elements settings for audio, images, streaming and so on: <graphics type='spice' autoport='yes'> <image compression='auto_glz'/> <jpeg compression='auto'/> <zlib compression='auto'/> <playback compression='on'/> <streaming mode='filter'/> <clipboard copypaste='no'/> </graphics> * utils/Python/xmlbuilder.py: Add 2 methods add_graphics() and build_graphics() to XmlBuilder class. --- utils/Python/xmlbuilder.py | 36 +++++++++++++++++++++++- utils/Python/xmlgenerator.py | 62 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 91 insertions(+), 7 deletions(-) diff --git a/utils/Python/xmlbuilder.py b/utils/Python/xmlbuilder.py index 5a0f8c8..739eccb 100644 --- a/utils/Python/xmlbuilder.py +++ b/utils/Python/xmlbuilder.py @@ -64,6 +64,13 @@ class XmlBuilder: hostdev_node, domain.getElementsByTagName("console")[0]) return hostdev + def add_graphics(self, params, domain): + graphics = xmlgenerator.graphics_xml(params) + graphics_node = domain.importNode(graphics.childNodes[0], True) + domain.getElementsByTagName("devices")[0].insertBefore( + graphics_node, domain.getElementsByTagName("console")[0]) + return graphics + def build_domain_install(self, params): domain = xmlgenerator.domain_xml(params, True) self.add_disk(params, domain) @@ -151,6 +158,12 @@ class XmlBuilder: self.write_toxml(hostdev) return hostdev.toxml() + def build_graphics(self, params): + graphics = xmlgenerator.graphics_xml(params) + if __DEBUG__: + self.write_toxml(graphics) + return graphics.toxml() + def build_pool(self, params): pool = xmlgenerator.pool_xml(params) if __DEBUG__: @@ -242,6 +255,20 @@ if __name__ == "__main__": interfacexml = xmlobj.build_interface(params) + #-------------------------- + # get graphics xml string + #-------------------------- + print '=' * 30, 'graphics xml', '=' * 30 + params['graphtype'] = 'spice' + params['image'] = 'auto_glz' + params['jpeg'] = 'auto' + params['zlib'] = 'auto' + params['playback'] = 'on' + params['streaming'] = 'filter' + params['clipboard'] = 'no' + + graphicsxml = xmlobj.build_graphics(params) + #--------------------- # get pool xml string #--------------------- @@ -297,6 +324,13 @@ if __name__ == "__main__": params['memory'] = '1048576' params['vcpu'] = '2' params['inputbus'] = 'usb' + params['graphtype'] = 'spice' + params['image'] = 'auto_glz' + params['jpeg'] = 'auto' + params['zlib'] = 'auto' + params['playback'] = 'on' + params['streaming'] = 'filter' + params['clipboard'] = 'no' params['sound'] = 'ac97' params['bootcd'] = '/iso/rhel5.iso' @@ -367,7 +401,7 @@ if __name__ == "__main__": #---------------------------------------- # get domain snapshot xml string #---------------------------------------- - params['name'] = 'hello' + params['snapshotname'] = 'hello' params['description'] = 'hello snapshot' snapshot_xml = xmlobj.build_domain_snapshot(params) diff --git a/utils/Python/xmlgenerator.py b/utils/Python/xmlgenerator.py index d57dd33..460f2e5 100644 --- a/utils/Python/xmlgenerator.py +++ b/utils/Python/xmlgenerator.py @@ -233,12 +233,6 @@ def domain_xml(params, install = False): input_element.setAttribute('bus', 'ps2') devices_element.appendChild(input_element) - # <graphics> - graphics_element = domain.createElement('graphics') - graphics_element.setAttribute('type', 'vnc') - graphics_element.setAttribute('port', '-1') - graphics_element.setAttribute('keymap', 'en-us') - devices_element.appendChild(graphics_element) domain_element.appendChild(devices_element) # <sound> @@ -253,6 +247,62 @@ def domain_xml(params, install = False): return domain +def graphics_xml(params): + graphics = xml.dom.minidom.Document() + # <graphics> + graphics_element = graphics.createElement('graphics') + if not params.has_key('graphtype'): + params['graphtype'] == 'vnc' + + graphics_element.setAttribute('type', params['graphtype']) + graphics.appendChild(graphics_element) + + if params['graphtype'] == 'vnc': + graphics_element.setAttribute('port', '-1') + graphics_element.setAttribute('keymap', 'en-us') + elif params['graphtype'] == 'spice': + graphics_element.setAttribute('autoport', 'yes') + if params.has_key('image'): + image_element = graphics.createElement('image') + # image to set image compression (accepts + # auto_glz, auto_lz, quic, glz, lz, off) + image_element.setAttribute('compression', params['image']) + graphics_element.appendChild(image_element) + if params.has_key('jpeg'): + jpeg_element = graphics.createElement('jpeg') + # jpeg for JPEG compression for images over wan (accepts + # auto, never, always) + jpeg_element.setAttribute('compression', params['jpeg']) + graphics_element.appendChild(jpeg_element) + if params.has_key('zlib'): + zlib_element = graphics.createElement('zlib') + # zlib for configuring wan image compression (accepts + # auto, never, always) + zlib_element.setAttribute('compression', params['zlib']) + graphics_element.appendChild(zlib_element) + if params.has_key('playback'): + playback_element = graphics.createElement('playback') + # playback for enabling audio stream compression (accepts on or off) + playback_element.setAttribute('compression', params['playback']) + graphics_element.appendChild(playback_element) + if params.has_key('streaming'): + streaming_element = graphics.createElement('streaming') + # streamming for settings it's mode attribute to one of + # filter, all or off + streaming_element.setAttribute('mode', params['streaming']) + graphics_element.appendChild(streaming_element) + if params.has_key('clipboard'): + clipboard_element = graphics.createElement('clipboard') + # Copy & Paste functionality is enabled by default, and can + # be disabled by setting the copypaste property to no + clipboard_element.setAttribute('copypaste', params['clipboard']) + graphics_element.appendChild(clipboard_element) + else: + print 'Wrong graphics type was specified.' + sys.exit(1) + + return graphics + def disk_xml(params, cdrom = False): disk = xml.dom.minidom.Document() # <disk> -- START -- 1.7.4.4

2 4

[libvirt] [test-API][PATCH] Add test case set_cpu_shares.py for setting cpu scheduler info
by Nan Zhang 14 Dec '11

14 Dec '11

* repos/domain/set_cpu_shares.py: set the value of cpu_shares property of the guest. --- repos/domain/set_cpu_shares.py | 111 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) create mode 100644 repos/domain/set_cpu_shares.py diff --git a/repos/domain/set_cpu_shares.py b/repos/domain/set_cpu_shares.py new file mode 100644 index 0000000..4560809 --- /dev/null +++ b/repos/domain/set_cpu_shares.py @@ -0,0 +1,111 @@ +#!/usr/bin/env python +"""Set the value of cpu_shares property of the guest + domain:set_cpu_shares + guestname + xxx + flags + 0|1|2 +""" + +__author__ = 'Nan Zhang: nzhang(a)redhat.com' +__date__ = 'Tue Sep 27, 2011' +__version__ = '0.1.0' +__credits__ = 'Copyright (C) 2011 Red Hat, Inc.' +__all__ = ['check_params', 'check_cpu_shares', 'set_cpu_shares'] + +import os +import re +import sys +import time +from xml.dom import minidom + + +def append_path(path): + """Append root path of package""" + if path in sys.path: + pass + else: + sys.path.append(path) + +pwd = os.getcwd() +result = re.search('(.*)libvirt-test-API', pwd) +append_path(result.group(0)) + +from lib import connectAPI +from lib import domainAPI +from utils.Python import utils +from utils.Python import xmlbuilder +from exception import LibvirtAPI + +def check_params(params): + """Verify inputing parameter dictionary""" + logger = params['logger'] + keys = ['guestname', 'flags'] + for key in keys: + if key not in params: + logger.error("%s is required" %key) + return 1 + return 0 + +def check_cpu_shares(params, util, guestname, cpu_shares): + """Check the value of cpu_shares""" + logger = params['logger'] + cmd = "cat /cgroup/cpu/libvirt/qemu/%s/cpu.shares" % guestname + ret, out = util.exec_cmd(cmd, shell=True) + if ret: + logger.error("fail to set the value of cpu_shares: %s" % out[0]) + return 0 + else: + logger.info("from cgroup, the value of cpu_shares is %s" % out[0]) + + if cmp(int(out[0]), cpu_shares): + return 1 + else: + logger.info("the value of cpu_shares does match the original \ +cpu scheduler information.") + return 0 + +def set_cpu_shares(params): + """Get the cpu scheduler information""" + # Initiate and check parameters + params_check_result = check_params(params) + if params_check_result: + return 1 + logger = params['logger'] + guestname = params['guestname'] + flags = params['flags'] + schedinfo = {} + schedinfo['cpu_shares'] = 2048 + cpu_shares = schedinfo['cpu_shares'] + + # Connect to local hypervisor connection URI + util = utils.Utils() + uri = util.get_uri('127.0.0.1') + conn = connectAPI.ConnectAPI() + virconn = conn.open(uri) + + caps = conn.get_caps() + logger.debug(caps) + + domobj = domainAPI.DomainAPI(virconn) + try: + domobj.set_sched_params_flags(guestname, schedinfo, int(flags)) + logger.debug("set the value of cpu_shares with %s" % cpu_shares) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % + (e.response()['message'], e.response()['code'])) + return 1 + + check_result = check_cpu_shares(params, util, guestname, cpu_shares) + if check_result: + logger.error("cpu_shares does not match.") + conn.close() + return 1 + + logger.info("success to set scheduler parameters.") + conn.close() + return 0 + +def set_cpu_shares_clean(): + """Clean testing environment""" + pass -- 1.7.4.4

4 8