- Devel - libvirt List Archives

[libvirt] iptables --physdev-out warnings
by Reinier Schoof 17 Jan '13

17 Jan '13

Hi, we've experienced some issues with starting lots of KVM based VM's with libvirt. Since I couldn't find any clues on the libvirt mailing list, I'm posting the way I fixed the issues. When starting a VM, /var/log/messages was spammed with the following message: xt_physdev: using --physdev-out in the OUTPUT, FORWARD and POSTROUTING chains for non-bridged traffic is not supported anymore. With each extra VM I start, the messages get amplified exponentially. This results in longer starting times every new VM, relative the the previously started VM. When I ran a test with starting 100 equal VM's, the first VM started in about 2 seconds, the 100th VM took 48 seconds to start. I'm running a vanilla 3.7.1 kernel, but I have the same issue on VM hosts with kernel 3.2.28 or 3.2.0, running libvirt 0.9.12 and 0.9.8 respectively. Looking into the warning, it seemed that iptables need an extra argument, --physdev-is-bridged, in commands like: iptables -A libvirt-out -m physdev --physdev-is-bridged --physdev-out vnet99 -g FP-vnet99 I patched the libvirt source (version 1.0.0) to test whether this works or not: --- src/nwfilter/nwfilter_ebiptables_driver.c.orig 2013-01-16 10:51:43.000000000 +0100 +++ src/nwfilter/nwfilter_ebiptables_driver.c 2013-01-16 10:52:07.000000000 +0100 @@ -166,7 +166,7 @@ snprintf(buf, sizeof(buf), "%c%c-%s", prefix[0], prefix[1], ifname) #define PHYSDEV_IN "--physdev-in" -#define PHYSDEV_OUT "--physdev-out" +#define PHYSDEV_OUT "--physdev-is-bridged --physdev-out" static const char *m_state_out_str = "-m state --state NEW,ESTABLISHED"; static const char *m_state_in_str = "-m state --state ESTABLISHED"; The warnings in /var/log/messages are gone and running the test again proved the 100th VM started in 3.8 seconds. It suprises me I'm the first to mention this problem on the libvirt mailing list and I wondering if I'm doing something wrong. Until then, this fix helps me a lot! Reinier Schoof -- TransIP BV | https://www.transip.nl/

3 2

[libvirt] [test-API][PATCH] Add storage cases of pool list, pool lookup and volume lookup
by Wayne Sun 17 Jan '13

17 Jan '13

Add 3 simple storage realted API cases * pool_list_active is only for testing with flags: libvirt.VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE * pool_lookup is for testing lookup pool object by name, UUID, UUIDString and volume object * vol_lookup is for testing lookup volume object by name, key and path * add cases into storage_dir.conf Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/storage_dir.conf | 14 +++++++ repos/storage/pool_list_active.py | 50 +++++++++++++++++++++++++ repos/storage/pool_lookup.py | 74 +++++++++++++++++++++++++++++++++++++ repos/storage/vol_lookup.py | 62 +++++++++++++++++++++++++++++++ 4 files changed, 200 insertions(+), 0 deletions(-) create mode 100644 repos/storage/pool_list_active.py create mode 100644 repos/storage/pool_lookup.py create mode 100644 repos/storage/vol_lookup.py diff --git a/cases/storage_dir.conf b/cases/storage_dir.conf index 38b349d..2bdb7d6 100644 --- a/cases/storage_dir.conf +++ b/cases/storage_dir.conf @@ -2,14 +2,22 @@ storage:define_dir_pool poolname $defaultpoolname +storage:pool_lookup + poolname + $defaultpoolname + storage:build_dir_pool poolname $defaultpoolname +storage:pool_list_active + storage:activate_pool poolname $defaultpoolname +storage:pool_list_active + storage:create_dir_volume poolname $defaultpoolname @@ -20,6 +28,12 @@ storage:create_dir_volume capacity $defaultvolumesize +storage:vol_lookup + poolname + $defaultpoolname + volname + $defaultvolumename + storage:vol_clone poolname $defaultpoolname diff --git a/repos/storage/pool_list_active.py b/repos/storage/pool_list_active.py new file mode 100644 index 0000000..3e390c8 --- /dev/null +++ b/repos/storage/pool_list_active.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python +# list active storage pool testing with flag: +# libvirt.VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = () +optional_params = { + } + +def pool_list_active(params): + """list active storage pool testing""" + + global logger + logger = params['logger'] + namelist = [] + + conn = sharedmod.libvirtobj['conn'] + try: + pool_num = conn.numOfStoragePools() + logger.info("number of active storage pools is %s" % pool_num) + + flag = libvirt.VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE + poolobj_list = conn.listAllStoragePools(flag) + if not len(poolobj_list) == pool_num: + logger.error("active pool object number mismatched") + return 1 + + for i in poolobj_list: + pool_name = i.name() + namelist.append(pool_name) + + logger.info("active pool name list is %s" % namelist) + + active_namelist = conn.listStoragePools() + if namelist == active_namelist: + logger.info("active pool name list matched") + else: + logger.error("active pool name list mismatched") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + logger.info("list active storage pool succeed") + return 0 diff --git a/repos/storage/pool_lookup.py b/repos/storage/pool_lookup.py new file mode 100644 index 0000000..89d7252 --- /dev/null +++ b/repos/storage/pool_lookup.py @@ -0,0 +1,74 @@ +#!/usr/bin/env python +# storage pool lookup testing + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('poolname',) +optional_params = { + 'volname': None + } + +def pool_lookup(params): + """storage pool lookup testing""" + + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params.get('volname') + retval = 0 + + logger.info("the poolname is %s" % poolname) + if volname: + logger.info("the given volume name is %s" % volname) + + conn = sharedmod.libvirtobj['conn'] + try: + logger.info("lookup the pool object by name: %s" % poolname) + poolobj = conn.storagePoolLookupByName(poolname) + if poolobj.name() == poolname: + logger.info("pool object lookup by name succeed") + else: + logger.error("pool object lookup by name failed") + retval += 1 + + uuid = poolobj.UUID() + logger.info("lookup the pool object by UUID: %s" % uuid) + poolobj_uuid = conn.storagePoolLookupByUUID(uuid) + if poolobj_uuid.name() == poolname: + logger.info("pool object lookup by UUID succeed") + else: + logger.error("pool object lookup by UUID failed") + retval += 1 + + uuidstr = poolobj.UUIDString() + logger.info("lookup the pool object by UUID string: %s" % uuidstr) + poolobj_uuidstr = conn.storagePoolLookupByUUIDString(uuidstr) + if poolobj_uuidstr.name() == poolname: + logger.info("pool object lookup by UUID string succeed") + else: + logger.error("pool object lookup by UUID string failed") + retval += 1 + + if volname: + logger.info("lookup volume object by volume name: %s" % volname) + volobj = poolobj.storageVolLookupByName(volname) + logger.info("lookup the pool object by volume object") + poolobj_vol = volobj.storagePoolLookupByVolume() + + if poolobj_vol.name() == poolname: + logger.info("pool object lookup by UUID string succeed") + else: + logger.error("pool object lookup by UUID string failed") + retval += 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + if retval: + return 1 + + return 0 diff --git a/repos/storage/vol_lookup.py b/repos/storage/vol_lookup.py new file mode 100644 index 0000000..30238e1 --- /dev/null +++ b/repos/storage/vol_lookup.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# storage pool volume lookup testing + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('poolname', 'volname',) +optional_params = { + } + +def vol_lookup(params): + """storage pool volume lookup testing""" + + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + retval = 0 + + logger.info("the poolname is %s" % poolname) + logger.info("the given volume name is %s" % volname) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + + logger.info("lookup the volume object by name: %s" % volname) + volobj = poolobj.storageVolLookupByName(volname) + if volobj.name() == volname: + logger.info("volume object lookup by name succeed") + else: + logger.error("volume object lookup by name failed") + retval += 1 + + volkey = volobj.key() + logger.info("lookup the volume object by key: %s" % volkey) + volobj_key = conn.storageVolLookupByKey(volkey) + if volobj_key.name() == volname: + logger.info("volume object lookup by key succeed") + else: + logger.error("volume object lookup by key failed") + retval += 1 + + volpath = volobj.path() + logger.info("lookup the volume object by path: %s" % volpath) + volobj_path = conn.storageVolLookupByPath(volpath) + if volobj_path.name() == volname: + logger.info("volume object lookup by path succeed") + else: + logger.error("volume object lookup by path failed") + retval += 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + if retval: + return 1 + + return 0 -- 1.7.1

