- Devel - libvirt List Archives

[libvirt] [qemu-devel] Default machine type setting for ppc64
by Li Zhang 22 May '13

22 May '13

Hi all, Sorry to bring this problem up again. We encounter this problem in openstack which always use default machine type. Currently, QEMU sets mac99 as default setting for ppc64 but it doesn't work on our platform at all. I tried to fix this in libvirt which it is not acceptable because libvirt only considers to get default setting from QEMU. Maybe I need to cc openstack mailing list, if it is one solution to add one option for machine types it supports. Any suggestion is appreciated. Thanks. :) --Li

7 21

[libvirt] [PATCH 0/3 v4] add 'sharePolicy' attribute for qemu vnc sharing policy
by Guannan Ren 22 May '13

22 May '13

v3->v4 add missing .args, .xml files (I raw it in git Untracked files this morning and thought about it for a while, then git-cleaned them...) rebase work. v2->v3 rebase work. v1->v2: changed attribute name from 'policy' to 'sharePolicy' renamed caps flag name: QEMU_CAPS_VNC_SHARE_POLICY fixed issues pointed out in v1 review have to keep hard-coded version probe after checking qemu -help and qmp command. As there were some vnc patches recently, I chose do rebase work a little later. These patches try to add a new attribute 'sharePolicy' to element graphics of vnc type. This attribute has three values: allow-exclusive,force-shared and ignore.

2 5

[libvirt] [PATCH] vbox: fix VIR_STRDUP value check
by Ján Tomko 22 May '13

22 May '13

