- Devel - libvirt List Archives

[libvirt] [PATCH] LXC: Change incorrect error report in lxcContainerPivotRoot
by Gao feng 16 Dec '13

16 Dec '13

The newroot is not mounted as tmpfs, we bind root->src to it. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index fbce8e8..86705a7 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -706,8 +706,8 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) /* ... and mount our root onto it */ if (mount(root->src, newroot, NULL, MS_BIND|MS_REC, NULL) < 0) { virReportSystemError(errno, - _("Failed to bind new root %s into tmpfs"), - root->src); + _("Failed to bind %s to new root %s"), + root->src, newroot); goto err; } -- 1.8.3.1

2 2

[libvirt] First mail & (long) question
by Joaquim Barrera 16 Dec '13

16 Dec '13

Hello everybody! I would like to introduce myself, as this is my first contact with libvirt mailing list (although I've been reading quite a lot of documentation). My name is Joaquim Barrera, from Barcelona, Catalonia. I am a computer engineer and recently I joined a research group here in the university. My task is related to VM migration and management, and since then (a couple of months) I've been trying to figure some things up. Now I need to go one step forward, and I would like to set up a nice dev environment to try some modifications we want to make to libvirt, such as new API or migration-related-stuff. Although I am familiar with linux environrment and programming, I am not really quite familiar with this kind of, may I say, professional development, and there are some issues I need to solve before start writting code. Some of this issues you'll find not relevant or newbie stuff, but I assure you I tried lots of times before coming here. :-) Here is what I got following the instructions in http://libvirt.org/compiling.html $ ./autogen.sh --system $ make After make finishes I have compiled 1.2.0 libvirt in the source tree, and if I execute 'sudo ./run tools/virsh version' I get a this answer: /Compiled against library: libvirt 1.2.0// //Using library: libvirt 1.2.0// //Using API: QEMU 1.2.0// //Running hypervisor: QEMU 1.5.0/ (note that now I need to run virsh with sudo, I don't know exactly why) So far, so good. I guess that, with --system flag, 1.2.0 custom libvirt uses config files from standard directories such as /etc/libvirt/libvirtd.conf, and if I used a custom directory instead, I would have to redefine my VMs, am I right? Problems come when I want to use custom 1.2.0 daemon. If I execute "sudo service libvirt-bin stop" followed by "./daemon/libvirtd -d", then custom virsh gives me this error: /error: failed to connect to the hypervisor// //error: no valid connection// //error: Failed to connect socket to '/var/run/libvirt/libvirt-sock': No such file or directory/ And I need to kill custom daemon and restart 1.1.1 libvirtd to recover from this. Any advice? Finally (sorry about this large mail), there is one thing that does bother me quite a lot. Using custom virsh, command history seems to vanish, as I press Arrow-UP and I get "^[[A" in the screen, instead of last command used. Tell me, please, that this is just some silly config I need to adjust... :_( The final comment is, am I following the right direction to be able to develop something with libvirt? ^^ Ok, that's all for now, thank you A LOT for your time. Joaquim.

3 2

[libvirt] [test-api][PATCH] Fix issue : nwfilter list never success
by Time Su 16 Dec '13

16 Dec '13

Fix issue : nwfilter list never success --- repos/nwfilter/nwfilter_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/nwfilter/nwfilter_list.py b/repos/nwfilter/nwfilter_list.py index 0a3718e..8c392bc 100644 --- a/repos/nwfilter/nwfilter_list.py +++ b/repos/nwfilter/nwfilter_list.py @@ -48,7 +48,7 @@ def nwfilter_list(params): nwfilter_list_dir = get_nwfilterlist_dir() if nwfilter_num == len(nwfilter_list_api) and \ len(nwfilter_list_api) == len(nwfilter_list_dir) and \ - cmp(nwfilter_namelist_api,nwfilter_list_dir): + cmp(nwfilter_namelist_api,nwfilter_list_dir) == 0 : logger.info("The number of available network filters is %s" % \ nwfilter_num) else: -- 1.8.3.1

1 0

[libvirt] [PATCH] Set the 'container_ttys' env variable for LXC consoles
by Daniel P. Berrange 16 Dec '13

16 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Systemd specified that any /dev/pts/NNN device on which it is expected to spawn a agetty login, should be listed in the 'container_ttys' env variable. It should just contain the relative paths, eg 'pts/0' not '/dev/pts/0' and should be space separated. http://cgit.freedesktop.org/systemd/systemd/commit/?id=1d97ff7dd71902a5604c… Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 51fa1b3..f0b526f 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -196,10 +196,30 @@ int lxcContainerHasReboot(void) * * Returns a virCommandPtr */ -static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef) +static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef, + char **ttyPaths, + size_t nttyPaths) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virCommandPtr cmd; + virBuffer buf = VIR_BUFFER_INITIALIZER; + size_t i; + + for (i = 0 ; i < nttyPaths ; i++) { + if (!STRPREFIX(ttyPaths[0], "/dev/")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Expected a /dev path for '%s'"), + ttyPaths[0]); + virBufferFreeAndReset(&buf); + return NULL; + } + if (i) + virBufferAddLit(&buf, " "); + virBufferAdd(&buf, ttyPaths[i] + 5, -1); + } + + if (virBufferError(&buf)) + return NULL; virUUIDFormat(vmDef->uuid, uuidstr); @@ -214,9 +234,11 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef) virCommandAddEnvPair(cmd, "container_uuid", uuidstr); virCommandAddEnvPair(cmd, "LIBVIRT_LXC_UUID", uuidstr); virCommandAddEnvPair(cmd, "LIBVIRT_LXC_NAME", vmDef->name); + virCommandAddEnvPair(cmd, "container_ttys", virBufferCurrentContent(&buf)); if (vmDef->os.cmdline) virCommandAddEnvPair(cmd, "LIBVIRT_LXC_CMDLINE", vmDef->os.cmdline); + virBufferFreeAndReset(&buf); return cmd; } @@ -1789,7 +1811,9 @@ static int lxcContainerChild(void *data) if ((hasReboot = lxcContainerHasReboot()) < 0) goto cleanup; - cmd = lxcContainerBuildInitCmd(vmDef); + cmd = lxcContainerBuildInitCmd(vmDef, + argv->ttyPaths, + argv->nttyPaths); virCommandWriteArgLog(cmd, 1); if (lxcContainerSetID(vmDef) < 0) -- 1.8.3.1

3 2

[libvirt] ANNOUNCE: ruby-libvirt 0.5.1
by Chris Lalancette 15 Dec '13

15 Dec '13

I'm pleased to announce the release of ruby-libvirt 0.5.1. ruby-libvirt is a ruby wrapper around the libvirt API. The changelog between 0.5.0 and 0.5.1 is: * Fixes to compile against older libvirt * Fixes to compile against ruby 1.8 Version 0.5.1 is available from http://libvirt.org/ruby: Tarball: http://libvirt.org/ruby/download/ruby-libvirt-0.5.1.tgz Gem: http://libvirt.org/ruby/download/ruby-libvirt-0.5.1.gem It is also available from rubygems.org; to get the latest version, run: $ gem install ruby-libvirt As usual, if you run into questions, problems, or bugs, please feel free to mail me (clalancette(a)gmail.com) and/or the libvirt mailing list. Thanks to everyone who contributed patches and submitted bugs.

1 0

[libvirt] ANNOUNCE: libvirt 1.0.5.8 maintenance release
by Cole Robinson 14 Dec '13

14 Dec '13

libvirt 1.0.5.8 maintenance release is now available. This is libvirt 1.0.5 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.0.5.8.tar.gz Changes in this version: * Tie SASL callbacks lifecycle to virNetSessionSASLContext * spec: Don't save/restore running VMs on libvirt-client update * Return right error code for baselineCPU * spec: Don't save/restore running VMs on libvirt-client update * Fix busy wait loop in LXC container I/O handling * libvirt-guests: Run only after libvirtd * Don't depend on syslog.service * libxl: fix dubious cpumask handling in libxlDomainSetVcpuAffinities * util: recognize SMB/CIFS filesystems as shared * Disable nwfilter driver when running unprivileged * spec: Explicitly require libgcrypt-devel For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] ANNOUNCE: libvirt 1.1.3.2 maintenance release
by Cole Robinson 14 Dec '13

14 Dec '13

libvirt 1.1.3.2 maintenance release is now available. This is libvirt 1.1.3 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.1.3.2.tar.gz Changes in this version: * Tie SASL callbacks lifecycle to virNetSessionSASLContext * spec: Don't save/restore running VMs on libvirt-client update * Return right error code for baselineCPU * qemu: hotplug: Fix adding USB devices to the driver list * qemu: hotplug: Fix double free on USB collision * qemu: hotplug: Only label hostdev after checking device conflicts * qemu: hotplug: Mark 2 private functions as static * qemu: Call qemuSetupHostdevCGroup later during hotplug * qemu: hostdev: Refactor PCI passhrough handling * qemu: snapshot: Detect internal snapshots also for sheepdog and RBD * spec: Don't save/restore running VMs on libvirt-client update * Fix busy wait loop in LXC container I/O handling * libvirt-guests: Run only after libvirtd * Don't depend on syslog.service * Fix migration with QEMU 1.6 * libxl: fix dubious cpumask handling in libxlDomainSetVcpuAffinities * util: recognize SMB/CIFS filesystems as shared * Disable nwfilter driver when running unprivileged * qemu: don't use deprecated -no-kvm-pit-reinjection * qemu: Don't access vm->priv on unlocked domain * virpci: Don't error on unbinded devices * virSecurityLabelDefParseXML: Don't parse label on model='none' For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCH] Return right error code for baselineCPU
by Don Dugger 14 Dec '13

14 Dec '13