1 0

[libvirt] [PATCH v2 0/5]use VIR_ENUM_DECL for domain NIC model and add usb-net
by Guannan Ren 17 Jan '13

17 Jan '13

v1 to v2 *removed i8* NIC models support for QEMU/KVM *updated docs This patchset uses VIR_ENUM_DECL and VIR_ENUM_IMPL macros for NIC models and changes the related codes to use them. All of NIC models supported by various hypervisors comprise the enum, so the problem is that we need to do further checking in hypervisor-specific implementation. Fortunately, VMX and Vbox did this checking very well already. In 4/5, a similar job is performed for QEMU/KVM. And, adds usb-net support. The vendorId and productID of is 0525:a4a2. The corresponding item in usb-ids is as follows: 0525 Netchip Technology, Inc. a4a2 Linux-USB Ethernet/RNDIS Gadget In my opinion, using usb-net directly is good enough, so I keep it. Any idea is welcome. Libvirt XML sample: <devices> <interface type='user'> <mac address='52:54:00:32:6a:91'/> <model type='usb-net'/> <alias name='net1'/> <address type='usb' bus='0' port='1'/> </interface> </devices> qemu commandline: qemu ${other_vm_args} -netdev user,id=hostnet1 \ -device usb-net,netdev=hostnet1,id=net1,\ mac=52:54:00:32:6a:91,bus=usb.0,port=1 Guannan Ren(2) [PATCH v2 1/5] conf: fix mismatch on two domain VIR_ENUM_IMPL macro [PATCH v2 2/5] add domain NIC model enum macro [PATCH v2 3/5] net: use virDomainNICModelType{From|To}String functions [PATCH v2 4/5] qemu: add NIC model checking for qemu hypervisor [PATCH v2 5/5] qemu: add usb-net support docs/formatdomain.html.in | 29 +++++++++++------------------ src/conf/domain_conf.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------- src/conf/domain_conf.h | 32 +++++++++++++++++++++++++++++++- src/libvirt_private.syms | 2 ++ src/libxl/libxl_conf.c | 5 +++-- src/parallels/parallels_driver.c | 2 +- src/qemu/qemu_command.c | 41 +++++++++++++++++++++++++++-------------- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 10 ++++++---- src/qemu/qemu_process.c | 14 +++++++------- src/vbox/vbox_tmpl.c | 57 +++++++++++++++++++++++++++------------------------------ src/vmx/vmx.c | 31 ++++++++++++++++--------------- src/xenxs/xen_sxpr.c | 23 ++++++++++++----------- src/xenxs/xen_xm.c | 21 +++++++++++---------- 14 files changed, 215 insertions(+), 142 deletions(-)

1 5

[libvirt] Entering freeze for 1.0.2 in a week
by Daniel Veillard 17 Jan '13

17 Jan '13