In my review of 31532ca I missed the fact that VIR_STRDUP now returns 1 on success, and 0 if the source was NULL. (This still doesn't add proper OOM error handling.) --- src/vbox/vbox_tmpl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index eb8ac63..163aeff 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -2688,9 +2688,9 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) { if (hddType == HardDiskType_Immutable) def->disks[hddNum]->readonly = true; - if (VIR_STRDUP_QUIET(def->disks[hddNum]->src, hddlocation) == 0 && - VIR_STRDUP_QUIET(def->disks[hddNum]->dst, "hdd") == 0) - hddNum++; + ignore_value(VIR_STRDUP(def->disks[hddNum]->src, hddlocation)); + ignore_value(VIR_STRDUP(def->disks[hddNum]->dst, "hdd")); + hddNum++; VBOX_UTF8_FREE(hddlocation); VBOX_UTF16_FREE(hddlocationUtf16); @@ -7507,7 +7507,7 @@ static int vboxConnectListNetworks(virConnectPtr conn, char **const names, int n VBOX_UTF16_TO_UTF8(nameUtf16, &nameUtf8); VIR_DEBUG("nnames[%d]: %s", ret, nameUtf8); - if (VIR_STRDUP(names[ret], nameUtf8) == 0) + if (VIR_STRDUP(names[ret], nameUtf8) >= 0) ret++; VBOX_UTF8_FREE(nameUtf8); @@ -7585,7 +7585,7 @@ static int vboxConnectListDefinedNetworks(virConnectPtr conn, char **const names VBOX_UTF16_TO_UTF8(nameUtf16, &nameUtf8); VIR_DEBUG("nnames[%d]: %s", ret, nameUtf8); - if (VIR_STRDUP(names[ret], nameUtf8) == 0) + if (VIR_STRDUP(names[ret], nameUtf8) >= 0) ret++; VBOX_UTF8_FREE(nameUtf8); @@ -8087,7 +8087,7 @@ static char *vboxNetworkGetXMLDesc(virNetworkPtr network, networkInterface->vtbl->GetInterfaceType(networkInterface, &interfaceType); if (interfaceType == HostNetworkInterfaceType_HostOnly) { - if (VIR_STRDUP(def->name, network->name) == 0) { + if (VIR_STRDUP(def->name, network->name) >= 0) { PRUnichar *networkNameUtf16 = NULL; IDHCPServer *dhcpServer = NULL; vboxIID vboxnet0IID = VBOX_IID_INITIALIZER; -- 1.8.1.5

3 4

[libvirt] [PATCH 00/31] Forbid whitespace before ";"
by Osier Yang 22 May '13

22 May '13

Inspired by [1] from Daniel, when I tried to add the syntax-check rule, it detected the various places which use the whitespace before ";". So before adding the syntax-check rule, I cleaned up them first by a simple Bash script: \#!/bin/bash for dir in $dirs; do files=$(find $dir -type f -name "*.[ch]") for file in $files; do sed -r -i -e "/^ \s+;/!s/\s+;/;/g" $file done git add $files git commit -m "$1: Remove the whitespace before ';'" done So it's rather mechanically, except I need to change a few places of the generated patch. [1] https://www.redhat.com/archives/libvir-list/2013-May/msg01397.html Osier Yang (31): src/network: Remove the whitespace before ';' src/libxl: Remove the whitespace before ';' src/conf: Remove the whitespace before ';' src/test: Remove the whitespace before ';' src/vbox: Remove the whitespace before ';' src/xenxs: Remove the whitespace before ';' src/nwfilter: Remove the whitespace before ';' src/phyp: Remove the whitespace before ';' src/node_device: Remove the whitespace before ';' src/openvz: Remove the whitespace before ';' src/uml: Remove the whitespace before ';' src/parallels: Remove the whitespace before ';' src/interface: Remove the whitespace before ';' src/qemu: Remove the whitespace before ';' src/vmware: Remove the whitespace before ';' src/xen: Remove the whitespace before ';' src/security: Remove the whitespace before ';' src/storage: Remove the whitespace before ';' tools: Remove the whitespace before ";" daemon: Remove the whitespace before ";" tests/: Remove the whitespace before ";" src/utils: Remove the whitespace before ";" src/rpc: Remove the whitespace before ";" src/remote: Remove the whitespace before ";" src/lxc: Remove the whitespace before ";" examples: Remove the whitespace before ';' python: Remove the whitespace before ";" src/locking: Remove the whitespace before ";" src/*.[ch]: Remove the whitespace before ";" nwfitler: Change the comment style syntax-check: Add the rule to forbid whitespace before ";" build-aux/bracket-spacing.pl | 18 +++ daemon/libvirtd-config.c | 2 +- daemon/remote.c | 12 +- examples/domain-events/events-c/event-test.c | 2 +- examples/openauth/openauth.c | 4 +- python/libvirt-lxc-override.c | 4 +- python/libvirt-override.c | 16 +- src/conf/capabilities.c | 50 +++--- src/conf/cpu_conf.c | 14 +- src/conf/domain_audit.c | 10 +- src/conf/domain_conf.c | 230 +++++++++++++-------------- src/conf/domain_event.c | 32 ++-- src/conf/interface_conf.c | 8 +- src/conf/network_conf.c | 28 ++-- src/conf/node_device_conf.c | 12 +- src/conf/nwfilter_conf.c | 8 +- src/conf/storage_conf.c | 8 +- src/interface/interface_backend_udev.c | 2 +- src/libvirt-lxc.c | 2 +- src/libvirt.c | 10 +- src/libxl/libxl_conf.c | 4 +- src/libxl/libxl_driver.c | 2 +- src/locking/domain_lock.c | 4 +- src/locking/lock_daemon.c | 4 +- src/locking/lock_driver_lockd.c | 12 +- src/locking/lock_driver_sanlock.c | 6 +- src/locking/lock_manager.c | 2 +- src/lxc/lxc_cgroup.c | 4 +- src/lxc/lxc_container.c | 24 +-- src/lxc/lxc_controller.c | 28 ++-- src/lxc/lxc_driver.c | 4 +- src/lxc/lxc_hostdev.c | 4 +- src/lxc/lxc_process.c | 18 +-- src/network/bridge_driver.c | 22 +-- src/node_device/node_device_udev.c | 2 +- src/nodeinfo.c | 18 +-- src/nwfilter/nwfilter_dhcpsnoop.c | 10 +- src/nwfilter/nwfilter_driver.c | 6 +- src/openvz/openvz_driver.c | 6 +- src/parallels/parallels_network.c | 12 +- src/phyp/phyp_driver.c | 6 +- src/qemu/qemu_agent.c | 4 +- src/qemu/qemu_capabilities.c | 32 ++-- src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 170 ++++++++++---------- src/qemu/qemu_conf.c | 4 +- src/qemu/qemu_domain.c | 12 +- src/qemu/qemu_driver.c | 30 ++-- src/qemu/qemu_hostdev.c | 8 +- src/qemu/qemu_hotplug.c | 14 +- src/qemu/qemu_migration.c | 6 +- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor_json.c | 34 ++-- src/qemu/qemu_monitor_text.c | 2 +- src/qemu/qemu_process.c | 44 ++--- src/remote/remote_driver.c | 24 +-- src/rpc/virnetclient.c | 12 +- src/rpc/virnetclientprogram.c | 12 +- src/rpc/virnetmessage.c | 6 +- src/rpc/virnetserver.c | 26 +-- src/rpc/virnetserverclient.c | 4 +- src/rpc/virnetserverprogram.c | 2 +- src/rpc/virnetserverservice.c | 14 +- src/rpc/virnetsocket.c | 2 +- src/rpc/virnettlscontext.c | 2 +- src/security/security_dac.c | 8 +- src/security/security_driver.c | 2 +- src/security/security_selinux.c | 8 +- src/security/virt-aa-helper.c | 4 +- src/storage/storage_backend.c | 14 +- src/storage/storage_backend_disk.c | 2 +- src/storage/storage_backend_iscsi.c | 10 +- src/storage/storage_backend_logical.c | 6 +- src/storage/storage_driver.c | 26 +-- src/test/test_driver.c | 80 +++++----- src/uml/uml_conf.c | 12 +- src/uml/uml_driver.c | 14 +- src/util/virarch.c | 2 +- src/util/virauth.c | 2 +- src/util/vircgroup.c | 38 ++--- src/util/vircommand.c | 12 +- src/util/vireventpoll.c | 22 +-- src/util/virhash.c | 6 +- src/util/viridentity.c | 4 +- src/util/virjson.c | 16 +- src/util/virlockspace.c | 10 +- src/util/virportallocator.c | 2 +- src/util/virprocess.c | 14 +- src/util/virstoragefile.c | 4 +- src/util/virstring.c | 2 +- src/util/virthreadwin32.c | 4 +- src/util/viruri.c | 2 +- src/util/virutil.c | 2 +- src/vbox/vbox_tmpl.c | 2 +- src/vmware/vmware_conf.c | 2 +- src/vmware/vmware_driver.c | 2 +- src/xen/xen_driver.c | 6 +- src/xen/xen_driver.h | 2 +- src/xen/xen_hypervisor.c | 4 +- src/xen/xen_inotify.c | 4 +- src/xen/xm_internal.c | 4 +- src/xen/xs_internal.c | 12 +- src/xenxs/xen_sxpr.c | 20 +-- src/xenxs/xen_xm.c | 16 +- tests/commandhelper.c | 6 +- tests/eventtest.c | 18 +-- tests/fdstreamtest.c | 14 +- tests/libvirtdconftest.c | 2 +- tests/nodeinfotest.c | 2 +- tests/qemuhelptest.c | 2 +- tests/qemumonitortestutils.c | 2 +- tests/qemuxml2argvtest.c | 4 +- tests/securityselinuxlabeltest.c | 12 +- tests/ssh.c | 4 +- tests/testutils.c | 16 +- tests/vircgrouptest.c | 2 +- tests/virnetsockettest.c | 10 +- tests/viruritest.c | 2 +- tools/virsh-domain.c | 6 +- tools/virsh-nodedev.c | 6 +- tools/virsh-nwfilter.c | 2 +- tools/virsh-secret.c | 2 +- tools/virsh.c | 4 +- 123 files changed, 838 insertions(+), 820 deletions(-) -- 1.8.1.4

3 42

[libvirt] [PATCH 1/3] Fix the syntax-check failure
by Osier Yang 22 May '13

22 May '13

Introduced by commit 7ac2c4fe624, pushed under build-breaker rule. --- src/conf/interface_conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index ae93811..ed6986c 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -211,7 +211,7 @@ char *virInterfaceDefFormat(const virInterfaceDefPtr def); void virInterfaceObjLock(virInterfaceObjPtr obj); void virInterfaceObjUnlock(virInterfaceObjPtr obj); -#define VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE \ +# define VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE \ (VIR_CONNECT_LIST_INTERFACES_ACTIVE | \ VIR_CONNECT_LIST_INTERFACES_INACTIVE) -- 1.8.1.4

1 0

[libvirt] [PATCH v2] interface: list all interfaces with flags == 0
by Guannan Ren 22 May '13

22 May '13

virConnectListAllInterfaces should support to list all of interfaces when the value of flags is 0. The behaviour is consistent with other virConnectListAll* APIs --- src/conf/interface_conf.h | 4 ++++ src/interface/interface_backend_netcf.c | 29 +++++++++++++++-------------- src/interface/interface_backend_udev.c | 25 ++++++++++++------------- 3 files changed, 31 insertions(+), 27 deletions(-) diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index e636c35..ae93811 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -211,4 +211,8 @@ char *virInterfaceDefFormat(const virInterfaceDefPtr def); void virInterfaceObjLock(virInterfaceObjPtr obj); void virInterfaceObjUnlock(virInterfaceObjPtr obj); +#define VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE \ + (VIR_CONNECT_LIST_INTERFACES_ACTIVE | \ + VIR_CONNECT_LIST_INTERFACES_INACTIVE) + #endif /* __INTERFACE_CONF_H__ */ diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index cbba4fd..d626017 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -260,6 +260,7 @@ static int netcfConnectListDefinedInterfaces(virConnectPtr conn, char **const na } +#define MATCH(FLAG) (flags & (FLAG)) static int netcfConnectListAllInterfaces(virConnectPtr conn, virInterfacePtr **ifaces, @@ -276,8 +277,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn, int ret = -1; char **names = NULL; - virCheckFlags(VIR_CONNECT_LIST_INTERFACES_ACTIVE | - VIR_CONNECT_LIST_INTERFACES_INACTIVE, -1); + virCheckFlags(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE, -1); interfaceDriverLock(driver); @@ -293,7 +293,6 @@ netcfConnectListAllInterfaces(virConnectPtr conn, _("failed to get number of host interfaces: %s%s%s"), errmsg, details ? " - " : "", details ? details : ""); - ret = -1; goto cleanup; } @@ -304,7 +303,6 @@ netcfConnectListAllInterfaces(virConnectPtr conn, if (VIR_ALLOC_N(names, count) < 0) { virReportOOMError(); - ret = -1; goto cleanup; } @@ -361,16 +359,19 @@ netcfConnectListAllInterfaces(virConnectPtr conn, /* XXX: Filter the result, need to be splitted once new filter flags * except active|inactive are supported. */ - if (((status & NETCF_IFACE_ACTIVE) && - (flags & VIR_CONNECT_LIST_INTERFACES_ACTIVE)) || - ((status & NETCF_IFACE_INACTIVE) && - (flags & VIR_CONNECT_LIST_INTERFACES_INACTIVE))) { - if (ifaces) { - iface_obj = virGetInterface(conn, ncf_if_name(iface), - ncf_if_mac_string(iface)); - tmp_iface_objs[niface_objs] = iface_obj; - } - niface_objs++; + if (MATCH(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE) && + !((MATCH(VIR_CONNECT_LIST_INTERFACES_ACTIVE) && + (status & NETCF_IFACE_ACTIVE)) || + (MATCH(VIR_CONNECT_LIST_INTERFACES_INACTIVE) && + (status & NETCF_IFACE_INACTIVE)))) { + ncf_if_free(iface); + continue; + } + + if (ifaces) { + iface_obj = virGetInterface(conn, ncf_if_name(iface), + ncf_if_mac_string(iface)); + tmp_iface_objs[niface_objs++] = iface_obj; } ncf_if_free(iface); diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 1fd7d46..428adc8 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -282,6 +282,7 @@ udevConnectListDefinedInterfaces(virConnectPtr conn, VIR_UDEV_IFACE_INACTIVE); } +#define MATCH(FLAG) (flags & (FLAG)) static int udevConnectListAllInterfaces(virConnectPtr conn, virInterfacePtr **ifaces, @@ -299,8 +300,7 @@ udevConnectListAllInterfaces(virConnectPtr conn, int status = 0; int ret; - virCheckFlags(VIR_CONNECT_LIST_INTERFACES_ACTIVE | - VIR_CONNECT_LIST_INTERFACES_INACTIVE, -1); + virCheckFlags(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE, -1); /* Grab a udev reference */ udev = udev_ref(driverState->udev); @@ -354,7 +354,6 @@ udevConnectListAllInterfaces(virConnectPtr conn, const char *path; const char *name; const char *macaddr; - int add_to_list = 0; path = udev_list_entry_get_name(dev_entry); dev = udev_device_new_from_syspath(udev, path); @@ -363,18 +362,17 @@ udevConnectListAllInterfaces(virConnectPtr conn, status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up"); /* Filter the results */ - if (status && (flags & VIR_CONNECT_LIST_INTERFACES_ACTIVE)) - add_to_list = 1; - else if (!status && (flags & VIR_CONNECT_LIST_INTERFACES_INACTIVE)) - add_to_list = 1; + if (MATCH(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE) && + !((MATCH(VIR_CONNECT_LIST_INTERFACES_ACTIVE) && status) || + (MATCH(VIR_CONNECT_LIST_INTERFACES_INACTIVE) && !status))) { + udev_device_unref(dev); + continue; + } /* If we matched a filter, then add it */ - if (add_to_list) { - if (ifaces) { - iface_obj = virGetInterface(conn, name, macaddr); - ifaces_list[count] = iface_obj; - } - count++; + if (ifaces) { + iface_obj = virGetInterface(conn, name, macaddr); + ifaces_list[count++] = iface_obj; } udev_device_unref(dev); } @@ -387,6 +385,7 @@ udevConnectListAllInterfaces(virConnectPtr conn, if (ifaces) { ignore_value(VIR_REALLOC_N(ifaces_list, count + 1)); *ifaces = ifaces_list; + ifaces_list = NULL; } return count; -- 1.8.1.4

2 2

[libvirt] [PATCH] cgroup: be robust against cgroup movement races
by Eric Blake 21 May '13

21 May '13

https://bugzilla.redhat.com/show_bug.cgi?id=965169 documents a problem starting domains when cgroups are enabled; I was able to reliably reproduce the race about 5% of the time when I added hooks to domain startup by 3 seconds (as that seemed to be about the length of time that qemu created and then closed a temporary thread, probably related to aio handling of initially opening a disk image). There are some inherent TOCTTOU races when moving tasks between kernel cgroups, precisely because threads can be created or completed in the window between when we read a thread id from the source and when we write to the destination. As the goal of virCgroupMoveTask is merely to move ALL tasks into the new cgroup, it is sufficient to iterate until no more threads are being created in the old group, and ignoring any threads that die before we can move them. It would be nicer to start the threads in the right cgroup to begin with, but by default, all child threads are created in the same cgroup as their parent, and we don't want vcpu child threads in the emulator cgroup, so I don't see any good way of avoiding the move. It would also be nice if the kernel were to implement something like rename() as a way to atomically move a group of threads from one cgroup to another, instead of forcing a window where we have to read and parse the source, then format and write back into the destination. * src/util/vircgroup.c (virCgroupAddTaskStrController): Ignore ESRCH, because a thread ended between read and write attempts. (virCgroupMoveTask): Loop until all threads have moved. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/util/vircgroup.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 07ea2c3..6d44694 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1037,7 +1037,11 @@ static int virCgroupAddTaskStrController(virCgroupPtr group, goto cleanup; rc = virCgroupAddTaskController(group, p, controller); - if (rc != 0) + /* A thread that exits between when we first read the source + * tasks and now is not fatal. */ + if (rc == -ESRCH) + rc = 0; + else if (rc != 0) goto cleanup; next = strchr(cur, '\n'); @@ -1074,15 +1078,23 @@ int virCgroupMoveTask(virCgroupPtr src_group, virCgroupPtr dest_group) !dest_group->controllers[i].mountPoint) continue; - rc = virCgroupGetValueStr(src_group, i, "tasks", &content); - if (rc != 0) - return rc; + /* New threads are created in the same group as their parent; + * but if a thread is created after we first read we aren't + * aware that it needs to move. Therefore, we must iterate + * until content is empty. */ + while (1) { + rc = virCgroupGetValueStr(src_group, i, "tasks", &content); + if (rc != 0) + return rc; + if (!*content) + break; - rc = virCgroupAddTaskStrController(dest_group, content, i); - if (rc != 0) - goto cleanup; + rc = virCgroupAddTaskStrController(dest_group, content, i); + if (rc != 0) + goto cleanup; - VIR_FREE(content); + VIR_FREE(content); + } } cleanup: -- 1.8.1.4

2 2

[libvirt] This patch fixes up a previous patch to work in containers
by dwalsh＠redhat.com 21 May '13

21 May '13

It also adds the ability to pass in privileged field into Security Manager so that writing to /run/setrans only attempted on privileged machines [PATCH] libvirt writes an mcs translation file to /run/setrans

2 2

[libvirt] [PATCH] interface: list all interfaces with flags == 0
by Guannan Ren 21 May '13

21 May '13

virConnectListAllInterfaces should support to list all of interfaces when the value of flags is 0. The behaviour is consistent with other virConnectListAll* APIs --- src/conf/interface_conf.h | 4 ++++ src/interface/interface_backend_netcf.c | 27 +++++++++++++-------------- src/interface/interface_backend_udev.c | 23 ++++++++++------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index e636c35..ae93811 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -211,4 +211,8 @@ char *virInterfaceDefFormat(const virInterfaceDefPtr def); void virInterfaceObjLock(virInterfaceObjPtr obj); void virInterfaceObjUnlock(virInterfaceObjPtr obj); +#define VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE \ + (VIR_CONNECT_LIST_INTERFACES_ACTIVE | \ + VIR_CONNECT_LIST_INTERFACES_INACTIVE) + #endif /* __INTERFACE_CONF_H__ */ diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index cbba4fd..c6e069a 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -260,6 +260,7 @@ static int netcfConnectListDefinedInterfaces(virConnectPtr conn, char **const na } +#define MATCH(FLAG) (flags & (FLAG)) static int netcfConnectListAllInterfaces(virConnectPtr conn, virInterfacePtr **ifaces, @@ -276,8 +277,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn, int ret = -1; char **names = NULL; - virCheckFlags(VIR_CONNECT_LIST_INTERFACES_ACTIVE | - VIR_CONNECT_LIST_INTERFACES_INACTIVE, -1); + virCheckFlags(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE, -1); interfaceDriverLock(driver); @@ -293,7 +293,6 @@ netcfConnectListAllInterfaces(virConnectPtr conn, _("failed to get number of host interfaces: %s%s%s"), errmsg, details ? " - " : "", details ? details : ""); - ret = -1; goto cleanup; } @@ -304,7 +303,6 @@ netcfConnectListAllInterfaces(virConnectPtr conn, if (VIR_ALLOC_N(names, count) < 0) { virReportOOMError(); - ret = -1; goto cleanup; } @@ -361,16 +359,17 @@ netcfConnectListAllInterfaces(virConnectPtr conn, /* XXX: Filter the result, need to be splitted once new filter flags * except active|inactive are supported. */ - if (((status & NETCF_IFACE_ACTIVE) && - (flags & VIR_CONNECT_LIST_INTERFACES_ACTIVE)) || - ((status & NETCF_IFACE_INACTIVE) && - (flags & VIR_CONNECT_LIST_INTERFACES_INACTIVE))) { - if (ifaces) { - iface_obj = virGetInterface(conn, ncf_if_name(iface), - ncf_if_mac_string(iface)); - tmp_iface_objs[niface_objs] = iface_obj; - } - niface_objs++; + if (MATCH(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE) && + !((MATCH(VIR_CONNECT_LIST_INTERFACES_ACTIVE) && + (status & NETCF_IFACE_ACTIVE)) || + (MATCH(VIR_CONNECT_LIST_INTERFACES_INACTIVE) && + (status & NETCF_IFACE_INACTIVE)))) + continue; + + if (ifaces) { + iface_obj = virGetInterface(conn, ncf_if_name(iface), + ncf_if_mac_string(iface)); + tmp_iface_objs[niface_objs++] = iface_obj; } ncf_if_free(iface); diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 1fd7d46..242fc15 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -282,6 +282,7 @@ udevConnectListDefinedInterfaces(virConnectPtr conn, VIR_UDEV_IFACE_INACTIVE); } +#define MATCH(FLAG) (flags & (FLAG)) static int udevConnectListAllInterfaces(virConnectPtr conn, virInterfacePtr **ifaces, @@ -299,8 +300,7 @@ udevConnectListAllInterfaces(virConnectPtr conn, int status = 0; int ret; - virCheckFlags(VIR_CONNECT_LIST_INTERFACES_ACTIVE | - VIR_CONNECT_LIST_INTERFACES_INACTIVE, -1); + virCheckFlags(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE, -1); /* Grab a udev reference */ udev = udev_ref(driverState->udev); @@ -354,7 +354,6 @@ udevConnectListAllInterfaces(virConnectPtr conn, const char *path; const char *name; const char *macaddr; - int add_to_list = 0; path = udev_list_entry_get_name(dev_entry); dev = udev_device_new_from_syspath(udev, path); @@ -363,18 +362,15 @@ udevConnectListAllInterfaces(virConnectPtr conn, status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up"); /* Filter the results */ - if (status && (flags & VIR_CONNECT_LIST_INTERFACES_ACTIVE)) - add_to_list = 1; - else if (!status && (flags & VIR_CONNECT_LIST_INTERFACES_INACTIVE)) - add_to_list = 1; + if (MATCH(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE) && + !((MATCH(VIR_CONNECT_LIST_INTERFACES_ACTIVE) && status) || + (MATCH(VIR_CONNECT_LIST_INTERFACES_INACTIVE) && !status))) + continue; /* If we matched a filter, then add it */ - if (add_to_list) { - if (ifaces) { - iface_obj = virGetInterface(conn, name, macaddr); - ifaces_list[count] = iface_obj; - } - count++; + if (ifaces) { + iface_obj = virGetInterface(conn, name, macaddr); + ifaces_list[count++] = iface_obj; } udev_device_unref(dev); } @@ -387,6 +383,7 @@ udevConnectListAllInterfaces(virConnectPtr conn, if (ifaces) { ignore_value(VIR_REALLOC_N(ifaces_list, count + 1)); *ifaces = ifaces_list; + ifaces_list = NULL; } return count; -- 1.8.1.4

4 4

[libvirt] [PATCH] qemu: Don't remove the "return 0"
by Osier Yang 21 May '13

21 May '13

Commit f60a50c7957 intended to remove the warning only, but not with the "return 0" together. --- src/qemu/qemu_cgroup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index ff9a075..fb88802 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -471,6 +471,8 @@ qemuSetupMemoryCgroup(virDomainObjPtr vm) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Memory cgroup is not available on this host")); return -1; + } else { + return 0; } } -- 1.8.1.4

3 3