This Python interface code is returning a -1 on errors for the `baselineCPU' API. Since this API is supposed to return a pointer the error return value should really be VIR_PY_NONE. NB: I've checked all the other APIs in this file and this is the only pointer API that is returning -1. Signed-off-by: Don Dugger <donald.d.dugger(a)intel.com> --- python/libvirt-override.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index c60747d..b471605 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -4471,13 +4471,13 @@ libvirt_virConnectBaselineCPU(PyObject *self ATTRIBUTE_UNUSED, ncpus = PyList_Size(list); if (VIR_ALLOC_N_QUIET(xmlcpus, ncpus) < 0) - return VIR_PY_INT_FAIL; + return VIR_PY_NONE; for (i = 0; i < ncpus; i++) { xmlcpus[i] = PyString_AsString(PyList_GetItem(list, i)); if (xmlcpus[i] == NULL) { VIR_FREE(xmlcpus); - return VIR_PY_INT_FAIL; + return VIR_PY_NONE; } } } @@ -4489,13 +4489,13 @@ libvirt_virConnectBaselineCPU(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(xmlcpus); if (base_cpu == NULL) - return VIR_PY_INT_FAIL; + return VIR_PY_NONE; pybase_cpu = PyString_FromString(base_cpu); VIR_FREE(base_cpu); if (pybase_cpu == NULL) - return VIR_PY_INT_FAIL; + return VIR_PY_NONE; return pybase_cpu; } -- 1.7.10.4 -- Don Dugger "Censeo Toto nos in Kansa esse decisse." - D. Gale n0ano(a)n0ano.com Ph: 303/443-3786

6 10

[libvirt] libvirt glusterfs problem
by Umar Draz 13 Dec '13

13 Dec '13

Hi I am running libvirt 1.2.0 on ubuntu. The main purpose of this libvirt 1.2.0 is for glusterfs, now I can define glusterfs storage pool using virsh command, but when I tried to create the volume under the gluster storage pool, I got error. error: Failed to create vol from tt.xml error: this function is not supported by the connection driver: storage pool does not support volume creation. But according to this url http://libvirt.org/storage.html we can create the volume. Any body please help me. Br. Umar

2 2

[libvirt] [PATCH] event-test: Unregister close callback
by Michal Privoznik 13 Dec '13

13 Dec '13

When registering a close callback, the connection refcount is increased as the connection object is passed to the callback and hence we must prevent deleting it too soon. However, when closing the connection, the connection object is just unrefed. So whenever a connection with a close callback is closed, we end up with the connection object which has exactly one reference. Leaving the code as-is doesn't mean the end of the world as we know it, but why give a bad example? ==14531== 288 bytes in 1 blocks are still reachable in loss record 695 of 762 ==14531== at 0x4C2BDE4: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==14531== by 0x4E9FE09: virAllocVar (viralloc.c:558) ==14531== by 0x4EDBE45: virObjectNew (virobject.c:190) ==14531== by 0x4F71AAC: virGetConnect (datatypes.c:116) ==14531== by 0x4F78511: do_open (libvirt.c:1136) ==14531== by 0x4F7B3AC: virConnectOpenAuth (libvirt.c:1481) ==14531== by 0x4011D2: main (event-test.c:499) (and other leaks tied to virGetConnect()) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- examples/object-events/event-test.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index f872b9f..228a091 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -675,6 +675,8 @@ int main(int argc, char **argv) virConnectDomainEventDeregisterAny(dconn, callback8ret); } + virConnectUnregisterCloseCallback(dconn, connectClose); + VIR_DEBUG("Closing connection"); if (dconn && virConnectClose(dconn) < 0) { printf("error closing\n"); -- 1.8.5.1

2 1

[libvirt] [PATCH] qemu: always ask for -enable-fips
by Eric Blake 13 Dec '13

13 Dec '13

On a system that is enforcing FIPS, most libraries honor the current mode by default. Qemu, on the other hand, refused to honor FIPS mode unless you add the '-enable-fips' command line option; worse, this option is not discoverable via QMP, and is only present on binaries built for Linux. As far as I can tell, unconditionally using the option when it is available has no negative consequences (the option has no change to qemu behavior except when FIPS is enabled, at which point it cripples insecure VNC passwords which is the one thing that libvirt must not allow when FIPS is active). This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1035474 * src/qemu/qemu_capabilities.h (QEMU_CAPS_ENABLE_FIPS): New bit. * src/qemu/qemu_capabilities.c (virQEMUCapsInitQMPBasic): Conditionally set capability. * src/qemu/qemu_command.c (qemuBuildCommandLine): Use it. * tests/qemucapabilitiestest.c (testQemuCaps): Unconditionally set capability. * tests/qemucapabilitiesdata/caps_1.2.2-1.caps: Update list. * tests/qemucapabilitiesdata/caps_1.3.1-1.caps: Likewise. * tests/qemucapabilitiesdata/caps_1.4.2-1.caps: Likewise. * tests/qemucapabilitiesdata/caps_1.5.3-1.caps: Likewise. * tests/qemucapabilitiesdata/caps_1.6.0-1.caps: Likewise. * tests/qemucapabilitiesdata/caps_1.6.50-1.caps: Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/qemu/qemu_capabilities.c | 7 +++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 2 ++ tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemucapabilitiestest.c | 6 ++++++ 10 files changed, 22 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a68e555..4d1a961 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -245,6 +245,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "kvm-pit-lost-tick-policy", "boot-strict", /* 160 */ + "enable-fips", ); struct _virQEMUCaps { @@ -2469,6 +2470,12 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY); +#ifdef __linux__ + /* We always want to honor FIPS mode; but for some strange reason, + * qemu choose to require the use of a command line option, and + * worse, to provide the option only on Linux. */ + virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_FIPS); +#endif } /* Capabilities that are architecture depending diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index aea64ea..87489ab 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -199,6 +199,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_DEVICE_ICH9_INTEL_HDA = 158, /* -device ich9-intel-hda */ QEMU_CAPS_KVM_PIT_TICK_POLICY = 159, /* kvm-pit.lost_tick_policy */ QEMU_CAPS_BOOT_STRICT = 160, /* -boot strict */ + QEMU_CAPS_ENABLE_FIPS = 161, /* -enable-fips */ 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 9539be7..a04725d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7747,6 +7747,8 @@ qemuBuildCommandLine(virConnectPtr conn, } } virCommandAddArg(cmd, "-S"); /* freeze CPU */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ENABLE_FIPS)) + virCommandAddArg(cmd, "-enable-fips"); if (qemuBuildMachineArgStr(cmd, def, qemuCaps) < 0) goto error; diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps index 73a561d..c3ae814 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps @@ -112,4 +112,5 @@ <flag name='usb-storage'/> <flag name='usb-storage.removable'/> <flag name='kvm-pit-lost-tick-policy'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps index da15d8b..7f629c8 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps @@ -126,4 +126,5 @@ <flag name='usb-storage'/> <flag name='usb-storage.removable'/> <flag name='kvm-pit-lost-tick-policy'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps index c419068..1111f42 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps @@ -127,4 +127,5 @@ <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps index 2b00449..a154bf6 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps @@ -132,4 +132,5 @@ <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> <flag name='boot-strict'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index 7bce4aa..3ccfb4f 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -136,4 +136,5 @@ <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> <flag name='boot-strict'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index bfaab9d..244985f 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -135,4 +135,5 @@ <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> <flag name='boot-strict'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index d912171..a86e070 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -192,6 +192,12 @@ testQemuCaps(const void *opaque) qemuMonitorTestGetMonitor(mon)) < 0) goto cleanup; + /* Unfortunately, qemu made '-enable-fips' a Linux-only option, + * with no way to probe it via QMP. But as our data files aren't + * set up to use #ifdef, we fake that the option is always present + * if we can probe QMP, even if not on Linux. */ + virQEMUCapsSet(capsComputed, QEMU_CAPS_ENABLE_FIPS); + if (testQemuCapsCompare(capsProvided, capsComputed) < 0) goto cleanup; -- 1.8.3.1

5 14

[libvirt] [PATCH] Don't call virCgroupSetCpuShares with a zero value
by Ján Tomko 13 Dec '13

13 Dec '13

In the XML parser, a zero in the <shares> element is treated as if it was omitted completely. No value is written to the cgroups fs when the domain is started and the OS default is used. virDomainSetSchedulerParameters treated 0 as a valid value, which got changed to '2' by kernel. Treat 0 as 'not specified' instead, to be consistent with the XML and how other scheduler parameters deal with a 0 value, making it a no-op on live domains. Also clarify the documentation. --- docs/formatdomain.html.in | 2 +- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_driver.c | 2 +- tools/virsh.pod | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index a094524..9749d55 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -508,7 +508,7 @@ <dt><code>shares</code></dt> <dd> The optional <code>shares</code> element specifies the proportional - weighted share for the domain. If this is omitted, it defaults to + weighted share for the domain. If this is omitted or 0, it defaults to the OS provided defaults. NB, There is no unit for the value, it's a relative measure based on the setting of other VM, e.g. A VM configured with value diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index c499182..7ac3691 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1732,7 +1732,7 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom, virTypedParameterPtr param = &params[i]; if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_CPU_SHARES)) { - if (flags & VIR_DOMAIN_AFFECT_LIVE) { + if (flags & VIR_DOMAIN_AFFECT_LIVE && params[i].value.ul) { if (virCgroupSetCpuShares(priv->cgroup, params[i].value.ul) < 0) goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 45d11cd..eba1e1a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8583,7 +8583,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, value_l = param->value.l; if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_CPU_SHARES)) { - if (flags & VIR_DOMAIN_AFFECT_LIVE) { + if (flags & VIR_DOMAIN_AFFECT_LIVE && value_ul) { if (virCgroupSetCpuShares(priv->cgroup, value_ul) < 0) goto cleanup; vm->def->cputune.shares = value_ul; diff --git a/tools/virsh.pod b/tools/virsh.pod index c6a8be3..092b6ae 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1393,7 +1393,8 @@ If I<--current> is specified, affect the current guest state. B<Note>: The cpu_shares parameter has a valid value range of 0-262144; Negative values are wrapped to positive, and larger values are capped at the maximum. Therefore, -1 is a useful shorthand for 262144. On the Linux kernel, the -values 0 and 1 are automatically converted to a minimal value of 2. +value 1 is automatically converted to a minimal value of 2. The value 0 +is the same as not specifying that parameter. B<Note>: The weight and cap parameters are defined only for the XEN_CREDIT scheduler and are now I<DEPRECATED>. -- 1.8.3.2

2 1

[libvirt] [PATCH 0/7 v2] Misc improvements to events code
by Daniel P. Berrange 13 Dec '13

13 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This is a followup to the recent network events patches to improve a few things I noticed when testing this out for real. In v2: - Changed the way event dispatch works to avoid race with creation of classes Daniel P. Berrange (7): Move examples/domain-events/event-c to examples/object-events Update event demo program to support network events too Add 'detail' arg to network lifecycle event internals Introduce abstract virNetworkEvent class Associate a dispatch function with the event objects Remove the event namespace concept Add debug output when registering event handlers Makefile.am | 2 +- configure.ac | 2 +- .../events-c => object-events}/Makefile.am | 0 .../events-c => object-events}/event-test.c | 45 ++++++++++- src/conf/domain_event.c | 27 +++++-- src/conf/domain_event.h | 7 -- src/conf/network_event.c | 59 ++++++++++---- src/conf/network_event.h | 9 +-- src/conf/object_event.c | 94 +++++++++------------- src/conf/object_event.h | 11 +-- src/conf/object_event_private.h | 11 ++- src/network/bridge_driver.c | 15 ++-- src/remote/remote_driver.c | 2 +- src/test/test_driver.c | 15 ++-- 14 files changed, 182 insertions(+), 117 deletions(-) rename examples/{domain-events/events-c => object-events}/Makefile.am (100%) rename examples/{domain-events/events-c => object-events}/event-test.c (94%) -- 1.8.3.1

4 24

[libvirt] [PATCH] Fix memory leak in virObjectEventCallbackListRemoveID()
by Nehal J Wani 13 Dec '13

13 Dec '13

While running objecteventtest, it was found that valgrind pointed out the following memory leak: ==13464== 5 bytes in 1 blocks are definitely lost in loss record 7 of 134 ==13464== at 0x4A0887C: malloc (vg_replace_malloc.c:270) ==13464== by 0x341F485E21: strdup (strdup.c:42) ==13464== by 0x4CAE28F: virStrdup (virstring.c:554) ==13464== by 0x4CF3CBE: virObjectEventCallbackListAddID (object_event.c:286) ==13464== by 0x4CF49CA: virObjectEventStateRegisterID (object_event.c:729) ==13464== by 0x4CF73FE: virDomainEventStateRegisterID (domain_event.c:1424) ==13464== by 0x4D7358F: testConnectDomainEventRegisterAny (test_driver.c:6032) ==13464== by 0x4D600C8: virConnectDomainEventRegisterAny (libvirt.c:19128) ==13464== by 0x402409: testDomainStartStopEvent (objecteventtest.c:232) ==13464== by 0x403451: virtTestRun (testutils.c:138) ==13464== by 0x402012: mymain (objecteventtest.c:395) ==13464== by 0x403AF2: virtTestMain (testutils.c:593) ==13464== --- Should we be introducing virObjectMetaFree() and/or virObjectEventCallbackFree() ? src/conf/object_event.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/conf/object_event.c b/src/conf/object_event.c index ec00aaf..399927b 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -137,6 +137,9 @@ virObjectEventCallbackListRemoveID(virConnectPtr conn, if (freecb) (*freecb)(cbList->callbacks[i]->opaque); virObjectUnref(cbList->callbacks[i]->conn); + if (cbList->callbacks[i]->meta) + VIR_FREE(cbList->callbacks[i]->meta->name); + VIR_FREE(cbList->callbacks[i]->meta); VIR_FREE(cbList->callbacks[i]); if (i < (cbList->count - 1)) -- 1.8.1.4

2 1

[libvirt] [PATCH] qemu: check for reboot-timeout on monitor=
by Martin Kletzander 13 Dec '13

13 Dec '13

The support for <boot rebootTimeout="12345"/> was added before we were checking for qemu command line options in QMP, so we haven't properly adapted virQEMUCaps when using it and thus we report unsupported option with new enough qemu. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1042690 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_capabilities.c | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + 4 files changed, 4 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a68e555..b1c30db 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2282,6 +2282,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, { "realtime", "mlock", QEMU_CAPS_MLOCK }, { "boot-opts", "strict", QEMU_CAPS_BOOT_STRICT }, + { "boot-opts", "reboot-timeout", QEMU_CAPS_REBOOT_TIMEOUT }, }; static int diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps index 2b00449..74f63c8 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps @@ -132,4 +132,5 @@ <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> <flag name='boot-strict'/> + <flag name='reboot-timeout'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index 7bce4aa..c82e39e 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -136,4 +136,5 @@ <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> <flag name='boot-strict'/> + <flag name='reboot-timeout'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index bfaab9d..0f2873f 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -135,4 +135,5 @@ <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> <flag name='boot-strict'/> + <flag name='reboot-timeout'/> </qemuCaps> -- 1.8.5.1

2 3

[libvirt] A libvirt issue about S3 , please help have a look, thanks
by Zhenfeng Wang 13 Dec '13

13 Dec '13

Hi I met a issue that while shutdown/reboot a guest which was in pmsuspended status with the acpi mode, the virsh command appears executed successfully, actually, the guest keep in pmsuspended status and it didn't shutoff the guest.Then I did the upper operation on my physical host, find the host will be waked up from the pmsuspended stuatus while i type the shutdown button , so maybe that's the expect result that the guest can't be shutdown successfully in pmsuspended status. So I think it should report a proper error or wake up the guest while we shutdown a guest which was in pmsuspended status. Since i'm not sure about this issue, so i hope you give me some advise to decide that whether we have necessary to track this issue, thanks. pkginfo kernel-3.6.10-4.fc18.x86_64 libvirt-1.1.4-2.fc21.x86_64 qemu-1.4.0-5.fc20.x86_64 steps 1.Prepare a running guest # virsh list --all Id Name State ---------------------------------------------------- 6 rhel7 running # vrish dumpxml rhel7 -- <pm> <suspend-to-mem enabled='yes'/> <suspend-to-disk enabled='yes'/> </pm> -- <channel type='unix'> <source mode='bind' path='/var/lib/libvirt/qemu/rhel7.agent'/> <target type='virtio' name='org.qemu.guest_agent.0'/> <alias name='channel1'/> <address type='virtio-serial' controller='0' bus='0' port='1'/> </channel> 2.Install the qemu-guest-agent packet in the guest, then start the qemu-guest-agent service #systemctl start qemu-guest-agent 3.Do the S3 with the guest # virsh dompmsuspend rhel7 --target mem Domain rhel7 successfully suspended # virsh list Id Name State ---------------------------------------------------- 30 rhel7 pmsuspended 4.Shutdown the guest with acpi, The command also appears executed successfully, actually, it didn't shutoff the guest I think it shoud report error here if the guest can't be shutdown successfully. # virsh shutdown rhel7 --mode acpi Domain rhel7 is being shutdown # echo $? 0 # virsh list Id Name State ---------------------------------------------------- 30 rhel7 pmsuspended Check the libvirtd's log, we can see the following log 2013-12-13 10:11:46.004+0000: 25134: debug : qemuMonitorJSONIOProcessLine:175 : QEMU_MONITOR_RECV_REPLY: mon=0x7f824800c190 reply={"return": {}, "id": "libvirt-9"} 2013-12-13 10:11:46.004+0000: 25134: debug : qemuMonitorJSONIOProcessLine:155 : Line [{"timestamp": {"seconds": 1386929506, "microseconds": 3807}, "event": "POWERDOWN"}] 2013-12-13 10:11:46.004+0000: 25134: debug : virJSONValueFromString:975 : string={"timestamp": {"seconds": 1386929506, "microseconds": 3807}, "event": "POWERDOWN"} 2013-12-13 10:11:46.005+0000: 25134: debug : qemuMonitorJSONIOProcessLine:170 : QEMU_MONITOR_RECV_EVENT: mon=0x7f824800c190 event={"timestamp": {"seconds": 1386929506, "microseconds": 3807}, "event": "POWERDOWN"}

2 1

[libvirt] [PATCH] lxc: return -1 if failed to kill lxc process
by Chen Hanxiao 13 Dec '13

13 Dec '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> We missed a return when virProcessKillPainfully failed to kill lxc process Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_process.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index c51c4d5..4e1e3ac 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -711,7 +711,11 @@ int virLXCProcessStop(virLXCDriverPtr driver, } else { /* If cgroup doesn't exist, just try cleaning up the * libvirt_lxc process */ - virProcessKillPainfully(vm->pid, true); + if (virProcessKillPainfully(vm->pid, true) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Processes %d refused to die"), (int)vm->pid); + return -1; + } } virLXCProcessCleanup(driver, vm, reason); -- 1.8.2.1

3 2

[libvirt] [PATCH] object: require maximal alignment in base class
by Eric Blake 13 Dec '13

13 Dec '13

Recent changes to events (commit 8a29ffcf) resulted in new compile failures on some targets (such as ARM OMAP5): conf/domain_event.c: In function 'virDomainEventDispatchDefaultFunc': conf/domain_event.c:1198:30: error: cast increases required alignment of target type [-Werror=cast-align] conf/domain_event.c:1314:34: error: cast increases required alignment of target type [-Werror=cast-align] cc1: all warnings being treated as errors The error is due to alignment; the base class is merely aligned to the worst of 'int' and 'void*', while the child class must be aligned to a 'long long'. The solution is to include a 'long long' (and for good measure, a function pointer) in the base class to ensure correct alignment regardless of what a child class may add, but to wrap the inclusion in a union so as to not incur any wasted space. On a typical x86_64 platform, the base class remains 16 bytes; on i686, the base class remains 12 bytes; and on the impacted ARM platform, the base class grows from 12 bytes to 16 bytes due to the increase of alignment from 4 to 8 bytes. Reported by Michele Paolino and others. * src/util/virobject.h (_virObject): Use a union to ensure that subclasses never have stricter alignment than the parent. * src/util/virobject.c (virObjectNew, virObjectUnref) (virObjectRef): Adjust clients. * src/libvirt.c (virConnectRef, virDomainRef, virNetworkRef) (virInterfaceRef, virStoragePoolRef, virStorageVolRef) (virNodeDeviceRef, virSecretRef, virStreamRef, virNWFilterRef) (virDomainSnapshotRef): Likewise. * src/qemu/qemu_monitor.c (qemuMonitorOpenInternal) (qemuMonitorClose): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Even though this fixes a build-breaker, I'd rather that someone actually experiencing the build failure test that this fixes the problem for them before I push (I don't have easy access to hardware exhibiting the problem). src/libvirt.c | 22 +++++++++++----------- src/qemu/qemu_monitor.c | 4 ++-- src/util/virobject.c | 10 +++++----- src/util/virobject.h | 16 ++++++++++++++-- 4 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index f01de83..d15d617 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1563,7 +1563,7 @@ virConnectRef(virConnectPtr conn) virDispatchError(NULL); return -1; } - VIR_DEBUG("conn=%p refs=%d", conn, conn->object.refs); + VIR_DEBUG("conn=%p refs=%d", conn, conn->object.u.s.refs); virObjectRef(conn); return 0; } @@ -2469,7 +2469,7 @@ virDomainRef(virDomainPtr domain) return -1; } - VIR_DOMAIN_DEBUG(domain, "refs=%d", domain->object.refs); + VIR_DOMAIN_DEBUG(domain, "refs=%d", domain->object.u.s.refs); virObjectRef(domain); return 0; } @@ -11977,7 +11977,7 @@ virNetworkRef(virNetworkPtr network) virDispatchError(NULL); return -1; } - VIR_DEBUG("network=%p refs=%d", network, network->object.refs); + VIR_DEBUG("network=%p refs=%d", network, network->object.u.s.refs); virObjectRef(network); return 0; } @@ -12921,7 +12921,7 @@ virInterfaceRef(virInterfacePtr iface) virDispatchError(NULL); return -1; } - VIR_DEBUG("iface=%p refs=%d", iface, iface->object.refs); + VIR_DEBUG("iface=%p refs=%d", iface, iface->object.u.s.refs); virObjectRef(iface); return 0; } @@ -13980,7 +13980,7 @@ virStoragePoolRef(virStoragePoolPtr pool) virDispatchError(NULL); return -1; } - VIR_DEBUG("pool=%p refs=%d", pool, pool->object.refs); + VIR_DEBUG("pool=%p refs=%d", pool, pool->object.u.s.refs); virObjectRef(pool); return 0; } @@ -15101,7 +15101,7 @@ virStorageVolRef(virStorageVolPtr vol) virDispatchError(NULL); return -1; } - VIR_DEBUG("vol=%p refs=%d", vol, vol->object.refs); + VIR_DEBUG("vol=%p refs=%d", vol, vol->object.u.s.refs); virObjectRef(vol); return 0; } @@ -15792,7 +15792,7 @@ virNodeDeviceRef(virNodeDevicePtr dev) virDispatchError(NULL); return -1; } - VIR_DEBUG("dev=%p refs=%d", dev, dev->object.refs); + VIR_DEBUG("dev=%p refs=%d", dev, dev->object.u.s.refs); virObjectRef(dev); return 0; } @@ -16900,7 +16900,7 @@ virSecretRef(virSecretPtr secret) virDispatchError(NULL); return -1; } - VIR_DEBUG("secret=%p refs=%d", secret, secret->object.refs); + VIR_DEBUG("secret=%p refs=%d", secret, secret->object.u.s.refs); virObjectRef(secret); return 0; } @@ -16994,7 +16994,7 @@ virStreamRef(virStreamPtr stream) virDispatchError(NULL); return -1; } - VIR_DEBUG("stream=%p refs=%d", stream, stream->object.refs); + VIR_DEBUG("stream=%p refs=%d", stream, stream->object.u.s.refs); virObjectRef(stream); return 0; } @@ -18400,7 +18400,7 @@ virNWFilterRef(virNWFilterPtr nwfilter) virDispatchError(NULL); return -1; } - VIR_DEBUG("nwfilter=%p refs=%d", nwfilter, nwfilter->object.refs); + VIR_DEBUG("nwfilter=%p refs=%d", nwfilter, nwfilter->object.u.s.refs); virObjectRef(nwfilter); return 0; } @@ -20699,7 +20699,7 @@ virDomainSnapshotRef(virDomainSnapshotPtr snapshot) virDispatchError(NULL); return -1; } - VIR_DEBUG("snapshot=%p, refs=%d", snapshot, snapshot->object.refs); + VIR_DEBUG("snapshot=%p, refs=%d", snapshot, snapshot->object.u.s.refs); virObjectRef(snapshot); return 0; } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 1514715..1fa1492 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -821,7 +821,7 @@ qemuMonitorOpenInternal(virDomainObjPtr vm, PROBE(QEMU_MONITOR_NEW, "mon=%p refs=%d fd=%d", - mon, mon->parent.parent.refs, mon->fd); + mon, mon->parent.parent.u.s.refs, mon->fd); virObjectUnlock(mon); return mon; @@ -893,7 +893,7 @@ void qemuMonitorClose(qemuMonitorPtr mon) virObjectLock(mon); PROBE(QEMU_MONITOR_CLOSE, - "mon=%p refs=%d", mon, mon->parent.parent.refs); + "mon=%p refs=%d", mon, mon->parent.parent.u.s.refs); if (mon->fd >= 0) { if (mon->watch) { diff --git a/src/util/virobject.c b/src/util/virobject.c index 61b5413..4f83bc1 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -192,9 +192,9 @@ void *virObjectNew(virClassPtr klass) klass->objectSize - sizeof(virObject)) < 0) return NULL; - obj->magic = klass->magic; + obj->u.s.magic = klass->magic; obj->klass = klass; - virAtomicIntSet(&obj->refs, 1); + virAtomicIntSet(&obj->u.s.refs, 1); PROBE(OBJECT_NEW, "obj=%p classname=%s", obj, obj->klass->name); @@ -252,7 +252,7 @@ bool virObjectUnref(void *anyobj) if (!obj) return false; - bool lastRef = virAtomicIntDecAndTest(&obj->refs); + bool lastRef = virAtomicIntDecAndTest(&obj->u.s.refs); PROBE(OBJECT_UNREF, "obj=%p", obj); if (lastRef) { PROBE(OBJECT_DISPOSE, "obj=%p", obj); @@ -265,7 +265,7 @@ bool virObjectUnref(void *anyobj) /* Clear & poison object */ memset(obj, 0, obj->klass->objectSize); - obj->magic = 0xDEADBEEF; + obj->u.s.magic = 0xDEADBEEF; obj->klass = (void*)0xDEADBEEF; VIR_FREE(obj); } @@ -289,7 +289,7 @@ void *virObjectRef(void *anyobj) if (!obj) return NULL; - virAtomicIntInc(&obj->refs); + virAtomicIntInc(&obj->u.s.refs); PROBE(OBJECT_REF, "obj=%p", obj); return anyobj; } diff --git a/src/util/virobject.h b/src/util/virobject.h index 3a08f10..d571b5c 100644 --- a/src/util/virobject.h +++ b/src/util/virobject.h @@ -36,9 +36,21 @@ typedef virObjectLockable *virObjectLockablePtr; typedef void (*virObjectDisposeCallback)(void *obj); +/* Most code should not play with the contents of this struct; however, + * the struct itself is public so that it can be embedded as the first + * field of a subclassed object. */ struct _virObject { - unsigned int magic; - int refs; + /* Ensure correct alignment of this and all subclasses, even on + * platforms where 'long long' or function pointers have stricter + * requirements than 'void *'. */ + union { + long long dummy_align1; + void (*dummy_align2) (void); + struct { + unsigned int magic; + int refs; + } s; + } u; virClassPtr klass; }; -- 1.8.4.2

3 3

[libvirt] [PATCH python v2] Add python3 to the automated build and RPM
by Daniel P. Berrange 13 Dec '13

13 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This updates autobuild.sh to test the python3 build process. The RPM specfile is changed to build a libvirt-python3 RPM on Fedora > 18 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- autobuild.sh | 14 +++++++++---- libvirt-python.spec.in | 53 +++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 58 insertions(+), 9 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index b3beaf1..5dffe96 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -7,11 +7,17 @@ set -ve rm -rf MANIFEST dist build -python setup.py sdist +python2 setup.py sdist -python setup.py build -python setup.py test -python setup.py install --root="$AUTOBUILD_INSTALL_ROOT" +python2 setup.py build +python2 setup.py test +python2 setup.py install --root="$AUTOBUILD_INSTALL_ROOT" + +if test -f /usr/bin/python3 ; then + python3 setup.py build + python3 setup.py test + python3 setup.py install --root="$AUTOBUILD_INSTALL_ROOT" +fi type -p /usr/bin/rpmbuild > /dev/null 2>&1 || exit 0 diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index 7c6257e..ac399cb 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -1,5 +1,10 @@ -Summary: The libvirt virtualization API python binding +%define with_python3 0 +%if 0%{?fedora} > 18 +%define with_python3 1 +%endif + +Summary: The libvirt virtualization API python2 binding Name: libvirt-python Version: @PY_VERSION@ Release: 1%{?dist}%{?extra_release} @@ -9,6 +14,17 @@ License: LGPLv2+ Group: Development/Libraries BuildRequires: libvirt-devel >= @C_VERSION@ BuildRequires: python-devel +%if %{with_python3} +BuildRequires: python3-devel +%endif + +%if %{with_python3} +%package -n libvirt-python3 +Summary: The libvirt virtualization API python3 binding +Url: http://libvirt.org +License: LGPLv2+ +Group: Development/Libraries +%endif # Don't want provides for python shared objects %{?filter_provides_in: %filter_provides_in %{python_sitearch}/.*\.so} @@ -20,22 +36,49 @@ written in the Python programming language to use the interface supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). +%if %{with_python3} +%description -n libvirt-python3 +The libvirt-python package contains a module that permits applications +written in the Python programming language to use the interface +supplied by the libvirt library to use the virtualization capabilities +of recent versions of Linux (and other OSes). +%endif + %prep %setup -q %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +%if %{with_python3} +CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build +%endif %install %{__python} setup.py install --skip-build --root=%{buildroot} +%if %{with_python3} +%{__python3} setup.py install --skip-build --root=%{buildroot} +%endif rm -f %{buildroot}%{_libdir}/python*/site-packages/*egg-info %files %defattr(-,root,root) %doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ -%{_libdir}/python*/site-packages/libvirt.py* -%{_libdir}/python*/site-packages/libvirt_qemu.py* -%{_libdir}/python*/site-packages/libvirt_lxc.py* -%{_libdir}/python*/site-packages/libvirtmod* +%{_libdir}/python2*/site-packages/libvirt.py* +%{_libdir}/python2*/site-packages/libvirt_qemu.py* +%{_libdir}/python2*/site-packages/libvirt_lxc.py* +%{_libdir}/python2*/site-packages/libvirtmod* + +%if %{with_python3} +%files -n libvirt-python3 +%defattr(-,root,root) +%doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ +%{_libdir}/python3*/site-packages/libvirt.py* +%{_libdir}/python3*/site-packages/libvirt_qemu.py* +%{_libdir}/python3*/site-packages/libvirt_lxc.py* +%{_libdir}/python3*/site-packages/__pycache__/libvirt.cpython-*.py* +%{_libdir}/python3*/site-packages/__pycache__/libvirt_qemu.cpython-*.py* +%{_libdir}/python3*/site-packages/__pycache__/libvirt_lxc.cpython-*.py* +%{_libdir}/python3*/site-packages/libvirtmod* +%endif %changelog -- 1.8.3.1

2 2

[libvirt] [PATCH v4 0/6] Support keyboard device
by Li Zhang 13 Dec '13

13 Dec '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> This patchset is to add keyboard input device. For PPC64, it doesn't support a default keyboard device when the graphic is enabled. Libvirt supports QEMU command line as "-device VGA" which won't create any keyboard device for it. So it requires libvirt to add a default USB keyboard device for it. This patchset is to add keyboard input device and a default USB keyboard for PPC64. The related discussion in QEMU community: http://lists.nongnu.org/archive/html/qemu-devel/2013-11/msg01734.html Li Zhang (6): conf: Add a keyboard input device type conf: Add one interface to add default input devices. conf: Remove PS2 mouse device for non-X86 platforms qemu_cap: Add USB keyboard capability qemu: parse qemu command line for USB keyboard Add a default USB keyboard and USB mouse for PPC64 v4 -> v3: * Don't remove PS2 mouse device for other virtualization drivers (Jan Tomko). v3 -> v2: * Handle the KBD device type in xen and QEMU driver. (Daniel.P.Berrange) * Remove PS2 mouse device for non-X86 platforms. * Move virDomainDefMaybeAddInput to a new patch. (Jan Tomko) * Replace VIR_REALLOC_N with VIR_APPEND_ELEMENT. (Jan Tomoko) * Fix several typos. (Jan Tomoko) * Add a virReportError when QEMU_CAPS_DEVICE_USB_KBD can't be gotten. (Jan Tomoko) v2 -> v1: * change ifs to switch clause. * reconstruct the patches docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 92 ++++++++++++++-------- src/conf/domain_conf.h | 5 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 41 +++++++--- src/qemu/qemu_domain.c | 23 +++++- src/util/virarch.h | 2 + src/xenxs/xen_sxpr.c | 27 +++++-- src/xenxs/xen_xm.c | 30 +++++-- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 2 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuhelptest.c | 8 ++ .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 3 +- .../qemuxml2argv-pseries-usb-kbd.args | 9 +++ .../qemuxml2argv-pseries-usb-kbd.xml | 19 +++++ tests/qemuxml2argvtest.c | 3 + 22 files changed, 212 insertions(+), 62 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.xml -- 1.8.2.1

2 9

[libvirt] [PATCH] fix libvirt alignment on arm platforms
by Michele Paolino 13 Dec '13

13 Dec '13

With the changes added by the latest commits (e.g. 8a29ffcf9aee45b61a0a12ee45c656cfd52333e8) related to "new events feature v2", we are unable to compile libvirt on ARM target (OMAP5). The error is due to alignment: conf/domain_event.c: In function 'virDomainEventDispatchDefaultFunc': conf/domain_event.c:1198:30: error: cast increases required alignment of target type [-Werror=cast-align] conf/domain_event.c:1314:34: error: cast increases required alignment of target type [-Werror=cast-align] cc1: all warnings being treated as errors Using ATTRIBUTE_PACKED we force a structure to not follow architecture and compiler best alignments. --- src/conf/domain_event.c | 20 ++++++++++---------- src/conf/network_event.c | 2 +- src/conf/object_event_private.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 64035f7..7d58367 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -76,7 +76,7 @@ struct _virDomainEventLifecycle { int type; int detail; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventLifecycle virDomainEventLifecycle; typedef virDomainEventLifecycle *virDomainEventLifecyclePtr; @@ -84,7 +84,7 @@ struct _virDomainEventRTCChange { virDomainEvent parent; long long offset; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventRTCChange virDomainEventRTCChange; typedef virDomainEventRTCChange *virDomainEventRTCChangePtr; @@ -92,7 +92,7 @@ struct _virDomainEventWatchdog { virDomainEvent parent; int action; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventWatchdog virDomainEventWatchdog; typedef virDomainEventWatchdog *virDomainEventWatchdogPtr; @@ -103,7 +103,7 @@ struct _virDomainEventIOError { char *devAlias; int action; char *reason; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventIOError virDomainEventIOError; typedef virDomainEventIOError *virDomainEventIOErrorPtr; @@ -113,7 +113,7 @@ struct _virDomainEventBlockJob { char *path; int type; int status; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventBlockJob virDomainEventBlockJob; typedef virDomainEventBlockJob *virDomainEventBlockJobPtr; @@ -125,7 +125,7 @@ struct _virDomainEventGraphics { virDomainEventGraphicsAddressPtr remote; char *authScheme; virDomainEventGraphicsSubjectPtr subject; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventGraphics virDomainEventGraphics; typedef virDomainEventGraphics *virDomainEventGraphicsPtr; @@ -136,7 +136,7 @@ struct _virDomainEventDiskChange { char *newSrcPath; char *devAlias; int reason; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventDiskChange virDomainEventDiskChange; typedef virDomainEventDiskChange *virDomainEventDiskChangePtr; @@ -145,7 +145,7 @@ struct _virDomainEventTrayChange { char *devAlias; int reason; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventTrayChange virDomainEventTrayChange; typedef virDomainEventTrayChange *virDomainEventTrayChangePtr; @@ -154,7 +154,7 @@ struct _virDomainEventBalloonChange { /* In unit of 1024 bytes */ unsigned long long actual; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventBalloonChange virDomainEventBalloonChange; typedef virDomainEventBalloonChange *virDomainEventBalloonChangePtr; @@ -162,7 +162,7 @@ struct _virDomainEventDeviceRemoved { virDomainEvent parent; char *devAlias; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventDeviceRemoved virDomainEventDeviceRemoved; typedef virDomainEventDeviceRemoved *virDomainEventDeviceRemovedPtr; diff --git a/src/conf/network_event.c b/src/conf/network_event.c index 4a02523..1ffcf6c 100644 --- a/src/conf/network_event.c +++ b/src/conf/network_event.c @@ -32,7 +32,7 @@ struct _virNetworkEventLifecycle { virObjectEvent parent; int type; -}; +} ATTRIBUTE_PACKED; typedef struct _virNetworkEventLifecycle virNetworkEventLifecycle; typedef virNetworkEventLifecycle *virNetworkEventLifecyclePtr; diff --git a/src/conf/object_event_private.h b/src/conf/object_event_private.h index f41f432..34cd902 100644 --- a/src/conf/object_event_private.h +++ b/src/conf/object_event_private.h @@ -73,7 +73,7 @@ struct _virObjectEvent { virObject parent; int eventID; virObjectMeta meta; -}; +}ATTRIBUTE_PACKED; virClassPtr virClassForObjectEvent(void); -- 1.7.9.5

3 4

[libvirt] [PATCH python] Add python3 to the automated build and RPM
by Daniel P. Berrange 13 Dec '13

13 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This updates autobuild.sh to test the python3 build process. The RPM specfile is changed to build a libvirt-python3 RPM on Fedora > 18 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- autobuild.sh | 6 ++++++ libvirt-python.spec.in | 57 +++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index b3beaf1..c7d2661 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -13,6 +13,12 @@ python setup.py build python setup.py test python setup.py install --root="$AUTOBUILD_INSTALL_ROOT" +if test -f /usr/bin/python3 ; then + python3 setup.py build + python3 setup.py test + python3 setup.py install --root="$AUTOBUILD_INSTALL_ROOT" +fi + type -p /usr/bin/rpmbuild > /dev/null 2>&1 || exit 0 if [ -n "$AUTOBUILD_COUNTER" ]; then diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index 7c6257e..c61febc 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -1,5 +1,10 @@ -Summary: The libvirt virtualization API python binding +%global with_python3 0 +%if 0%{?fedora} > 18 +%global with_python3 1 +%endif + +Summary: The libvirt virtualization API python2 binding Name: libvirt-python Version: @PY_VERSION@ Release: 1%{?dist}%{?extra_release} @@ -9,6 +14,17 @@ License: LGPLv2+ Group: Development/Libraries BuildRequires: libvirt-devel >= @C_VERSION@ BuildRequires: python-devel +%if %{with_python3} +BuildRequires: python3-devel +%endif + +%if %{with_python3} +%package -n libvirt-python3 +Summary: The libvirt virtualization API python3 binding +Url: http://libvirt.org +License: LGPLv2+ +Group: Development/Libraries +%endif # Don't want provides for python shared objects %{?filter_provides_in: %filter_provides_in %{python_sitearch}/.*\.so} @@ -20,22 +36,49 @@ written in the Python programming language to use the interface supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). +%if %{with_python3} +%description -n libvirt-python3 +The libvirt-python package contains a module that permits applications +written in the Python programming language to use the interface +supplied by the libvirt library to use the virtualization capabilities +of recent versions of Linux (and other OSes). +%endif + %prep %setup -q %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +CFLAGS="$RPM_OPT_FLAGS" %{__python2} setup.py build +%if %{with_python3} +CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build +%endif %install -%{__python} setup.py install --skip-build --root=%{buildroot} +%{__python2} setup.py install --skip-build --root=%{buildroot} +%if %{with_python3} +%{__python3} setup.py install --skip-build --root=%{buildroot} +%endif rm -f %{buildroot}%{_libdir}/python*/site-packages/*egg-info %files %defattr(-,root,root) %doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ -%{_libdir}/python*/site-packages/libvirt.py* -%{_libdir}/python*/site-packages/libvirt_qemu.py* -%{_libdir}/python*/site-packages/libvirt_lxc.py* -%{_libdir}/python*/site-packages/libvirtmod* +%{_libdir}/python2*/site-packages/libvirt.py* +%{_libdir}/python2*/site-packages/libvirt_qemu.py* +%{_libdir}/python2*/site-packages/libvirt_lxc.py* +%{_libdir}/python2*/site-packages/libvirtmod* + +%if %{with_python3} +%files -n libvirt-python3 +%defattr(-,root,root) +%doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ +%{_libdir}/python3*/site-packages/libvirt.py* +%{_libdir}/python3*/site-packages/libvirt_qemu.py* +%{_libdir}/python3*/site-packages/libvirt_lxc.py* +%{_libdir}/python3*/site-packages/__pycache__/libvirt.cpython-*.py* +%{_libdir}/python3*/site-packages/__pycache__/libvirt_qemu.cpython-*.py* +%{_libdir}/python3*/site-packages/__pycache__/libvirt_lxc.cpython-*.py* +%{_libdir}/python3*/site-packages/libvirtmod* +%endif %changelog -- 1.8.3.1

3 7

[libvirt] [PATCH python] Rewrite libvirt_charPtrUnwrap to work with Python 3.0->3.2
by Daniel P. Berrange 12 Dec '13

12 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The PyUnicode_AsUTF8 method doesn't exist prior to Python 3.3. It is also somewhat inefficient, so rewrite it to use an intermediate PyBytes object. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- typewrappers.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/typewrappers.c b/typewrappers.c index a7a42f2..a5b562d 100644 --- a/typewrappers.c +++ b/typewrappers.c @@ -361,9 +361,10 @@ libvirt_boolUnwrap(PyObject *obj, bool *val) int libvirt_charPtrUnwrap(PyObject *obj, char **str) { -#if PY_MAJOR_VERSION < 3 - const char *ret; +#if PY_MAJOR_VERSION > 2 + PyObject *bytes; #endif + const char *ret; *str = NULL; if (!obj) { PyErr_SetString(PyExc_TypeError, "unexpected type"); @@ -371,16 +372,18 @@ libvirt_charPtrUnwrap(PyObject *obj, char **str) } #if PY_MAJOR_VERSION > 2 - if (!(*str = PyUnicode_AsUTF8(obj))) + if (!(bytes = PyUnicode_AsUTF8String(obj))) return -1; + ret = PyBytes_AsString(bytes); #else ret = PyString_AsString(obj); - if (ret && - !(*str = strdup(ret))) - return -1; #endif - - return 0; + if (ret) + *str = strdup(ret); +#if PY_MAJOR_VERSION > 2 + Py_DECREF(bytes); +#endif + return ret && *str ? 0 : -1; } int libvirt_charPtrSizeUnwrap(PyObject *obj, char **str, Py_ssize_t *size) -- 1.8.3.1

2 1

[libvirt] [PATCH 0/6] Misc improvements to events code
by Daniel P. Berrange 12 Dec '13

12 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This is a followup to the recent network events patches to improve a few things I noticed when testing this out for real. Daniel P. Berrange (6): Move examples/domain-events/event-c to examples/object-events Update event demo program to support network events too Add 'detail' arg to network lifecycle event internals Introduce abstract virNetworkEvent class Remove the event namespace concept Add debug output when registering event handlers Makefile.am | 2 +- configure.ac | 2 +- examples/domain-events/events-c/Makefile.am | 24 - examples/domain-events/events-c/event-test.c | 644 ------------------------- examples/object-events/Makefile.am | 24 + examples/object-events/event-test.c | 685 +++++++++++++++++++++++++++ src/conf/domain_event.c | 18 +- src/conf/domain_event.h | 2 + src/conf/network_event.c | 58 ++- src/conf/network_event.h | 6 +- src/conf/object_event.c | 33 +- src/conf/object_event.h | 11 +- src/conf/object_event_private.h | 2 + src/network/bridge_driver.c | 15 +- src/remote/remote_driver.c | 2 +- src/test/test_driver.c | 15 +- 16 files changed, 828 insertions(+), 715 deletions(-) delete mode 100644 examples/domain-events/events-c/Makefile.am delete mode 100644 examples/domain-events/events-c/event-test.c create mode 100644 examples/object-events/Makefile.am create mode 100644 examples/object-events/event-test.c -- 1.8.3.1

3 14

[libvirt] [PATCH 00/34] network events feature v2
by Cédric Bosdonnat 12 Dec '13

12 Dec '13

This patch serie is replacing the previous one I sent. The improvements that were made in between are: * splitting the 2 huge commits into smaller reviewable ones. * Get rid of the huge union in virDomainEvent and use virObjects instead. * No domain events-related code in object_event.c. I left the network events related code there as it would be pretty small in a separate set of files. * Rebased on the python split repository I saw something weird in the domain events code when working on this: VIR_DOMAIN_EVENT_LAST is defined if VIR_ENUM_SENTINELS is defined, but is generally used independently of it. I did the same for the VIR_NETWORK_EVENT_LAST thought I'm not sure that's the correct thing to do. These changes are all about bringing events for network object like the ones existing for domains. This feature is needed for virt-manager to refresh its UI when networks are started/destroyed/defined/undefined. The network events are implemented in the test, bridge network and remote drivers ATM. Cédric Bosdonnat (34): Added domain start/stop/define/undefine event unit tests Rename virDomainEventCallback to virObjectEventCallback Renamed virDomainMeta to virObjectMeta Renamed virDomainEventQueue to virObjectEventQueue Renamed virDomainEventState to virObjectEventState Renamed virDomainEventCallbackList* to virObjectEventCallbackList* Created virObjectEventStateRegisterID virObject-ified virDomainEvent Create virDomainEventLifecycle to start removing the huge union Renamed virDomainEventNew* to virDomainEventLifecycleNew* Renamed virDomainEventNewInternal to virDomainEventNew Create virDomainEventRTCChange to get rid of the huge union Created virDomainEventWatchdog to get rid of the huge union Created virDomainEventIOError Created virDomainEventGraphics Created virDomainEventBlockJob Create virDomainEventDiskChange Created virDomainEventTrayChange Created virDomainEventBalloonChange Created virDomainEventDeviceRemoved and removed the huge union Changed the remaining domain event creation methods results to void* Removed virDomainEventPtr in favor of virObjectEventPtr Add object event namespaces for the event IDs Renamed virDomainEventTimer to virObjectEventTimer Split the virObjectEvent and virDomainEvent* to separate them after Extracted common parts of domain_event.[ch] to object_event.[ch] Added virNetworkEventLifecycle object Added API for network events similar to the one from Domain events test driver: renamed testDomainEventQueue into testObjectEventQueue test driver: implemented network events Add network events unit tests daemon/remote.c: renamed remoteDispatchDomainEventSend Add network events to the remote driver Added network events to the bridged network driver .gitignore | 1 + cfg.mk | 6 +- daemon/libvirtd.h | 1 + daemon/remote.c | 175 ++- include/libvirt/libvirt.h.in | 86 ++ src/Makefile.am | 6 + src/conf/domain_event.c | 1954 ++++++++++++++-------------------- src/conf/domain_event.h | 219 ++-- src/conf/object_event.c | 903 ++++++++++++++++ src/conf/object_event.h | 113 ++ src/conf/object_event_private.h | 113 ++ src/driver.h | 14 + src/libvirt.c | 133 +++ src/libvirt_private.syms | 25 +- src/libvirt_public.syms | 7 + src/libxl/libxl_conf.h | 2 +- src/libxl/libxl_driver.c | 46 +- src/lxc/lxc_conf.h | 2 +- src/lxc/lxc_driver.c | 54 +- src/lxc/lxc_process.c | 20 +- src/network/bridge_driver.c | 89 ++ src/network/bridge_driver_platform.h | 3 + src/parallels/parallels_utils.h | 2 +- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_driver.c | 116 +- src/qemu/qemu_hotplug.c | 10 +- src/qemu/qemu_migration.c | 38 +- src/qemu/qemu_process.c | 70 +- src/remote/remote_driver.c | 178 +++- src/remote/remote_protocol.x | 46 +- src/test/test_driver.c | 197 ++-- src/uml/uml_conf.h | 2 +- src/uml/uml_driver.c | 44 +- src/vbox/vbox_tmpl.c | 22 +- src/xen/xen_driver.c | 10 +- src/xen/xen_driver.h | 4 +- src/xen/xen_inotify.c | 10 +- src/xen/xs_internal.c | 20 +- tests/Makefile.am | 7 + tests/objecteventtest.c | 407 +++++++ tests/qemuhotplugtest.c | 2 +- 43 files changed, 3525 insertions(+), 1642 deletions(-) create mode 100644 src/conf/object_event.c create mode 100644 src/conf/object_event.h create mode 100644 src/conf/object_event_private.h create mode 100644 tests/objecteventtest.c -- 1.8.4.2

6 69

[libvirt] [resend] fix libvirt alignment on arm platforms
by Michele Paolino 12 Dec '13

12 Dec '13

With the changes added by the latest commits (e.g. 8a29ffcf9aee45b61a0a12ee45c656cfd52333e8) related to "new events feature v2", we are unable to compile libvirt on ARM target (OMAP5). The error is due to alignment: conf/domain_event.c: In function 'virDomainEventDispatchDefaultFunc': conf/domain_event.c:1198:30: error: cast increases required alignment of target type [-Werror=cast-align] conf/domain_event.c:1314:34: error: cast increases required alignment of target type [-Werror=cast-align] cc1: all warnings being treated as errors Using ATTRIBUTE_PACKED we force a structure to not follow architecture and compiler best alignments. --- src/conf/domain_event.c | 20 ++++++++++---------- src/conf/network_event.c | 2 +- src/conf/object_event_private.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 64035f7..7d58367 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -76,7 +76,7 @@ struct _virDomainEventLifecycle { int type; int detail; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventLifecycle virDomainEventLifecycle; typedef virDomainEventLifecycle *virDomainEventLifecyclePtr; @@ -84,7 +84,7 @@ struct _virDomainEventRTCChange { virDomainEvent parent; long long offset; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventRTCChange virDomainEventRTCChange; typedef virDomainEventRTCChange *virDomainEventRTCChangePtr; @@ -92,7 +92,7 @@ struct _virDomainEventWatchdog { virDomainEvent parent; int action; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventWatchdog virDomainEventWatchdog; typedef virDomainEventWatchdog *virDomainEventWatchdogPtr; @@ -103,7 +103,7 @@ struct _virDomainEventIOError { char *devAlias; int action; char *reason; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventIOError virDomainEventIOError; typedef virDomainEventIOError *virDomainEventIOErrorPtr; @@ -113,7 +113,7 @@ struct _virDomainEventBlockJob { char *path; int type; int status; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventBlockJob virDomainEventBlockJob; typedef virDomainEventBlockJob *virDomainEventBlockJobPtr; @@ -125,7 +125,7 @@ struct _virDomainEventGraphics { virDomainEventGraphicsAddressPtr remote; char *authScheme; virDomainEventGraphicsSubjectPtr subject; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventGraphics virDomainEventGraphics; typedef virDomainEventGraphics *virDomainEventGraphicsPtr; @@ -136,7 +136,7 @@ struct _virDomainEventDiskChange { char *newSrcPath; char *devAlias; int reason; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventDiskChange virDomainEventDiskChange; typedef virDomainEventDiskChange *virDomainEventDiskChangePtr; @@ -145,7 +145,7 @@ struct _virDomainEventTrayChange { char *devAlias; int reason; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventTrayChange virDomainEventTrayChange; typedef virDomainEventTrayChange *virDomainEventTrayChangePtr; @@ -154,7 +154,7 @@ struct _virDomainEventBalloonChange { /* In unit of 1024 bytes */ unsigned long long actual; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventBalloonChange virDomainEventBalloonChange; typedef virDomainEventBalloonChange *virDomainEventBalloonChangePtr; @@ -162,7 +162,7 @@ struct _virDomainEventDeviceRemoved { virDomainEvent parent; char *devAlias; -}; +} ATTRIBUTE_PACKED; typedef struct _virDomainEventDeviceRemoved virDomainEventDeviceRemoved; typedef virDomainEventDeviceRemoved *virDomainEventDeviceRemovedPtr; diff --git a/src/conf/network_event.c b/src/conf/network_event.c index 4a02523..1ffcf6c 100644 --- a/src/conf/network_event.c +++ b/src/conf/network_event.c @@ -32,7 +32,7 @@ struct _virNetworkEventLifecycle { virObjectEvent parent; int type; -}; +} ATTRIBUTE_PACKED; typedef struct _virNetworkEventLifecycle virNetworkEventLifecycle; typedef virNetworkEventLifecycle *virNetworkEventLifecyclePtr; diff --git a/src/conf/object_event_private.h b/src/conf/object_event_private.h index f41f432..34cd902 100644 --- a/src/conf/object_event_private.h +++ b/src/conf/object_event_private.h @@ -73,7 +73,7 @@ struct _virObjectEvent { virObject parent; int eventID; virObjectMeta meta; -}; +}ATTRIBUTE_PACKED; virClassPtr virClassForObjectEvent(void); -- 1.7.9.5

2 1

[libvirt] Libvirt support for KVM/ARM on armv7l hardware
by 林佳緯 12 Dec '13

12 Dec '13

I have found Libvirt supporting for armv7b in http://libvirt.org/news.html. But armv7l is not found there. Does Libvirt support run KVM/ARM for hardware virtualization on armv7l platform? Thanks!

3 2

[libvirt] [PATCH] Bump version to 1.2.1 for new dev cycle
by Daniel P. Berrange 12 Dec '13

12 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Pushed per agreement at https://www.redhat.com/archives/libvir-list/2013-December/msg00657.html Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4465e01..bb92349 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [1.2.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [1.2.1], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) -- 1.8.3.1

1 0

[libvirt] [PATCH] Add missing % on %{_libdir} macro in RPM
by Daniel P. Berrange 12 Dec '13

12 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Pushed as build breaker fix Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 9b34f3f..e22c373 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1957,7 +1957,7 @@ exit 0 %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ %{_datadir}/augeas/lenses/libvirtd_qemu.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug -{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so +%{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so %endif %if %{with_lxc} -- 1.8.3.1

1 0

[libvirt] [PATCH 1/1] Make virtio as the default net device for PPC64
by Pradipta Kr. Banerjee 12 Dec '13

12 Dec '13

From: "Pradipta Kr. Banerjee" <bpradip(a)in.ibm.com> Make virtio as the default net device for PPC64 Signed-off-by: Pradipta Kr. Banerjee <bpradip(a)in.ibm.com> --- src/qemu/qemu_domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e964c75..db36eff 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -790,7 +790,8 @@ static const char * qemuDomainDefaultNetModel(const virDomainDef *def) { if (def->os.arch == VIR_ARCH_S390 || - def->os.arch == VIR_ARCH_S390X) + def->os.arch == VIR_ARCH_S390X || + def->os.arch == VIR_ARCH_PPC64) return "virtio"; if (def->os.arch == VIR_ARCH_ARMV7L) { -- 1.8.3.1

3 4

[libvirt] [PATCH 0/3] Reflect changes in kernel 3.12 in our cgroups code
by Martin Kletzander 12 Dec '13

12 Dec '13

To see what changed in the kernel, see explanation in PATCH 1/3. First two patches make proper use of VIR_DOMAIN_MEMORY_PARAM_UNLIMITED, the third one just fixes a "typo". Martin Kletzander (3): cgroups: Redefine what "unlimited" means wrt memory limits qemu: Report VIR_DOMAIN_MEMORY_PARAM_UNLIMITED properly qemu: Fix minor inconsistency in error message src/qemu/qemu_driver.c | 27 ++++++++++++------------ src/util/vircgroup.c | 57 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 53 insertions(+), 31 deletions(-) -- 1.8.4.4

3 8

[libvirt] [PATCH] Read PCI class from sysfs class file instead of config space.
by Thadeu Lima de Souza Cascardo 12 Dec '13

12 Dec '13

When determining if a device is behind a PCI bridge, the PCI device class is checked by reading the config space. However, there are some devices which have the wrong class on the config space, but the class is initialized by Linux correctly as a PCI BRIDGE. This class can be read by the sysfs file '/sys/bus/pci/devices/xxxx:xx:xx.x/class'. One example of such bridge is IBM PCI Bridge 1014:03b9, which is identified as a Host Bridge when reading the config space. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo(a)linux.vnet.ibm.com> --- src/util/virpci.c | 38 +++++++++++++++++++++++++++++++++++--- 1 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 8ec642f..8353411 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -344,6 +344,34 @@ virPCIDeviceRead32(virPCIDevicePtr dev, int cfgfd, unsigned int pos) } static int +virPCIDeviceReadClass(virPCIDevicePtr dev, uint16_t *device_class) +{ + char *path = NULL; + char *id_str; + int ret = 0; + unsigned int value; + + if (virPCIFile(&path, dev->name, "class") < 0) + return -1; + + /* class string is '0xNNNNNN\n' ... i.e. 9 bytes */ + if (virFileReadAll(path, 9, &id_str) < 0) { + VIR_FREE(path); + return -1; + } + + VIR_FREE(path); + + id_str[8] = '\0'; + ret = virStrToLong_ui(id_str, NULL, 16, &value); + if (ret == 0) + *device_class = (value >> 8) & 0xFFFF; + + VIR_FREE(id_str); + return ret; +} + +static int virPCIDeviceWrite(virPCIDevicePtr dev, int cfgfd, unsigned int pos, @@ -645,8 +673,8 @@ virPCIDeviceIsParent(virPCIDevicePtr dev, virPCIDevicePtr check, void *data) return 0; /* Is it a bridge? */ - device_class = virPCIDeviceRead16(check, fd, PCI_CLASS_DEVICE); - if (device_class != PCI_CLASS_BRIDGE_PCI) + ret = virPCIDeviceReadClass(check, &device_class); + if (ret == -1 || device_class != PCI_CLASS_BRIDGE_PCI) goto cleanup; /* Is it a plane? */ @@ -2110,6 +2138,7 @@ virPCIDeviceDownstreamLacksACS(virPCIDevicePtr dev) unsigned int pos; int fd; int ret = 0; + uint16_t device_class; if ((fd = virPCIDeviceConfigOpen(dev, true)) < 0) return -1; @@ -2119,8 +2148,11 @@ virPCIDeviceDownstreamLacksACS(virPCIDevicePtr dev) goto cleanup; } + if (virPCIDeviceReadClass(dev, &device_class)) + goto cleanup; + pos = dev->pcie_cap_pos; - if (!pos || virPCIDeviceRead16(dev, fd, PCI_CLASS_DEVICE) != PCI_CLASS_BRIDGE_PCI) + if (!pos || device_class != PCI_CLASS_BRIDGE_PCI) goto cleanup; flags = virPCIDeviceRead16(dev, fd, pos + PCI_EXP_FLAGS); -- 1.7.1

4 7

[libvirt] RFC: Changing version number at start of dev cycle instead of end
by Daniel P. Berrange 12 Dec '13

12 Dec '13

Currently throughout the dev cycle we stick on the current release number. The release number in configure.ac is only changed by DV when he is actually cutting the release. With the python bindings now being split out, this is causing us problems. The python code aims to build against any libvirt version that exists, so for example, the new network events APIs in libvirt will be included with version 1.2.1. So the python binding does #if LIBVIR_CHECK_VERSION(1, 2, 1) static void libvirt_virConnectNetworkEventFreeFunc(void *opaque) { PyObject *pyobj_conn = (PyObject*)opaque; LIBVIRT_ENSURE_THREAD_STATE; Py_DECREF(pyobj_conn); LIBVIRT_RELEASE_THREAD_STATE; } ... This works fine if a python release is built against a libvirt release. It does not work if a python git snapshot is built against a libvirt git snapshot. This is bad because it prevents us doing automated builds of GIT. The solution here is fairly simple. We should increase the version number in configure.ac at the *start* of each release cycle. This means that libvirt-python can use the next version number and things will 'just work'. I don't think this is a burden really - we already encode the next version number in our source code when tagging new APIs or driver methods. We're really just bringing autoconf's view of the version number inline with the rest of the code. So if no one objects, we should immediately change configure.ac to be 1.2.1 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 :|

4 3

[libvirt] [test-API][PATCH] Add new cases for testing setSchedulerParametersFlags related API
by Xuesong Zhang 12 Dec '13

12 Dec '13

--- cases/sched_params.conf | 120 +++++++++++++++++++++++++++++++ repos/domain/sched_params.py | 136 ++++++++++++++++------------------- repos/domain/sched_params_flag.py | 148 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 330 insertions(+), 74 deletions(-) create mode 100755 cases/sched_params.conf create mode 100644 repos/domain/sched_params_flag.py diff --git a/cases/sched_params.conf b/cases/sched_params.conf new file mode 100755 index 0000000..6f7acce --- /dev/null +++ b/cases/sched_params.conf @@ -0,0 +1,120 @@ +domain:install_linux_cdrom + guestname + $defaultname + guestos + $defaultos + guestarch + $defaultarch + vcpu + $defaultvcpu + memory + $defaultmem + hddriver + $defaulthd + nicdriver + $defaultnic + imageformat + qcow2 + +domain:sched_params + guestname + $defaultname + vcpuquota + 1000 + vcpuperiod + 200000 + emulatorperiod + 300000 + emulatorquota + 4000 + cpushares + 5000 + +domain:sched_params_flag + guestname + $defaultname + vcpuquota + 1001 + vcpuperiod + 200001 + emulatorperiod + 300001 + emulatorquota + 4001 + cpushares + 5001 + flag + current + +domain:sched_params_flag + guestname + $defaultname + vcpuquota + 1002 + vcpuperiod + 200002 + emulatorperiod + 300002 + emulatorquota + 4002 + cpushares + 5002 + flag + live + +domain:sched_params_flag + guestname + $defaultname + vcpuquota + 1003 + vcpuperiod + 200003 + emulatorperiod + 300003 + emulatorquota + 4003 + cpushares + 5003 + flag + config + +domain:destroy + guestname + $defaultname + +domain:sched_params_flag + guestname + $defaultname + vcpuquota + 1004 + vcpuperiod + 200004 + emulatorperiod + 300004 + emulatorquota + 4004 + cpushares + 5004 + flag + current + +domain:sched_params_flag + guestname + $defaultname + vcpuquota + 1005 + vcpuperiod + 200005 + emulatorperiod + 300005 + emulatorquota + 4005 + cpushares + 5005 + flag + config + +domain:undefine + guestname + $defaultname + diff --git a/repos/domain/sched_params.py b/repos/domain/sched_params.py index 786e357..1be5986 100644 --- a/repos/domain/sched_params.py +++ b/repos/domain/sched_params.py @@ -1,95 +1,83 @@ #!/usr/bin/evn python -# To test domain scheduler parameters - -import os -import sys -import time -import commands +# Set and show scheduler parameters import libvirt +from libvirt import libvirtError from src import sharedmod from utils import utils -required_params = ('guestname', 'capshares',) +import os + +required_params = ('guestname', 'vcpuquota', 'vcpuperiod', 'emulatorperiod', \ + 'emulatorquota', 'cpushares',) optional_params = {} -def check_guest_status(domobj): - """Check guest current status""" - state = domobj.info()[0] - if state == libvirt.VIR_DOMAIN_SHUTOFF or state == libvirt.VIR_DOMAIN_SHUTDOWN: - domobj.create() - time.sleep(30) - # Add check function - return True +def check_sched_params(guestname, sched_params_after): + """Check scheduler parameters validity after setting + """ + + if os.path.exists("/cgroup"): + """ Add the judgment method, since the cgroup path is different on + rhel6 and rhel7. + if the folder cgroup is existed, it means the host os is rhel6, + if not existed, it means the the host of is rhel7 + """ + + cgroup_path = "cat /cgroup/cpu/libvirt/qemu/%s/" % guestname else: - return True - -def check_sched_params(*args): - """Check scheduler parameters validity after setting""" - hypervisor, dicts, guestname, domobj = args - sched_dict = {} - if hypervisor == "xen": - sched_dict = eval(commands.getoutput('xm sched-credit -d %s' - % guestname)) - if sched_dict['weight'] == dicts['weight'] and \ - sched_dict['cap'] == dicts['cap']: - return 0 - else: + cgroup_path = "cat /sys/fs/cgroup/cpu\,cpuacct/machine.slice/" \ + "machine-qemu\\\\x2d%s.scope/" % guestname + + sched_dicts = {'vcpu_quota': 'vcpu0/cpu.cfs_quota_us', \ + 'vcpu_period': 'vcpu0/cpu.cfs_period_us', \ + 'emulator_period': 'emulator/cpu.cfs_period_us', \ + 'emulator_quota': 'emulator/cpu.cfs_quota_us', \ + 'cpu_shares': 'cpu.shares'} + + for sched_key in sched_dicts: + cmd = cgroup_path + sched_dicts[sched_key] + status, cmd_value = utils.exec_cmd(cmd, shell=True) + if status: + logger.error("failed to get ***%s*** value" % sched_key) return 1 - if hypervisor == "kvm": - sched_dict = domobj.schedulerParameters() - if sched_dict['cpu_shares'] == dicts['cpu_shares']: - return 0 - else: + sched_dicts[sched_key] = int(cmd_value[0]) + if sched_dicts[sched_key] != sched_params_after[sched_key]: + logger.error("set scheduler parameters failed") return 1 + logger.info("set scheduler parameters success") + return 0 + def sched_params(params): - """Setting scheduler parameters, argument params is a - dictionary data type.which includes 'weight' and 'cap' - keys, by assigning different value to 'weight' and 'cap' - to verify validity of the result + """ Change and get the scheduler parameters """ - hypervisor = utils.get_hypervisor() + global logger logger = params['logger'] guestname = params['guestname'] - conn = sharedmod.libvirtobj['conn'] - - domobj = conn.lookupByName(guestname) - - if check_guest_status(domobj): - sched_params = domobj.schedulerParameters() - logger.info("original scheduler parameters: %s\n" % sched_params) - - if 'xen' in hypervisor: - str_weight = params['weight'] - str_cap = params['cap'] - for wgt in eval(str_weight): - for cap in eval(str_cap): - dicts = {'weight': wgt, 'cap': cap} - logger.info("setting scheduler parameters: %s" % dicts) - domobj.setSchedulerParameters(dicts) - sched_params = domobj.schedulerParameters() - logger.info("current scheduler parameters: %s\n" % sched_params) - - retval = check_sched_params(hypervisor, dicts, - guestname, domobj) - if retval != 0: - return 1 - elif 'kvm' in hypervisor: - cpu_shares = int(params['cpushares']) - dicts = {'cpu_shares': cpu_shares} + dicts = {'vcpu_quota': int(params['vcpuquota']), \ + 'vcpu_period': int(params['vcpuperiod']), \ + 'emulator_period': int(params['emulatorperiod']), \ + 'emulator_quota': int(params['emulatorquota']), \ + 'cpu_shares': int(params['cpushares'])} + + try: + conn = sharedmod.libvirtobj['conn'] + domobj = conn.lookupByName(guestname) + + sched_type = str(domobj.schedulerType()[0]) + logger.info("the scheduler type is: %s" % sched_type) + sched_params_original = domobj.schedulerParameters() + logger.info("original scheduler parameters: %s" % sched_params_original) logger.info("setting scheduler parameters: %s" % dicts) domobj.setSchedulerParameters(dicts) - sched_params = domobj.schedulerParameters() - logger.info("current scheduler parameters: %s\n" % sched_params) - retval = check_sched_params(hypervisor, dicts, - guestname, domobj) - if retval != 0: - return 1 - else: - logger.error("unsupported hypervisor type: %s" % hypervisor) - return 1 + sched_params_after = domobj.schedulerParameters() + logger.info("current scheduler parameters: %s" % sched_params_after) - return 0 + ret = check_sched_params(guestname, sched_params_after) + + return ret + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 diff --git a/repos/domain/sched_params_flag.py b/repos/domain/sched_params_flag.py new file mode 100644 index 0000000..19bcb13 --- /dev/null +++ b/repos/domain/sched_params_flag.py @@ -0,0 +1,148 @@ +#!/usr/bin/evn python +# Set and show scheduler parameters with flag, such as "--current", "--live" +# and "--config" + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils +from xml.dom import minidom +import os + +required_params = ('guestname', 'vcpuquota', 'vcpuperiod', 'emulatorperiod', \ + 'emulatorquota', 'cpushares', 'flag',) +optional_params = {} + +def check_sched_params_flag(guestname, domobj, sched_params_after, domstate, \ + flags_value): + """Check scheduler parameters validity after setting + """ + + if (domstate == 1) and ((flags_value == 0) or (flags_value == 1)): + """While the domain is running and the flag is "--live" or "--current", + the value can be checked with the cgroup value + As for the other condition, the value can be checked with the domain + config xml + """ + + if os.path.exists("/cgroup"): + """ Add the judgment method, since the cgroup path is different on + rhel6 and rhel7. + if the folder cgroup is existed, it means the host os is rhel6, + if not existed, it means the the host of is rhel7 + """ + + cgroup_path = "cat /cgroup/cpu/libvirt/qemu/%s/" % guestname + else: + cgroup_path = "cat /sys/fs/cgroup/cpu\,cpuacct/machine.slice/" \ + "machine-qemu\\\\x2d%s.scope/" % guestname + + sched_dicts = {'vcpu_quota': 'vcpu0/cpu.cfs_quota_us', \ + 'vcpu_period': 'vcpu0/cpu.cfs_period_us', \ + 'emulator_period': 'emulator/cpu.cfs_period_us', \ + 'emulator_quota': 'emulator/cpu.cfs_quota_us', \ + 'cpu_shares': 'cpu.shares'} + + for sched_key in sched_dicts: + cmd = cgroup_path + sched_dicts[sched_key] + status, cmd_value = utils.exec_cmd(cmd, shell=True) + if status: + logger.error("failed to get ***%s*** value" % sched_key) + return 1 + sched_dicts[sched_key] = int(cmd_value[0]) + if sched_dicts[sched_key] != sched_params_after[sched_key]: + logger.error("set scheduler parameters failed") + return 1 + + else: + guestxml = domobj.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE) + logger.debug("domain %s config xml :\n%s" % (domobj.name(), guestxml)) + + xmlrootnode = minidom.parseString(guestxml) + + sched_dicts = {'vcpu_quota': 'quota', 'vcpu_period': 'period', \ + 'emulator_period': 'emulator_period', \ + 'emulator_quota': 'emulator_quota', \ + 'cpu_shares': 'shares'} + + for sched_key in sched_dicts: + node = xmlrootnode.getElementsByTagName(sched_dicts[sched_key])[0] + sched_dicts[sched_key] = int(node.childNodes[0].data) + if sched_dicts[sched_key] != sched_params_after[sched_key]: + logger.error("set scheduler parameters failed") + return 1 + + logger.info("set scheduler parameters success") + return 0 + +def sched_params_flag(params): + """ Change and get the scheduler parameters + """ + + global logger + logger = params['logger'] + guestname = params['guestname'] + dicts = {'vcpu_quota': int(params['vcpuquota']), \ + 'vcpu_period': int(params['vcpuperiod']), \ + 'emulator_period': int(params['emulatorperiod']), \ + 'emulator_quota': int(params['emulatorquota']), \ + 'cpu_shares': int(params['cpushares'])} + flags = params['flag'] + + try: + conn = sharedmod.libvirtobj['conn'] + domobj = conn.lookupByName(guestname) + + domstate = domobj.state(0)[0] + """following is the domain state: + '1' is running status + '5' is shutoff status + please see the following reference link: + http://libvirt.org/html/libvirt-libvirt.html#virDomainState + """ + if domstate == 1: + logger.info("the state of virtual machine is ***running***") + elif domstate == 5: + logger.info("the state of virtual machine is ***shutoff***") + else: + logger.error("the state of virtual machine is not running or " \ + "shutoff now, it is out of the check range of this " \ + "script. Please check the domain status.") + return 1 + + """virDomainModificationImpact + VIR_DOMAIN_AFFECT_CURRENT = 0 + VIR_DOMAIN_AFFECT_LIVE = 1 + VIR_DOMAIN_AFFECT_CONFIG = 2 + """ + + if flags == "current": + flags_value = libvirt.VIR_DOMAIN_AFFECT_CURRENT + elif flags == "live": + flags_value = libvirt.VIR_DOMAIN_AFFECT_LIVE + elif flags == "config": + flags_value = libvirt.VIR_DOMAIN_AFFECT_CONFIG + else: + logger.error("the value of flags is not correct, please check " \ + "the conf file") + return 1 + + sched_type = str(domobj.schedulerType()[0]) + logger.info("the scheduler type is: %s" % sched_type) + sched_params_original = domobj.schedulerParametersFlags(flags_value) + logger.info("original scheduler parameters with flag ***%s***: %s" % \ + (flags, sched_params_original)) + logger.info("setting scheduler parameters: %s" % dicts) + domobj.setSchedulerParametersFlags(dicts, flags_value) + sched_params_after = domobj.schedulerParametersFlags(flags_value) + logger.info("current scheduler parameters with flag ***%s***: %s" % \ + (flags, sched_params_after)) + + ret = check_sched_params_flag(guestname, domobj, sched_params_after, \ + domstate, flags_value) + + return ret + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 -- 1.8.3.1

2 1

[libvirt] [test-API][PATCH] Add new case for listAllVolumes and update releated conf
by codong 12 Dec '13

12 Dec '13

listAllVolumes is a new API in RHEL7, so add a new case for it. And add the case to releated conf to check the volumes list. modified: cases/storage_dir.conf modified: cases/storage_dir_vol_resize_delta.conf modified: cases/storage_logical.conf modified: cases/storage_netfs.conf new file: repos/storage/list_volumes.py --- cases/storage_dir.conf | 16 +++++ cases/storage_dir_vol_resize_delta.conf | 8 +++ cases/storage_logical.conf | 16 +++++ cases/storage_netfs.conf | 16 +++++ repos/storage/list_volumes.py | 97 +++++++++++++++++++++++++++++++ 5 files changed, 153 insertions(+), 0 deletions(-) create mode 100644 repos/storage/list_volumes.py diff --git a/cases/storage_dir.conf b/cases/storage_dir.conf index 38b349d..393d34f 100644 --- a/cases/storage_dir.conf +++ b/cases/storage_dir.conf @@ -20,6 +20,10 @@ storage:create_dir_volume capacity $defaultvolumesize +storage:list_volumes + poolname + $defaultpoolname + storage:vol_clone poolname $defaultpoolname @@ -28,18 +32,30 @@ storage:vol_clone clonevolname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_dir_volume poolname $defaultpoolname volname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_dir_volume poolname $defaultpoolname volname $defaultvolumename +storage:list_volumes + poolname + $defaultpoolname + storage:destroy_pool poolname $defaultpoolname diff --git a/cases/storage_dir_vol_resize_delta.conf b/cases/storage_dir_vol_resize_delta.conf index 58e15bf..22d3b47 100644 --- a/cases/storage_dir_vol_resize_delta.conf +++ b/cases/storage_dir_vol_resize_delta.conf @@ -12,6 +12,10 @@ storage:create_dir_volume capacity $defaultvolumesize +storage:list_volumes + poolname + $defaultpoolname + storage:vol_resize_delta poolname $defaultpoolname @@ -42,6 +46,10 @@ storage:delete_dir_volume volname $defaultvolumename +storage:list_volumes + poolname + $defaultpoolname + storage:destroy_pool poolname $defaultpoolname diff --git a/cases/storage_logical.conf b/cases/storage_logical.conf index d374dfa..a0fdad6 100644 --- a/cases/storage_logical.conf +++ b/cases/storage_logical.conf @@ -22,6 +22,10 @@ storage:create_logical_volume capacity $defaultvolumesize +storage:list_volumes + poolname + $defaultpoolname + storage:vol_clone poolname $defaultpoolname @@ -30,18 +34,30 @@ storage:vol_clone clonevolname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_logical_volume poolname $defaultpoolname volname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_logical_volume poolname $defaultpoolname volname $defaultvolumename +storage:list_volumes + poolname + $defaultpoolname + storage:destroy_pool poolname $defaultpoolname diff --git a/cases/storage_netfs.conf b/cases/storage_netfs.conf index f486ff4..6880763 100644 --- a/cases/storage_netfs.conf +++ b/cases/storage_netfs.conf @@ -24,6 +24,10 @@ storage:create_netfs_volume capacity $defaultvolumesize +storage:list_volumes + poolname + $defaultpoolname + storage:vol_clone poolname $defaultpoolname @@ -32,18 +36,30 @@ storage:vol_clone clonevolname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_netfs_volume poolname $defaultpoolname volname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_netfs_volume poolname $defaultpoolname volname $defaultvolumename +storage:list_volumes + poolname + $defaultpoolname + storage:destroy_pool poolname $defaultpoolname diff --git a/repos/storage/list_volumes.py b/repos/storage/list_volumes.py new file mode 100644 index 0000000..9555720 --- /dev/null +++ b/repos/storage/list_volumes.py @@ -0,0 +1,97 @@ +#!/usr/bin/evn python + +import libvirt +from libvirt import libvirtError +from xml.dom import minidom + +from utils import utils + +from src import sharedmod + +required_params = ('poolname',) +optional_params = {} + + +def get_pool_path(pool_obj): + """ + Get the pool path + """ + poolxml = pool_obj.XMLDesc(0) + logger.debug("the xml description of pool is %s" % poolxml) + + doc = minidom.parseString(poolxml) + path_element = doc.getElementsByTagName('path')[0] + textnode = path_element.childNodes[0] + path_value = textnode.data + + return path_value + + +def check_list_volumes(pool_obj, vol_name_list): + """ + Check the result of listAllVolumes + """ + + vol_poolobj_list = pool_obj.listVolumes() + logger.debug("get volumes from listVolumes is %s" % vol_poolobj_list) + + poolpath = get_pool_path(pool_obj) + logger.info("the pool path is %s" % poolpath) + vol_ls_cmd = "ls -a " + poolpath + + (status, vol_cmd_list) = utils.exec_cmd(vol_ls_cmd, shell=True) + if status: + logger.error("Executing " + vol_ls_cmd + " failed") + logger.error(vol_ls_cmd) + return False + else: + logger.debug("get volumes from poolpath is %s" % vol_cmd_list) + logger.info("compare the volume list under poolpath and list from API") + vol_cmd_list = vol_cmd_list[2:] + vol_name_list.sort() + vol_poolobj_list.sort() + vol_cmd_list.sort() + if (cmp(vol_poolobj_list, vol_name_list) == 0) and \ + (cmp(vol_name_list, vol_cmd_list) == 0): + + return True + else: + return False + + +def list_volumes(params): + """List all the volumes of a storage pool + """ + global logger + logger = params['logger'] + poolname = params['poolname'] + vol_name_list = [] + + logger.info("the poolname is %s" % (poolname)) + conn = sharedmod.libvirtobj['conn'] + storage_pool_list = conn.listStoragePools() + + if poolname not in storage_pool_list: + logger.error("pool %s doesn't exist or not running" % poolname) + return 1 + + pool_obj = conn.storagePoolLookupByName(poolname) + + try: + vol_obj_list = pool_obj.listAllVolumes() + for vol_obj in vol_obj_list: + vol_name_list.append(vol_obj.name()) + logger.info("the volume list is %s" % vol_name_list) + + if check_list_volumes(pool_obj, vol_name_list): + logger.info("get the right volumes list successfully") + else: + logger.error("fail to get the right volumes list") + return 1 + + except libvirtError as e: + logger.error("API error message: %s, error code is %s" + % (e.message, e.get_error_code())) + return 1 + + return 0 -- 1.7.1

3 2

[libvirt] [PATCH] storage: show compile options in virsh --version=long
by Eric Blake 12 Dec '13

12 Dec '13

Adding output to 'virsh --version=long' makes it easier to tell if a distro built with particular libraries (it doesn't tell you what a remote libvirtd is built with, but is still better than nothing). * tools/virsh.c (vshShowVersion): Add gluster witness. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tools/virsh.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/virsh.c b/tools/virsh.c index 5559d71..9d07d3e 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3069,6 +3069,9 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef WITH_STORAGE_SHEEPDOG vshPrint(ctl, " Sheepdog"); #endif +#ifdef WITH_STORAGE_GLUSTER + vshPrint(ctl, " Gluster"); +#endif vshPrint(ctl, "\n"); vshPrint(ctl, "%s", _(" Miscellaneous:")); -- 1.8.4.2

2 2

[libvirt] Glusterfs Libvirt issue
by Umar Draz 11 Dec '13

11 Dec '13

Hi, I am trying to create glusterfs pool with libvirt but its working, and following is the error *libvirt_storagepool_define_xml(): internal error unknown storage pool type gluster* the Qemu has enabled glusterfs backend support. I can create the glusterfs image using this *qemu-img create gluster://localhost/test/umar 5G* Would you please help what should else i need to require? Br. Umar

2 4

[libvirt] [PATCH python 00/14] Finished port to Python3
by Daniel P. Berrange 11 Dec '13

11 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This series finishes the initial port to Python3. The code generator works, the C code compiles without warnings, and the sanitytest passes. The APIs using strings have all switched to PyUnicode except for thos which deal with binary data which now use PyBytes in Python 3 builds. Daniel P. Berrange (14): examples: Invoke print("...") instead of print "..." examples: Ensure we write bytes to the self-pipe override: Fix native module registration to work with Python3 sanitytest: Fix libvirtError class handling for Python 2.4 override: Replace PyString_FromString with libvirt_constcharPtrWrap override: Replace PyString_AsString with libvirt_charPtrUnwrap override: Replace Py{Int,Long}_FromLong with helpers override: Replace PyInt_AsLong with helper typewrappers: Replace use of PyString class typewrappers: PyInt/PyLong merge for Python3 override: Conditionalize use of PyString_Check and PyInt_Check override: Switch virStreamSend wrapper to use libvirt_charPtrSizeUnwrap sanitytest: Fix broken comparison between int and string sanitytest: remove use of string.lower() examples/consolecallback.py | 6 +- examples/dominfo.py | 14 +- examples/domrestore.py | 17 +-- examples/domsave.py | 15 +- examples/domstart.py | 19 ++- examples/esxlist.py | 14 +- examples/event-test.py | 70 ++++----- examples/topology.py | 14 +- libvirt-lxc-override.c | 75 +++++++--- libvirt-override.c | 348 ++++++++++++++++++++++++++------------------ libvirt-qemu-override.c | 77 +++++++--- sanitytest.py | 10 +- typewrappers.c | 97 +++++++++++- typewrappers.h | 3 + 14 files changed, 500 insertions(+), 279 deletions(-) -- 1.8.3.1

2 30

[libvirt] [python PATCH v2] Added python binding for the new network events API
by Cédric Bosdonnat 11 Dec '13

11 Dec '13

--- Changes to previous patch: * Fixed Eric's comments * Updated code to latest libvirt patches submitted generator.py | 2 + libvirt-override-virConnect.py | 34 +++++++++ libvirt-override.c | 152 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+) diff --git a/generator.py b/generator.py index 84c7678..42f3913 100755 --- a/generator.py +++ b/generator.py @@ -491,6 +491,8 @@ skip_function = ( 'virConnectDomainEventDeregister', # overridden in virConnect.py 'virConnectDomainEventRegisterAny', # overridden in virConnect.py 'virConnectDomainEventDeregisterAny', # overridden in virConnect.py + 'virConnectNetworkEventRegisterAny', # overridden in virConnect.py + 'virConnectNetworkEventDeregisterAny', # overridden in virConnect.py 'virSaveLastError', # We have our own python error wrapper 'virFreeError', # Only needed if we use virSaveLastError 'virConnectListAllDomains', # overridden in virConnect.py diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index 0beaf9c..c228eb2 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -198,6 +198,40 @@ except AttributeError: pass + def _dispatchNetworkEventLifecycleCallback(self, net, event, detail, cbData): + """Dispatches events to python user network lifecycle event callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virNetwork(self, _obj=net), event, detail, opaque) + return 0 + + def networkEventDeregisterAny(self, callbackID): + """Removes a Network Event Callback. De-registering for a + network callback will disable delivery of this event type""" + try: + ret = libvirtmod.virConnectNetworkEventDeregisterAny(self._o, callbackID) + if ret == -1: raise libvirtError ('virConnectNetworkEventDeregisterAny() failed', conn=self) + del self.networkEventCallbackID[callbackID] + except AttributeError: + pass + + def networkEventRegisterAny(self, net, eventID, cb, opaque): + """Adds a Network Event Callback. Registering for a network + callback will enable delivery of the events""" + if not hasattr(self, 'networkEventCallbackID'): + self.networkEventCallbackID = {} + cbData = { "cb": cb, "conn": self, "opaque": opaque } + if net is None: + ret = libvirtmod.virConnectNetworkEventRegisterAny(self._o, None, eventID, cbData) + else: + ret = libvirtmod.virConnectNetworkEventRegisterAny(self._o, net._o, eventID, cbData) + if ret == -1: + raise libvirtError ('virConnectNetworkEventRegisterAny() failed', conn=self) + self.networkEventCallbackID[ret] = opaque + return ret + def domainEventRegisterAny(self, dom, eventID, cb, opaque): """Adds a Domain Event Callback. Registering for a domain callback will enable delivery of the events """ diff --git a/libvirt-override.c b/libvirt-override.c index 5deb414..fbcd1c8 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -6515,6 +6515,154 @@ libvirt_virConnectDomainEventDeregisterAny(ATTRIBUTE_UNUSED PyObject * self, return py_retval; } +#if LIBVIR_CHECK_VERSION(1, 2, 1) +static void +libvirt_virConnectNetworkEventFreeFunc(void *opaque) +{ + PyObject *pyobj_conn = (PyObject*)opaque; + LIBVIRT_ENSURE_THREAD_STATE; + Py_DECREF(pyobj_conn); + LIBVIRT_RELEASE_THREAD_STATE; +} + +static int +libvirt_virConnectNetworkEventLifecycleCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virNetworkPtr net, + int event, + int detail, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_net; + PyObject *pyobj_ret; + PyObject *pyobj_conn; + PyObject *dictKey; + int ret = -1; + + LIBVIRT_ENSURE_THREAD_STATE; + + dictKey = libvirt_constcharPtrWrap("conn"); + if (!dictKey) + return ret; + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Create a python instance of this virNetworkPtr */ + virNetworkRef(net); + pyobj_net = libvirt_virNetworkPtrWrap(net); + Py_INCREF(pyobj_cbData); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"_dispatchNetworkEventLifecycleCallback", + (char*)"OiiO", + pyobj_net, + event, + detail, + pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_net); + + if (!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + ret = 0; + } + + LIBVIRT_RELEASE_THREAD_STATE; + return ret; +} + +static PyObject +*libvirt_virConnectNetworkEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval; /* return value */ + PyObject *pyobj_conn; /* virConnectPtr */ + PyObject *pyobj_net; + PyObject *pyobj_cbData; /* hash of callback data */ + int eventID; + virConnectPtr conn; + int ret = 0; + virConnectNetworkEventGenericCallback cb = NULL; + virNetworkPtr net; + + if (!PyArg_ParseTuple + (args, (char *) "OOiO:virConnectNetworkEventRegisterAny", + &pyobj_conn, &pyobj_net, &eventID, &pyobj_cbData)) { + DEBUG("%s failed parsing tuple\n", __FUNCTION__); + return VIR_PY_INT_FAIL; + } + + DEBUG("libvirt_virConnectNetworkEventRegister(%p %p %d %p) called\n", + pyobj_conn, pyobj_net, eventID, pyobj_cbData); + conn = PyvirConnect_Get(pyobj_conn); + if (pyobj_net == Py_None) + net = NULL; + else + net = PyvirNetwork_Get(pyobj_net); + + switch ((virNetworkEventID) eventID) { + case VIR_NETWORK_EVENT_ID_LIFECYCLE: + cb = VIR_NETWORK_EVENT_CALLBACK(libvirt_virConnectNetworkEventLifecycleCallback); + break; + + case VIR_NETWORK_EVENT_ID_LAST: + break; + } + + if (!cb) { + return VIR_PY_INT_FAIL; + } + + Py_INCREF(pyobj_cbData); + + LIBVIRT_BEGIN_ALLOW_THREADS; + ret = virConnectNetworkEventRegisterAny(conn, net, eventID, + cb, pyobj_cbData, + libvirt_virConnectNetworkEventFreeFunc); + LIBVIRT_END_ALLOW_THREADS; + + if (ret < 0) { + Py_DECREF(pyobj_cbData); + } + + py_retval = libvirt_intWrap(ret); + return py_retval; +} + +static PyObject +*libvirt_virConnectNetworkEventDeregisterAny(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval; + PyObject *pyobj_conn; + int callbackID; + virConnectPtr conn; + int ret = 0; + + if (!PyArg_ParseTuple + (args, (char *) "Oi:virConnectNetworkEventDeregister", + &pyobj_conn, &callbackID)) + return NULL; + + DEBUG("libvirt_virConnectNetworkEventDeregister(%p) called\n", pyobj_conn); + + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + LIBVIRT_BEGIN_ALLOW_THREADS; + + ret = virConnectNetworkEventDeregisterAny(conn, callbackID); + + LIBVIRT_END_ALLOW_THREADS; + py_retval = libvirt_intWrap(ret); + return py_retval; +} +#endif /* LIBVIR_CHECK_VERSION(1, 2, 1)*/ + #if LIBVIR_CHECK_VERSION(0, 10, 0) static void libvirt_virConnectCloseCallbackDispatch(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -7315,6 +7463,10 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virConnectDomainEventDeregister", libvirt_virConnectDomainEventDeregister, METH_VARARGS, NULL}, {(char *) "virConnectDomainEventRegisterAny", libvirt_virConnectDomainEventRegisterAny, METH_VARARGS, NULL}, {(char *) "virConnectDomainEventDeregisterAny", libvirt_virConnectDomainEventDeregisterAny, METH_VARARGS, NULL}, +#if LIBVIR_CHECK_VERSION(1, 2, 1) + {(char *) "virConnectNetworkEventRegisterAny", libvirt_virConnectNetworkEventRegisterAny, METH_VARARGS, NULL}, + {(char *) "virConnectNetworkEventDeregisterAny", libvirt_virConnectNetworkEventDeregisterAny, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(1, 2, 1) */ #if LIBVIR_CHECK_VERSION(0, 10, 0) {(char *) "virConnectRegisterCloseCallback", libvirt_virConnectRegisterCloseCallback, METH_VARARGS, NULL}, {(char *) "virConnectUnregisterCloseCallback", libvirt_virConnectUnregisterCloseCallback, METH_VARARGS, NULL}, -- 1.8.4.4

2 1

[libvirt] ANNOUNCE: ruby-libvirt 0.5.0
by Chris Lalancette 11 Dec '13

11 Dec '13

All, I'm pleased to announce the release of ruby-libvirt 0.5.0. ruby-libvirt is a ruby wrapper around the libvirt API. Version 0.5.0 brings new APIs, more documentation, and bugfixes: * Updated Network class, implementing almost all libvirt APIs * Updated Domain class, implementing almost all libvirt APIs * Updated Connection class, implementing almost all libvirt APIs * Updated DomainSnapshot class, implementing almost all libvirt APIs * Updated NodeDevice class, implementing almost all libvirt APIs * Updated Storage class, implementing almost all libvirt APIs * Add constants for almost all libvirt defines * Improved performance in the library by using alloca Version 0.5.0 is available from http://libvirt.org/ruby: Tarball: http://libvirt.org/ruby/download/ruby-libvirt-0.5.0.tgz Gem: http://libvirt.org/ruby/download/ruby-libvirt-0.5.0.gem It is also available from rubygems.org; to get the latest version, run: $ gem install ruby-libvirt As usual, if you run into questions, problems, or bugs, please feel free to mail me (clalancette(a)gmail.com) and/or the libvirt mailing list. Thanks to everyone who contributed patches and submitted bugs. Chris Lalancette

2 5

[libvirt] [PATCH] docs: fix a typo in libvirt.h
by Chen Hanxiao 11 Dec '13

11 Dec '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> s/pausde/paused Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- include/libvirt/libvirt.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 29d4dce..51a02f5 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -4576,7 +4576,7 @@ typedef void (*virConnectDomainEventWatchdogCallback)(virConnectPtr conn, */ typedef enum { VIR_DOMAIN_EVENT_IO_ERROR_NONE = 0, /* No action, IO error ignored */ - VIR_DOMAIN_EVENT_IO_ERROR_PAUSE, /* Guest CPUs are pausde */ + VIR_DOMAIN_EVENT_IO_ERROR_PAUSE, /* Guest CPUs are paused */ VIR_DOMAIN_EVENT_IO_ERROR_REPORT, /* IO error reported to guest OS */ #ifdef VIR_ENUM_SENTINELS -- 1.8.2.1

2 1

Re: [libvirt] [Qemu-devel] [PATCH V17 02/11] NUMA: check if the total numa memory size is equal to ram_size
by Eduardo Habkost 11 Dec '13

11 Dec '13

CCing libvir-list. On Wed, Dec 04, 2013 at 03:58:50PM +0800, Wanlong Gao wrote: > If the total number of the assigned numa nodes memory is not > equal to the assigned ram size, it will write the wrong data > to ACPI talb, then the guest will ignore the wrong ACPI table > and recognize all memory to one node. It's buggy, we should > check it to ensure that we write the right data to ACPI table. > > Signed-off-by: Wanlong Gao <gaowanlong(a)cn.fujitsu.com> This will make configurations that could be running for years (except that the guest OS was ignoring the NUMA data) suddenly stop running. I just want to confirm: we really want that, right? Does libvirt allow this kind of broken configuration to be generated, or it already ensures the total NUMA node sizes match RAM size? > --- > numa.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/numa.c b/numa.c > index ce7736a..beda80e 100644 > --- a/numa.c > +++ b/numa.c > @@ -150,6 +150,16 @@ void set_numa_nodes(void) > node_mem[i] = ram_size - usedmem; > } > > + uint64_t numa_total = 0; > + for (i = 0; i < nb_numa_nodes; i++) { > + numa_total += node_mem[i]; > + } > + if (numa_total != ram_size) { > + fprintf(stderr, "qemu: numa nodes total memory size " > + "should equal to ram_size\n"); > + exit(1); > + } > + > for (i = 0; i < nb_numa_nodes; i++) { > if (!bitmap_empty(node_cpumask[i], MAX_CPUMASK_BITS)) { > break; > -- > 1.8.5 > > -- Eduardo

3 3

[libvirt] [PATCH] storage_backend_rbd: rename "stat" variable
by Michael Chapman 11 Dec '13

11 Dec '13

This variable shadows the stat(2) function, which only became visible in this scope as of commit 9cac8639. Rename the variable so it doesn't conflict. Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/storage/storage_backend_rbd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index b8a553d..4b6f18c 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -314,8 +314,8 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, goto cleanup; } - struct rados_cluster_stat_t stat; - if (rados_cluster_stat(ptr.cluster, &stat) < 0) { + struct rados_cluster_stat_t clusterstat; + if (rados_cluster_stat(ptr.cluster, &clusterstat) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to stat the RADOS cluster")); goto cleanup; @@ -329,13 +329,13 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, goto cleanup; } - pool->def->capacity = stat.kb * 1024; - pool->def->available = stat.kb_avail * 1024; + pool->def->capacity = clusterstat.kb * 1024; + pool->def->available = clusterstat.kb_avail * 1024; pool->def->allocation = poolstat.num_bytes; VIR_DEBUG("Utilization of RBD pool %s: (kb: %llu kb_avail: %llu num_bytes: %llu)", - pool->def->source.name, (unsigned long long)stat.kb, - (unsigned long long)stat.kb_avail, + pool->def->source.name, (unsigned long long)clusterstat.kb, + (unsigned long long)clusterstat.kb_avail, (unsigned long long)poolstat.num_bytes); while (true) { -- 1.8.4.2

2 1

[libvirt] [PATCH 0/6] Some virtlockd improvements
by Michael Chapman 11 Dec '13

11 Dec '13

Hi, This patch series fixes up a few problems encountered while testing out virtlockd. The biggest problem was that reloading virtlockd through systemd or its initscript would send it a SIGHUP, not a SIGUSR1 (which causes it to re-exec itself). This would simply kill it. Patches 1-3 clean this up by having SIGHUP behave the same as SIGUSR1. The systemd unit and initscript have to use SIGUSR1, though, since they may be called upon to signal an old virtlockd binary. When run from the initscript graceful re-exec didn't work properly anyway, as virtlockd assumed argv[0] was a full path to its binary. The initscript didn't provide a full path. Patches 4-5 make virtlockd use execvp() to re-exec itself, which does a PATH lookup if necessary. Patch 6 isn't really virtlockd-specific. It moves the reloading of virtlockd and libvirtd via initscripts into the libvirt-daemon package's %postun scriptlet (which is already where reloading is done with systemd). The problem with reloading libvirt-daemon in %post is that it restarts *before* all of the libvirt-daemon-driver-* packages have been updated in the same RPM transaction, which means it keeps using the old libraries (or fails to load them due to missing symbols). Michael Chapman (6): virtlockd: improve systemd units virtlockd: improve initscripts virtlockd: treat SIGHUP like SIGUSR1 virtlockd: use common exit path when out-of-memory virtlockd: make re-exec more robust spec: clean up libvirtd and virtlockd service mgmt daemon/libvirtd.init.in | 2 ++ libvirt.spec.in | 43 +++++++++++----------- src/locking/lock_daemon.c | 77 ++++++++++++++++++++++++++++++---------- src/locking/virtlockd.init.in | 11 +++--- src/locking/virtlockd.service.in | 7 ++-- src/locking/virtlockd.socket.in | 2 +- 6 files changed, 95 insertions(+), 47 deletions(-) -- 1.8.4.2

4 17

[libvirt] [PATCH 0/9] Add throttle blkio cgroup support for libvirt
by Gao feng 11 Dec '13

11 Dec '13

Right now, libvirt only supports the cfq based blkio cgorup, this means if the block devices doesn't use cfq scheduler, the blkio cgroup will loss effect. This patchset adds the throttle blkio cgroup support for libvirt, intoduces four elements for domain configuration and extend the virsh command blkiotune. This patchset is a new version of Guan Qiang's patchset ://www.redhat.com/archives/libvir-list/2013-October/msg01066.html Change form Guan Qiang's patchset: 1, split to 8 patches, make logic more clear 2, change the type of read/write iops form unsigned long long to unsigned int, trying to set read/write iops to the value which bigger than max number of unsigned int will fail. 3, fix some logic shortage. Gao feng (9): rename virDomainBlkioDeviceWeightParseXML to virDomainBlkioDeviceParseXML rename virBlkioDeviceWeightArrayClear to virBlkioDeviceArrayClear rename virBlkioDeviceWeightPtr to virBlkioDevicePtr domain: introduce xml elements for throttle blkio cgroup blkio: Setting throttle blkio cgroup for domain qemu: allow to setup throttle blkio cgroup through virsh virsh: add virsh manual for setting throttle blkio cgroup lxc: allow to setup throttle blkio cgroup through virsh qemu: add new throttle blkio cgroup elements to the test xml docs/schemas/domaincommon.rng | 28 +- include/libvirt/libvirt.h.in | 45 ++ src/conf/domain_conf.c | 113 +++- src/conf/domain_conf.h | 16 +- src/libvirt_private.syms | 5 +- src/lxc/lxc_cgroup.c | 12 +- src/lxc/lxc_driver.c | 649 ++++++++++++++++++++- src/qemu/qemu_cgroup.c | 13 +- src/qemu/qemu_driver.c | 432 ++++++++++++-- src/util/vircgroup.c | 170 +++++- src/util/vircgroup.h | 18 + .../qemuxml2argv-blkiotune-device.xml | 8 + tools/virsh-domain.c | 64 ++ tools/virsh.pod | 36 +- 14 files changed, 1485 insertions(+), 124 deletions(-) -- 1.8.3.1

3 23

[libvirt] [PATCH v3 0/6] Support keyboard device
by Li Zhang 11 Dec '13

11 Dec '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> This patchset is to add keyboard input device. For PPC64, it doesn't support a default keyboard device when the graphic is enabled. Libvirt supports QEMU command line as "-device VGA" which won't create any keyboard device for it. So it requires libvirt to add a default USB keyboard device for it. This patchset is to add keyboard input device and a default USB keyboard for PPC64. The related discussion in QEMU community: http://lists.nongnu.org/archive/html/qemu-devel/2013-11/msg01734.html Li Zhang (6): conf: Add a keyboard input device type conf: Add one interface to add input devices. Remove PS2 mouse device for non-X86 platforms qemu_cap: Add USB keyboard capability qemu: parse qemu command line for USB keyboard. Add a default USB keyboard for PPC64 v3 -> v2: * Handle the KBD device type in xen and QEMU driver. (Daniel.P.Berrange) * Remove PS2 mouse device for non-X86 platforms. * Move virDomainDefMaybeAddInput to a new patch. (Jan Tomko) * Replace VIR_REALLOC_N with VIR_APPEND_ELEMENT. (Jan Tomoko) * Fix several typos. (Jan Tomoko) * Add a virReportError when QEMU_CAPS_DEVICE_USB_KBD can't be gotten. (Jan Tomoko) v2 -> v1: * change ifs to switch clause. * reconstruct the patches docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 91 ++++++++++++---------- src/conf/domain_conf.h | 5 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 41 +++++++--- src/qemu/qemu_domain.c | 29 ++++++- src/util/virarch.h | 2 + src/xenxs/xen_sxpr.c | 27 +++++-- src/xenxs/xen_xm.c | 30 +++++-- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 2 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuhelptest.c | 8 ++ .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 3 +- .../qemuxml2argv-pseries-usb-kbd.args | 9 +++ .../qemuxml2argv-pseries-usb-kbd.xml | 19 +++++ tests/qemuxml2argvtest.c | 3 + 22 files changed, 211 insertions(+), 68 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.xml -- 1.8.2.1

2 8

[libvirt] about libvirt install
by 奇查-老张 11 Dec '13

11 Dec '13

hello: when i configure libvirt-0.9.0 it always show: configure: error: You must install kernel-headers in order to compile libvirt with QEMU or LXC support but i am allready install latest kerne-headers. Please help. Thank you

2 2

[libvirt] [PATCH] storage: fix omitted slash in gluster volume URI
by Eric Blake 10 Dec '13

10 Dec '13

When doing 'virsh vol-dumpxml' on a gluster pool's volume, the resulting URI incorrectly omitted a slash between hostname and path: gluster://192.168.122.206rhsvol1/fedora-19.img This is fallout from me rebasing earlier versions of my patch, I had originally played with always requiring the gluster volume to have a leading slash, but it was easier to use the gluster API if the gluster volume name was guaranteed to have no slash; while I got the URI of the pool correct, I forgot to fix the URI of a libvirt volume. * src/storage/storage_backend_gluster.c (virStorageBackendGlusterRefreshVol): Use correct starting point since uri construction requires leading slash. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Once approved, I'm also pushing to v1.2.0-maint src/storage/storage_backend_gluster.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 1be9034..622526b 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -227,7 +227,10 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state, goto cleanup; tmp = state->uri->path; - state->uri->path = vol->key; + if (virAsprintf(&vol->key, "%s%s", state->uri->path, name) < 0) { + state->uri->path = tmp; + goto cleanup; + } if (!(vol->target.path = virURIFormat(state->uri))) { state->uri->path = tmp; goto cleanup; -- 1.8.4.2

2 2

[libvirt] [PATCH] Revert "virtlockd: treat SIGHUP like SIGUSR1"
by Michal Privoznik 10 Dec '13

10 Dec '13

This reverts commit 8355d42dd3df514c8584e0e5082b945b79671fc5. After some discussion upstream [1] this patch turns out to be spurious. It better gets reverted prior to a release. 1: https://www.redhat.com/archives/libvir-list/2013-December/msg00563.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/locking/lock_daemon.c | 2 -- src/locking/virtlockd.pod.in | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index ae09ef8..a6be43c 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -592,8 +592,6 @@ virLockDaemonSetupSignals(virNetServerPtr srv) return -1; if (virNetServerAddSignalHandler(srv, SIGUSR1, virLockDaemonExecRestartHandler, NULL) < 0) return -1; - if (virNetServerAddSignalHandler(srv, SIGHUP, virLockDaemonExecRestartHandler, NULL) < 0) - return -1; return 0; } diff --git a/src/locking/virtlockd.pod.in b/src/locking/virtlockd.pod.in index 022d67f..99612aa 100644 --- a/src/locking/virtlockd.pod.in +++ b/src/locking/virtlockd.pod.in @@ -54,9 +54,9 @@ Display version information then exit. =head1 SIGNALS -On receipt of B<SIGUSR1> or B<SIGHUP> virtlockd will re-exec() its -binary, while maintaining all current locks and clients. This allows -for live upgrades of the virtlockd service. +On receipt of B<SIGUSR1> virtlockd will re-exec() its binary, while +maintaining all current locks and clients. This allows for live +upgrades of the virtlockd service. =head1 FILES -- 1.8.5.1

3 2

[libvirt] [PATCH]lxc: remove redundant mount operation
by Chen Hanxiao 10 Dec '13

10 Dec '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we do not specify a readonly mount, we don't need to re-mount it again. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 255c711..351217a 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1126,13 +1126,6 @@ static int lxcContainerMountFSBind(virDomainFSDefPtr fs, _("Failed to make directory %s readonly"), fs->dst); } - } else { - VIR_DEBUG("Binding %s readwrite", fs->dst); - if (mount(src, fs->dst, NULL, MS_BIND|MS_REMOUNT, NULL) < 0) { - virReportSystemError(errno, - _("Failed to make directory %s readwrite"), - fs->dst); - } } ret = 0; -- 1.8.2.1

3 4