Just for people to remember, the plan is to enter the freeze for 1.0.2 in a week, on the 24. So if you need to push APIs or large changes, please do so before that deadline :-) Then the release should show up at the end of the month, thanks ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH 0/5] use VIR_ENUM_DECL for domain NIC model and add usb-net
by Guannan Ren 17 Jan '13

17 Jan '13

This patchset uses VIR_ENUM_DECL and VIR_ENUM_IMPL macros for NIC models and changes the related codes to use them. All of NIC models supported by various hypervisors comprise the enum, so the problem is that we need to do further checking in hypervisor-specific implementation. Fortunately, VMX and Vbox did this checking very well already. In 4/5, a similar job is performed for QEMU/KVM. And, adds usb-net support. The vendorId and productID of is 0525:a4a2. The corresponding item in usb-ids is as follows: 0525 Netchip Technology, Inc. a4a2 Linux-USB Ethernet/RNDIS Gadget In my opinion, using usb-net directly is good enough, so I keep it. Any idea is welcome. Libvirt XML sample: <devices> <interface type='user'> <mac address='52:54:00:32:6a:91'/> <model type='usb-net'/> <alias name='net1'/> <address type='usb' bus='0' port='1'/> </interface> </devices> qemu commandline: qemu ${other_vm_args} -netdev user,id=hostnet1 \ -device usb-net,netdev=hostnet1,id=net1,\ mac=52:54:00:32:6a:91,bus=usb.0,port=1 Guannan Ren(5) [PATCH 1/5] conf: fix mismatch on two domain VIR_ENUM_IMPL macro [PATCH 2/5] conf: add domain NIC model enum macro [PATCH 3/5] net: use virDomainNICModelType{From|To}String functions [PATCH 4/5] qemu: add NIC model checking for qemu hypervisor [PATCH 5/5] qemu: add usb-net support docs/formatdomain.html.in | 8 +++++++- src/conf/domain_conf.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------- src/conf/domain_conf.h | 45 ++++++++++++++++++++++++++++++++++++++++++++- src/libvirt_private.syms | 2 ++ src/libxl/libxl_conf.c | 5 +++-- src/parallels/parallels_driver.c | 2 +- src/qemu/qemu_command.c | 41 +++++++++++++++++++++++++++-------------- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 10 ++++++---- src/qemu/qemu_process.c | 14 +++++++------- src/vbox/vbox_tmpl.c | 57 +++++++++++++++++++++++++++------------------------------ src/vmx/vmx.c | 31 ++++++++++++++++--------------- src/xenxs/xen_sxpr.c | 23 ++++++++++++----------- src/xenxs/xen_xm.c | 21 +++++++++++---------- 14 files changed, 237 insertions(+), 125 deletions(-)

3 12

Re: [libvirt] Redefinition of struct in6_addr in <netinet/in.h> and <linux/in6.h>
by David Miller 17 Jan '13

17 Jan '13

From: Mike Frysinger <vapier(a)gentoo.org> Date: Wed, 16 Jan 2013 12:28:39 -0500 > if you're not calling the kernel directly, why are you including the kernel > headers ? what is the problem people are actually trying to address here (and > no, "i want to include both headers" is not the answer) ? When GLIBC doesn't provide it's own definition of some networking macros or interfaces that the kernel provides, people include the kernel header. This has been done for decades, wake up.

3 3

Re: [libvirt] Redefinition of struct in6_addr in <netinet/in.h> and <linux/in6.h>
by Cong Wang 17 Jan '13

17 Jan '13

On Wed, 2013-01-16 at 14:22 -0500, Mike Frysinger wrote: > > but this is still too vague. what headers/definitions do people want to see > simultaneously included ? changes would be needed on both sides (kernel & C > library). > Hi, Mike, Please take a look at my first email in this thread. The user application includes <linux/if_bridge.h> and <netinet/in.h>. <linux/if_bridge.h> uses struct_in6 but doesn't include <linux/in6.h> (this is my bad, sorry), an obvious fix is just including <linux/in6.h>. But this immediately breaks applications which include <linux/if_bridge.h> and <netinet/in.h>, just as what Thomas reported. And if_bridge.h is kernel-specific, there is no corresponding glibc one, so you can't blame applications which include both of them. Thanks.

1 0

[libvirt] [PATCH 0/5] libxl: Trivial fixes and style improvements
by Jim Fehlig 17 Jan '13

17 Jan '13

This patchset contains some trivial bug fixes and style improvements for the libxl driver that were noticed while investigating races between the driver and libxl. Jim Fehlig (5): libxl: Use consistent style for function definitions libxl: Use consistent parameter naming scheme libxl: Don't free domain death event libxl: Check for libxl_ctx_alloc failure libxl: Fix cleanup on domain start error src/libxl/libxl_driver.c | 106 ++++++++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 48 deletions(-) -- 1.8.0.1

2 13

[libvirt] iptables --physdev-out warnings
by Reinier Schoof 17 Jan '13

17 Jan '13

Hi, we've experienced some issues with starting lots of KVM based VM's with libvirt. Since I couldn't find any clues on the libvirt mailing list, I'm posting the way I fixed the issues. When starting a VM, /var/log/messages was spammed with the following message: xt_physdev: using --physdev-out in the OUTPUT, FORWARD and POSTROUTING chains for non-bridged traffic is not supported anymore. With each extra VM I start, the messages get amplified exponentially. This results in longer starting times every new VM, relative the the previously started VM. When I ran a test with starting 100 equal VM's, the first VM started in about 2 seconds, the 100th VM took 48 seconds to start. I'm running a vanilla 3.7.1 kernel, but I have the same issue on VM hosts with kernel 3.2.28 or 3.2.0, running libvirt 0.9.12 and 0.9.8 respectively. Looking into the warning, it seemed that iptables need an extra argument, --physdev-is-bridged, in commands like: iptables -A libvirt-out -m physdev --physdev-is-bridged --physdev-out vnet99 -g FP-vnet99 I patched the libvirt source (version 1.0.0) to test whether this works or not: --- src/nwfilter/nwfilter_ebiptables_driver.c.orig 2013-01-16 10:51:43.000000000 +0100 +++ src/nwfilter/nwfilter_ebiptables_driver.c 2013-01-16 10:52:07.000000000 +0100 @@ -166,7 +166,7 @@ snprintf(buf, sizeof(buf), "%c%c-%s", prefix[0], prefix[1], ifname) #define PHYSDEV_IN "--physdev-in" -#define PHYSDEV_OUT "--physdev-out" +#define PHYSDEV_OUT "--physdev-is-bridged --physdev-out" static const char *m_state_out_str = "-m state --state NEW,ESTABLISHED"; static const char *m_state_in_str = "-m state --state ESTABLISHED"; The warnings in /var/log/messages are gone and running the test again proved the 100th VM started in 3.8 seconds. It suprises me I'm the first to mention this problem on the libvirt mailing list and I wondering if I'm doing something wrong. Until then, this fix helps me a lot! Reinier Schoof -- TransIP BV | https://www.transip.nl/

2 1

[libvirt] [PATCH] Fix typo in variable name
by Guido Günther 17 Jan '13

17 Jan '13

Hi, I pushed that under the build breaker rule: that broke the build like: CC libvirt_conf_la-domain_conf.lo conf/domain_conf.c: In function 'virDomainVcpuPinAdd': conf/domain_conf.c:11920:29: error: 'vpcupin' undeclared (first use in this function) conf/domain_conf.c:11920:29: note: each undeclared identifier is reported only once for each function it appears in make[3]: *** [libvirt_conf_la-domain_conf.lo] Error 1 --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 88865b5..13c14e9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11917,7 +11917,7 @@ int virDomainVcpuPinAdd(virDomainVcpuPinDefPtr **vcpupin_list, no_memory: virReportOOMError(); - virDomainVcpuPinDefFree(vpcupin); + virDomainVcpuPinDefFree(vcpupin); return -1; } -- 1.7.10.4

1 0

Re: [libvirt] Redefinition of struct in6_addr in <netinet/in.h> and <linux/in6.h>
by David Miller 17 Jan '13

17 Jan '13

From: Mike Frysinger <vapier(a)gentoo.org> Date: Wed, 16 Jan 2013 14:22:16 -0500 > On Wednesday 16 January 2013 13:59:59 David Miller wrote: >> This has been done for decades, wake up. > > and it's been broken for just as long. no need to be a dick. By being ignorant and having such a simplistic view of the situation, you're the one who's actually the dick.

1 0

[libvirt] [PATCH 0/2] add qemu machine type q35 support
by liguang 17 Jan '13

17 Jan '13

qemu-1.3 added machine type q35, changelog said: Added Intel Q35 chipset as a new machine type, '--machine q35'. Adds PCIe support. Requires an updated SeaBIOS (bios.bin), and '-acpitable file=/seabios-path/q35-acpi-dsdt.aml' to run. so add q35 support for libvirt. src/conf/device_conf.c | 8 +++++++- src/conf/device_conf.h | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 11 +++++++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 8 +++- 7 files changed, 29 insertions(+), 2 deletions(-)

7 12

[libvirt] [PATCH] safe{read,write}: Don't lie on nonblocking FD
by Michal Privoznik 17 Jan '13

17 Jan '13

Currently, whenever somebody calls saferead() on nonblocking FD (safewrite() is totally interchangeable for purpose of this message) he might get wrong return value. For instance, in the first iteration some data is read. The number of bytes read is stored into local variable 'nread'. However, in next iterations we can get -1 from read() with errno == EAGAIN, in which case the -1 is returned despite fact some data has already been read. So the caller gets confused. Moreover, the comment just above the functions says, they act like regular read() with nicer handling of EINTR. Well, they don't now. --- src/util/virutil.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index b36e9d3..cd19971 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -105,6 +105,8 @@ saferead(int fd, void *buf, size_t count) size_t nread = 0; while (count > 0) { ssize_t r = read(fd, buf, count); + if (r < 0 && nread && errno == EAGAIN) + return nread; if (r < 0 && errno == EINTR) continue; if (r < 0) @@ -125,7 +127,8 @@ safewrite(int fd, const void *buf, size_t count) size_t nwritten = 0; while (count > 0) { ssize_t r = write(fd, buf, count); - + if (r < 0 && nwritten && errno == EAGAIN) + return nwritten; if (r < 0 && errno == EINTR) continue; if (r < 0) -- 1.8.0.2

2 4

[libvirt] [PATCH] conf: fix class_id bitmap leak in virNetworkObj
by Ján Tomko 17 Jan '13

17 Jan '13

Commit '07d1b6b' added class_id bitmap to virNetworkObj but never freed it. --- src/conf/network_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 48639a9..9c35ea8 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -235,6 +235,7 @@ void virNetworkObjFree(virNetworkObjPtr net) virNetworkDefFree(net->def); virNetworkDefFree(net->newDef); + virBitmapFree(net->class_id); virMutexDestroy(&net->lock); -- 1.7.8.6

3 5

Re: [libvirt] Redefinition of struct in6_addr in <netinet/in.h> and <linux/in6.h>
by Ben Hutchings 17 Jan '13

17 Jan '13

On Wed, 2013-01-16 at 12:04 -0500, Mike Frysinger wrote: > On Wednesday 16 January 2013 10:47:12 Ben Hutchings wrote: > > On Wed, 2013-01-16 at 23:21 +0900, YOSHIFUJI Hideaki wrote: > > > Cong Wang wrote: > > > > (Cc'ing some glibc developers...) > > > > > > > > Hello, > > > > > > > > In glibc source file inet/netinet/in.h and kernel source file > > > > include/uapi/linux/in6.h, both define struct in6_addr, and both are > > > > visible to user applications. Thomas reported a conflict below. > > > > > > > > So, how can we handle this? /me is wondering why we didn't see this > > > > before. > > > > [...] > > > > > This is not a new issue. In addition to this, > > > netinet/in.h also conflits with linux/in.h. > > > > > > We might have > > > > > > #if !defined(__GLIBC__) || !defined(_NETINET_IN_H) > > > > > > #endif > > > > > > around those conflicting definitions in uapi/linux/in{,6}.h. > > > > This only solves half the problem, as <netinet/in.h> might be included > > after <linux/in.h>. Also, not all Linux userland uses glibc. > > certainly true, but the current expectation is that you don't mix your ABIs. Whose expectation? Which ABIs are being mixed? > if you're programming with the C library API, then use the C library headers. > if you're banging directly on the kernel, then use the kernel headers. not > saying it's a perfect solution, but it works for the vast majority of use > cases. In practice most C programs for Linux will use a mixture of thinly wrapped system calls and higher-level APIs from the C library, and never really call the kernel directly (as that requires inline assembler). Userland programmers will work around this historical mess by tweaking the #include order or splitting source files. But they shouldn't have to. Ben. -- Ben Hutchings, Staff Engineer, Solarflare Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.

1 0

[libvirt] [PATCH] qemu: fix QEMU_CAPS_NO_ACPI detection
by Ján Tomko 17 Jan '13

17 Jan '13

In commit c4bbaaf8, caps->arch was checked uninitialized, rendering the whole check useless. This patch moves the conditional setting of QEMU_CAPS_NO_ACPI to qemuCapsInitQMP, and removes the no longer needed exception for S390. It also clears the flag for all non-x86 archs instead of just S390 in qemuCapsInitHelp. --- src/qemu/qemu_capabilities.c | 29 ++++++++--------------------- 1 files changed, 8 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 167cdb2..e0d0c2a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2175,13 +2175,11 @@ qemuCapsInitHelp(qemuCapsPtr caps, uid_t runUid, gid_t runGid) if (caps->arch == VIR_ARCH_X86_64 || caps->arch == VIR_ARCH_I686) { qemuCapsSet(caps, QEMU_CAPS_PCI_MULTIBUS); - } - - /* S390 and probably other archs do not support no-acpi - - maybe the qemu option parsing should be re-thought. */ - if (caps->arch == VIR_ARCH_S390 || - caps->arch == VIR_ARCH_S390X) + } else { + /* -no-acpi is not supported on other archs + * even if qemu reports it in -help */ qemuCapsClear(caps, QEMU_CAPS_NO_ACPI); + } /* qemuCapsExtractDeviceStr will only set additional caps if qemu * understands the 0.13.0+ notion of "-device driver,". */ @@ -2260,13 +2258,6 @@ qemuCapsInitQMPBasic(qemuCapsPtr caps) qemuCapsSet(caps, QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC); qemuCapsSet(caps, QEMU_CAPS_NO_SHUTDOWN); qemuCapsSet(caps, QEMU_CAPS_DRIVE_CACHE_UNSAFE); - - /* ACPI is only supported on x86, PPC or - * other platforms don't support it*/ - if (caps->arch == VIR_ARCH_I686 || - caps->arch == VIR_ARCH_X86_64) - qemuCapsSet(caps, QEMU_CAPS_NO_ACPI); - qemuCapsSet(caps, QEMU_CAPS_FSDEV_READONLY); qemuCapsSet(caps, QEMU_CAPS_VIRTIO_BLK_SG_IO); qemuCapsSet(caps, QEMU_CAPS_DRIVE_COPY_ON_READ); @@ -2402,16 +2393,12 @@ qemuCapsInitQMP(qemuCapsPtr caps, } VIR_FREE(archstr); - /* Currently only x86_64 and i686 support PCI-multibus. */ + /* Currently only x86_64 and i686 support PCI-multibus and -no-acpi. */ if (caps->arch == VIR_ARCH_X86_64 || - caps->arch == VIR_ARCH_I686) + caps->arch == VIR_ARCH_I686) { qemuCapsSet(caps, QEMU_CAPS_PCI_MULTIBUS); - - /* S390 and probably other archs do not support no-acpi - - maybe the qemu option parsing should be re-thought. */ - if (caps->arch == VIR_ARCH_S390 || - caps->arch == VIR_ARCH_S390X) - qemuCapsClear(caps, QEMU_CAPS_NO_ACPI); + qemuCapsSet(caps, QEMU_CAPS_NO_ACPI); + } if (qemuCapsProbeQMPCommands(caps, mon) < 0) goto cleanup; -- 1.7.8.6

4 11

[libvirt] [PATCH 00/14] Resolve some RESOURCE_LEAK errors found by Coverity
by John Ferlan 17 Jan '13

17 Jan '13

This patch addresses some "Error: RESOURCE_LEAK (CWE-404)" errors found by Coverity. There are 100+ remaining; however, many seem to be false positives which will be addressed in a separate patch. The esx_driver.c and hyperv_driver.c changes could be tagged as false positives; however, the changes made will avoid the Coverity error since the freeing of the resource marked isn't based soley on the result. The phyp_driver.c changes in openSSHSession() and its callers were the most involved since the code with now use connection_data->sock in order to track the socket so as to allow it to be closed once done with it. Of interest in this change is that phypExec() used connection_data->sock even though it had never been initialized. John Ferlan (14): phyp: Resolve some file descriptor leaks esx: Address resource leak found by Coverity storage: Resolve resource leak using 'vol' buffer util: Resolve resource leak for 'res' in virSetInherit error path. locking: Resolve resource leak with 'dir' on non error path rpc: Avoid resource leak of 'socks' if any object append fails uml: Avoid resource leak of event in umlInofityEvent test: Resource resource leak with 'tmp_vols' storage: Resource resource leak using 'tmp_vols' interface: Resolve resource leak wth 'tmp_iface_objs' xen: Resource resource leak with 'cpuset' parallels: Resolve some resource leaks storage: Need to also VIR_FREE(reg) hyperv: Address resource leak found by Coverityo src/esx/esx_driver.c | 8 ++++---- src/hyperv/hyperv_driver.c | 10 +++++----- src/interface/interface_backend_netcf.c | 1 + src/locking/lock_driver_sanlock.c | 1 + src/parallels/parallels_driver.c | 30 +++++++++++++++++++----------- src/phyp/phyp_driver.c | 19 ++++++++++++++----- src/rpc/virnetserverservice.c | 6 +++--- src/storage/storage_backend_logical.c | 1 + src/storage/storage_backend_rbd.c | 13 ++++++++++--- src/storage/storage_driver.c | 1 + src/test/test_driver.c | 1 + src/uml/uml_driver.c | 6 ++++-- src/util/virlockspace.c | 1 + src/xen/xend_internal.c | 12 ++++++------ 14 files changed, 71 insertions(+), 39 deletions(-) -- 1.7.11.7

6 47

[libvirt] [PATCH] Add RESUME event listener to qemu monitor.
by Andres Lagar-Cavilla 16 Jan '13

16 Jan '13

Perform all the appropriate plumbing. When qemu/KVM VMs are paused manually through a monitor not-owned by libvirt, libvirt will think of them as "paused" event after they are resumed and effectively running. With this patch the discrepancy goes away. This is meant to address bug 892791. Signed-off-by: Andres Lagar-Cavilla <andres(a)lagarcavilla.org> --- src/qemu/qemu_monitor.c | 10 ++++++++ src/qemu/qemu_monitor.h | 3 +++ src/qemu/qemu_monitor_json.c | 7 ++++++ src/qemu/qemu_process.c | 56 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 99642b6..cb5a3e2 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1022,6 +1022,16 @@ int qemuMonitorEmitStop(qemuMonitorPtr mon) } +int qemuMonitorEmitResume(qemuMonitorPtr mon) +{ + int ret = -1; + VIR_DEBUG("mon=%p", mon); + + QEMU_MONITOR_CALLBACK(mon, ret, domainResume, mon->vm); + return ret; +} + + int qemuMonitorEmitRTCChange(qemuMonitorPtr mon, long long offset) { int ret = -1; diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index d7faa90..00ce813 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -97,6 +97,8 @@ struct _qemuMonitorCallbacks { virDomainObjPtr vm); int (*domainStop)(qemuMonitorPtr mon, virDomainObjPtr vm); + int (*domainResume)(qemuMonitorPtr mon, + virDomainObjPtr vm); int (*domainRTCChange)(qemuMonitorPtr mon, virDomainObjPtr vm, long long offset); @@ -187,6 +189,7 @@ int qemuMonitorEmitShutdown(qemuMonitorPtr mon); int qemuMonitorEmitReset(qemuMonitorPtr mon); int qemuMonitorEmitPowerdown(qemuMonitorPtr mon); int qemuMonitorEmitStop(qemuMonitorPtr mon); +int qemuMonitorEmitResume(qemuMonitorPtr mon); int qemuMonitorEmitRTCChange(qemuMonitorPtr mon, long long offset); int qemuMonitorEmitWatchdog(qemuMonitorPtr mon, int action); int qemuMonitorEmitIOError(qemuMonitorPtr mon, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 2d2d254..de5f115 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -55,6 +55,7 @@ static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr da static void qemuMonitorJSONHandleReset(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandlePowerdown(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleStop(qemuMonitorPtr mon, virJSONValuePtr data); +static void qemuMonitorJSONHandleResume(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleRTCChange(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleWatchdog(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleIOError(qemuMonitorPtr mon, virJSONValuePtr data); @@ -87,6 +88,7 @@ static qemuEventHandler eventHandlers[] = { { "DEVICE_TRAY_MOVED", qemuMonitorJSONHandleTrayChange, }, { "POWERDOWN", qemuMonitorJSONHandlePowerdown, }, { "RESET", qemuMonitorJSONHandleReset, }, + { "RESUME", qemuMonitorJSONHandleResume, }, { "RTC_CHANGE", qemuMonitorJSONHandleRTCChange, }, { "SHUTDOWN", qemuMonitorJSONHandleShutdown, }, { "SPICE_CONNECTED", qemuMonitorJSONHandleSPICEConnect, }, @@ -589,6 +591,11 @@ static void qemuMonitorJSONHandleStop(qemuMonitorPtr mon, virJSONValuePtr data A qemuMonitorEmitStop(mon); } +static void qemuMonitorJSONHandleResume(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED) +{ + qemuMonitorEmitResume(mon); +} + static void qemuMonitorJSONHandleRTCChange(qemuMonitorPtr mon, virJSONValuePtr data) { long long offset = 0; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f5fc1b3..938c17e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -736,6 +736,61 @@ unlock: static int +qemuProcessHandleResume(qemuMonitorPtr mon ATTRIBUTE_UNUSED, + virDomainObjPtr vm) +{ + virQEMUDriverPtr driver = qemu_driver; + virDomainEventPtr event = NULL; + + virDomainObjLock(vm); + if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) { + qemuDomainObjPrivatePtr priv = vm->privateData; + + if (priv->gotShutdown) { + VIR_DEBUG("Ignoring RESUME event after SHUTDOWN"); + goto unlock; + } + + VIR_DEBUG("Transitioned guest %s out of paused into resumed state", + vm->def->name); + + virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, + VIR_DOMAIN_RUNNING_UNPAUSED); + event = virDomainEventNewFromObj(vm, + VIR_DOMAIN_EVENT_RESUMED, + VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); + + VIR_DEBUG("Using lock state '%s' on resume event", NULLSTR(priv->lockState)); + if (virDomainLockProcessResume(driver->lockManager, driver->uri, + vm, priv->lockState) < 0) { + /* Don't free priv->lockState on error, because we need + * to make sure we have state still present if the user + * tries to resume again + */ + goto unlock; + } + VIR_FREE(priv->lockState); + + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { + VIR_WARN("Unable to save status on vm %s after state change", + vm->def->name); + } + } + +unlock: + virDomainObjUnlock(vm); + + if (event) { + qemuDriverLock(driver); + qemuDomainEventQueue(driver, event); + qemuDriverUnlock(driver); + } + + return 0; +} + + +static int qemuProcessHandleRTCChange(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm, long long offset) @@ -1250,6 +1305,7 @@ static qemuMonitorCallbacks monitorCallbacks = { .diskSecretLookup = qemuProcessFindVolumeQcowPassphrase, .domainShutdown = qemuProcessHandleShutdown, .domainStop = qemuProcessHandleStop, + .domainResume = qemuProcessHandleResume, .domainReset = qemuProcessHandleReset, .domainRTCChange = qemuProcessHandleRTCChange, .domainWatchdog = qemuProcessHandleWatchdog, -- 1.7.9.5

6 9

[libvirt] [PATCH 00/13] More refactoring of QEMU driver objects & locking
by Daniel P. Berrange 16 Jan '13

16 Jan '13

This series does more general refactoring to help in the goal of killing the big QEMU driver lock. There are 3 key changes in this series - Isolating all QEMU configuration parameters in one struct. - Making virDomainObjList self-locking - Add dedicated locking to PCI/USB device lists There are all the really hard bits of the QEMU locking. As can be seen from the last patch there is still more work to be done before the QEMU driver lock can be said to be truely dead, but this is less critical.

1 14

[libvirt] Libvirt daemon not getting started
by Varun Bhatnagar 16 Jan '13

16 Jan '13

Hi, Earlier I was having libvirt-0.7.5 but now I have installed 0.9.8 version of libvirt now. I am trying to start libvirt daemon using the command below but daemon it is not getting started and the PID file is not getting created. Tried /usr/loval/sbin/libvirtd -d option too. In that case I am not getting any error but PID file is not getting created in this case too. /usr/local/sbin/libvirtd 2013-01-16 16:43:53.399+0000: 4070: info : libvirt version: 0.9.8 2013-01-16 16:43:53.399+0000: 4070: error : virCommandWait:2192 : internal error Child process (/usr/sbin/iptables --table mangle --delete POSTROUTING --out-interface virbr0 --protocol udp --destination-port 68 --jump CHECKSUM --checksum-fill) status unexpected: exit status 2 2013-01-16 16:43:53.406+0000: 4070: error : virCommandWait:2192 : internal error Child process (/usr/sbin/iptables --table mangle --insert POSTROUTING --out-interface virbr0 --protocol udp --destination-port 68 --jump CHECKSUM --checksum-fill) status unexpected: exit status 2 2013-01-16 16:43:53.406+0000: 4070: warning : networkAddGeneralIptablesRules:1259 : Could not add rule to fixup DHCP response checksums on network 'default'. 2013-01-16 16:43:53.406+0000: 4070: warning : networkAddGeneralIptablesRules:1260 : May need to update iptables package & kernel to support CHECKSUM rule. 2013-01-16 16:43:54.704+0000: 4070: error : umlStartup:471 : cannot initialize inotify 2013-01-16 16:43:54.704+0000: 4070: error : virStateInitialize:854 : Initialization of UML state driver failed 2013-01-16 16:43:54.704+0000: 4070: error : daemonRunStateInit:1157 : Driver state initialization failed and I am also trying to connect to VMPlayer with the following URL but it is giving the following error message: virsh # connect vmplayer:///session error: Failed to connect to the hypervisor error: Failed to connect socket to '/usr/local/var/run/libvirt/libvirt-sock': No such file or directory Is this because of the daemon, as it is not getting started or because of some other reason? Can anybody suggest any solution for this. I am stuck from past few days and not able to find solution. Any help will be appreciated. Thanks in advance. Regards, Varun =====-----=====-----===== Notice: The information contained in this e-mail message and/or attachments to it may contain confidential or privileged information. If you are not the intended recipient, any dissemination, use, review, distribution, printing or copying of the information contained in this e-mail message and/or attachments to it are strictly prohibited. If you have received this communication in error, please notify us by reply e-mail or telephone and immediately and permanently delete the message and any attachments. Thank you

1 0

[libvirt] [PATCH 0/7] Share the VNC port allocation tracking code
by Daniel P. Berrange 16 Jan '13

16 Jan '13

Both QEMU and libxl have the same code for tracking auto-allocated VNC ports. Move this code out into src/util/virportallocator.[c,h]. While doing this turn it into a virObjectLockable so that it becomes a ref-counted object with self-contained locking. This means it no longer needs to be protected by the QEMU/libxl global driver locks. As part of this series the virObject APIs are enhanced to allow arbitrarily deep inheritance (instead of fixed 1 level), and a new virObjectLockable base class is introduced which extends virObject to provide a mutex. This is a very common need so many existing classes are updated to use it.

2 19

[libvirt] [PATCH v2 0/4] Resolved CHECKED_RETURN errors found by Coverity
by John Ferlan 16 Jan '13

16 Jan '13

Rather then further muddy the waters of the previous patch series, this is a fresh patch series. I added one patch to this since the code was in the same general area as the virBufferTrim patch. Differences in v2 rpc: Updated the commit message to include why only putting out a VIR_WARN. The code did not change. The original patch: https://www.redhat.com/archives/libvir-list/2013-January/msg00103.html tools: Rework the patch to check the virBufferTrim() status return. Added virBufferError() status check after virBufferAddLit() to match the similar check after virBufferAddChar(). The original patch: https://www.redhat.com/archives/libvir-list/2013-January/msg00118.html xen: Resend of the v2 patch to keep in the same series: https://www.redhat.com/archives/libvir-list/2013-January/msg00473.html which was the replacement for: https://www.redhat.com/archives/libvir-list/2013-January/msg00114.html util: (new) The coverity error was NEGATIVE_RETURNS. The complaint being the potential to call memset() with a negative indent value. Since virBufferGetIndent() will check and fail on buf->error, I removed that check from virBufferAdd() and used the -1 return as the way to exit. John Ferlan (4): rpc: Check and message setsockopt() tools: Check return status on virBufferTrim() xen: Ignore return status for TCP_NODELAY util: Check for negative indent in virBufferAdd src/rpc/virnetsocket.c | 4 +++- src/util/virbuffer.c | 5 ++--- src/xen/xend_internal.c | 7 +++---- tools/virsh.c | 11 ++++++++--- 4 files changed, 16 insertions(+), 11 deletions(-) -- 1.7.11.7

2 8

[libvirt] [PATCH 0/6] add qemu usb-scsi controller support
by Guannan Ren 16 Jan '13

16 Jan '13

This patchset tries to add usb-scsi model for SCSI controller. http://lists.gnu.org/archive/html/qemu-devel/2012-06/msg03382.html "usb-uas is a pure UAS (usb attached scsi) emulation. The emulation works like any other scsi hba emulation (eps, lsi, virtio, megasas, ...). It provides just the HBA where you can attach scsi devices as you like using '-device'. A single scsi target with up to 256 luns is supported. For now only usb 2.0 transport is supported." libvirt XML snip <devices> <controller type='usb' index='2' model='ehci'> </controller> <controller type='scsi' index='0' model='usb-scsi'> <address type='usb' bus='2' port='1'/> </controller> </devices> qemu commandline: qemu ${other_vm_args} \ -device usb-ehci,id=usb2,bus=pci.0,addr=0x8 \ -device usb-uas,id=scsi0,bus=usb2.0,port=1 When a scsi disk is attached to usb-scsi controller, the target id must 0(usb-scsi only provide one scsi target). The unit value must in range of 0~255 for its lun number. As for the guest, the kernel with CONFIG_USB_UAS=y is necessary to have it show up scsi disk attached to UAS. Fedora has the kernel driver disabled by default though. (thanks to Gerd Hoffmann's suggestion) I grabbed linux-3.7.1 version from kernel website. It works after compiling. Guannan Ren(6) [PATCH 1/6] conf: declare usb spec and port number enum for usb [PATCH 2/6] conf: store usb spec and nports info when parsing usb [PATCH 3/6] qemu: add usb-uas caps flag [PATCH 4/6] qemu: add usb scsi controller support [PATCH 5/6] qemu: add usb-scsi controller checking when building [PATCH 6/6] test: add qemuxml2argv disk-scsi-uas testcase docs/formatdomain.html.in | 25 +++++- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 213 ++++++++++++++++++++++++++++++++++++++------ src/conf/domain_conf.h | 25 +++++- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 41 +++++++-- src/vmx/vmx.c | 3 +- tests/qemuhelptest.c | 6 +- tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-uas.args | 10 +++ tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-uas.xml | 34 +++++++ tests/qemuxml2argvtest.c | 3 + 12 files changed, 326 insertions(+), 38 deletions(-)

3 10

[libvirt] libvirt boolean type
by Claudio Bley 16 Jan '13

16 Jan '13

Hi. The following patch's intend is to get a discussion started first. Rationale: Many functions in libvirt return "1 for <TRUE>, 0 for <FALSE> and -1 on <ERROR>". When calling a function you need to read the documentation, skipping to the "Returns:" text in order to determine what return values to expect from the function and how to interpret them. This is cumbersome and takes an extra step which could be avoided. Advantages: + enum is binary compatible with int, so no ABI changes + without reading the documentation, you see what return values to expect at a glance + code generators in higher level languages could use it to generate proper wrappings to "boolean" automatically + compilers can probably warn when returning a value not part of the enum Claudio Bley (1): Implement a virBool type include/libvirt/libvirt.h.in | 25 +++++++++++++++++++++---- python/generator.py | 16 ++++++++++++++++ src/libvirt.c | 8 ++++---- 3 files changed, 41 insertions(+), 8 deletions(-) -- 1.7.9.5

3 5

[libvirt] [PATCH 0/4] Resolve some UNUSED_VALUE errors found by Coverity
by John Ferlan 16 Jan '13

16 Jan '13

This patch resolves "UNUSED_VALUE (CWE-563)" errors found by Coverity. John Ferlan (4): locking: Remove unnecessary setting of lockspace util: Remove the unused setting of 'res' for virHashLookup return virsh: Remove unused setting of 'br_node' and 'if_node' parallels: Remove unused JSON fetch of "OS" src/locking/lock_daemon_dispatch.c | 4 ++-- src/parallels/parallels_driver.c | 3 --- src/util/virlockspace.c | 6 ++---- tools/virsh-interface.c | 6 +++--- 4 files changed, 7 insertions(+), 12 deletions(-) -- 1.7.11.7

2 6