- Devel - libvirt List Archives

[libvirt] [PATCH python] Protect against user accidentally calling constructors directly
by Daniel P. Berrange 20 Jan '17

20 Jan '17

When using libvirt python you must never call the object constructors directly, as these are expecting to be passed a wrapped C object. For example import libvirt c = libvirt.virConnect("qemu:///system") c.listAllDomains() will mysteriously segfault. With this change the user now gets an slightly more helpful error Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/home/berrange/src/virt/libvirt-python/build/libvirt.py", line 3409, in __init__ raise Exception("Expected a wrapped C Object but got %s" % type(_obj)) Exception: Expected a wrapped C Object but got <type 'str'> Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- generator.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generator.py b/generator.py index e9be8b1..6bcf80b 100755 --- a/generator.py +++ b/generator.py @@ -1532,6 +1532,8 @@ def buildWrappers(module): elif classname in [ "virDomainSnapshot" ]: classes.write(" self._dom = dom\n") classes.write(" self._conn = dom.connect()\n") + classes.write(" if type(_obj).__name__ not in [\"PyCapsule\", \"PyCObject\"]:\n") + classes.write(" raise Exception(\"Expected a wrapped C Object but got %s\" % type(_obj))\n") classes.write(" self._o = _obj\n\n") destruct=None if classname in classes_destructors: -- 2.9.3

2 1

[libvirt] [PATCH] virDomainHostdevSubsysSCSIVHostDefParseXML: Don't leak @wwpn
by Michal Privoznik 20 Jan '17

20 Jan '17

==24748== 12 bytes in 2 blocks are definitely lost in loss record 25 of 84 ==24748== at 0x4C2BF80: malloc (vg_replace_malloc.c:296) ==24748== by 0x1A1E1E78: xmlStrndup (in /usr/lib64/libxml2.so.2.9.4) ==24748== by 0x18D0495F: virXMLPropString (virxml.c:506) ==24748== by 0x18D1FB3E: virDomainHostdevSubsysSCSIVHostDefParseXML (domain_conf.c:6280) ==24748== by 0x18D20350: virDomainHostdevDefParseXMLSubsys (domain_conf.c:6450) ==24748== by 0x18D34E7D: virDomainHostdevDefParseXML (domain_conf.c:13218) ==24748== by 0x18D42598: virDomainDefParseXML (domain_conf.c:17745) ==24748== by 0x18D440A9: virDomainDefParseNode (domain_conf.c:18236) ==24748== by 0x18D43EFA: virDomainDefParse (domain_conf.c:18180) ==24748== by 0x18D43FA0: virDomainDefParseFile (domain_conf.c:18206) ==24748== by 0x44EDA1: testCompareDomXML2XMLFiles (testutils.c:1140) ==24748== by 0x4365F8: testXML2XMLActive (qemuxml2xmltest.c:59) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 52aee2b02..55d2c25b2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6274,13 +6274,14 @@ static int virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr sourcenode, virDomainHostdevDefPtr def) { - char *protocol = NULL; + char *protocol = NULL, *wwpn = NULL; virDomainHostdevSubsysSCSIVHostPtr hostsrc = &def->source.subsys.u.scsi_host; + int ret = -1; if (!(protocol = virXMLPropString(sourcenode, "protocol"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing scsi_host subsystem protocol")); - return -1; + return ret; } if ((hostsrc->protocol = @@ -6293,17 +6294,19 @@ virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr sourcenode, switch ((virDomainHostdevSubsysSCSIHostProtocolType) hostsrc->protocol) { case VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_VHOST: - if (!(hostsrc->wwpn = virXMLPropString(sourcenode, "wwpn"))) { + if (!(wwpn = virXMLPropString(sourcenode, "wwpn"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing vhost-scsi hostdev source wwpn")); goto cleanup; } - if (!STRPREFIX(hostsrc->wwpn, "naa.") || - !virValidateWWN(hostsrc->wwpn + 4)) { + if (!STRPREFIX(wwpn, "naa.") || + !virValidateWWN(wwpn + 4)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("malformed 'wwpn' value")); goto cleanup; } + hostsrc->wwpn = wwpn; + wwpn = NULL; break; case VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_NONE: case VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_LAST: @@ -6314,12 +6317,11 @@ virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr sourcenode, break; } - return 0; - + ret = 0; cleanup: - VIR_FREE(hostsrc->wwpn); + VIR_FREE(wwpn); VIR_FREE(protocol); - return -1; + return ret; } -- 2.11.0

2 1

[libvirt] [PATCH v3] qemu: set default vhost-user ifname
by Michal Privoznik 20 Jan '17

20 Jan '17

Based on work of Mehdi Abaakouk <sileht(a)sileht.net>. When parsing vhost-user interface XML and no ifname is found we can try to fill it in in post parse callback. The way this works is we try to make up interface name from given socket path and then ask openvswitch wether it knows the interface. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v2: - All the review points from v2 worked in src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 21 +++++--- src/util/virnetdevopenvswitch.c | 58 ++++++++++++++++++++++ src/util/virnetdevopenvswitch.h | 4 ++ tests/Makefile.am | 7 +++ tests/qemuxml2argvmock.c | 8 +++ tests/qemuxml2xmlmock.c | 33 ++++++++++++ .../qemuxml2xmlout-net-vhostuser.xml | 2 + tests/qemuxml2xmltest.c | 2 +- 9 files changed, 129 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxml2xmlmock.c diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2d23e462d..9e4e8f83f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2057,6 +2057,7 @@ virNetDevMidonetUnbindPort; # util/virnetdevopenvswitch.h virNetDevOpenvswitchAddPort; virNetDevOpenvswitchGetMigrateData; +virNetDevOpenvswitchGetVhostuserIfname; virNetDevOpenvswitchInterfaceStats; virNetDevOpenvswitchRemovePort; virNetDevOpenvswitchSetMigrateData; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index acfa69589..eed5745b6 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -41,6 +41,7 @@ #include "domain_addr.h" #include "domain_event.h" #include "virtime.h" +#include "virnetdevopenvswitch.h" #include "virstoragefile.h" #include "virstring.h" #include "virthreadjob.h" @@ -3028,12 +3029,20 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, def->emulator); } - if (dev->type == VIR_DOMAIN_DEVICE_NET && - dev->data.net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && - !dev->data.net->model) { - if (VIR_STRDUP(dev->data.net->model, - qemuDomainDefaultNetModel(def, qemuCaps)) < 0) - goto cleanup; + if (dev->type == VIR_DOMAIN_DEVICE_NET) { + if (dev->data.net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && + !dev->data.net->model) { + if (VIR_STRDUP(dev->data.net->model, + qemuDomainDefaultNetModel(def, qemuCaps)) < 0) + goto cleanup; + } + if (dev->data.net->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER && + !dev->data.net->ifname) { + if (virNetDevOpenvswitchGetVhostuserIfname( + dev->data.net->data.vhostuser->data.nix.path, + &dev->data.net->ifname) < 0) + goto cleanup; + } } /* set default disk types and drivers */ diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index f003b3b13..d93653317 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -377,3 +377,61 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname, virCommandFree(cmd); return ret; } + +/** + * virNetDevOpenvswitchVhostuserGetIfname: + * @path: the path of the unix socket + * @ifname: the retrieved name of the interface + * + * Retreives the ovs ifname from vhostuser unix socket path. + * + * Returns: 1 if interface is an openvswitch interface, + * 0 if it is not, but no other error occurred, + * -1 otherwise. + */ +int +virNetDevOpenvswitchGetVhostuserIfname(const char *path, + char **ifname) +{ + virCommandPtr cmd = NULL; + char *tmpIfname = NULL; + char **tokens = NULL; + size_t ntokens = 0; + int status; + int ret = -1; + + /* Openvswitch vhostuser path are hardcoded to + * /<runstatedir>/openvswitch/<ifname> + * for example: /var/run/openvswitch/dpdkvhostuser0 + * + * so we pick the filename and check it's a openvswitch interface + */ + if ((tokens = virStringSplitCount(path, "/", 0, &ntokens))) { + if (VIR_STRDUP(tmpIfname, tokens[ntokens - 1]) < 0) + goto cleanup; + } + + if (!tmpIfname) { + ret = 0; + goto cleanup; + } + + cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "get", "Interface", + tmpIfname, "name", NULL); + if (virCommandRun(cmd, &status) < 0 || + status) { + /* it's not a openvswitch vhostuser interface. */ + ret = 0; + goto cleanup; + } + + *ifname = tmpIfname; + tmpIfname = NULL; + ret = 1; + + cleanup: + virStringListFreeCount(tokens, ntokens); + virCommandFree(cmd); + VIR_FREE(tmpIfname); + return ret; +} diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h index 0f9e1dfa6..8f5faf14e 100644 --- a/src/util/virnetdevopenvswitch.h +++ b/src/util/virnetdevopenvswitch.h @@ -52,4 +52,8 @@ int virNetDevOpenvswitchInterfaceStats(const char *ifname, virDomainInterfaceStatsPtr stats) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; +int virNetDevOpenvswitchGetVhostuserIfname(const char *path, + char **ifname) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + #endif /* __VIR_NETDEV_OPENVSWITCH_H__ */ diff --git a/tests/Makefile.am b/tests/Makefile.am index ecd04e895..c8584fea6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -414,6 +414,7 @@ if WITH_QEMU test_libraries += libqemumonitortestutils.la \ libqemutestdriver.la \ qemuxml2argvmock.la \ + qemuxml2xmlmock.la \ qemucaps2xmlmock.la \ qemucapsprobemock.la \ $(NULL) @@ -571,6 +572,12 @@ qemuxml2argvmock_la_CFLAGS = $(AM_CFLAGS) qemuxml2argvmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) qemuxml2argvmock_la_LIBADD = $(MOCKLIBS_LIBS) +qemuxml2xmlmock_la_SOURCES = \ + qemuxml2xmlmock.c +qemuxml2xmlmock_la_CFLAGS = $(AM_CFLAGS) +qemuxml2xmlmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) +qemuxml2xmlmock_la_LIBADD = $(MOCKLIBS_LIBS) + qemuxml2xmltest_SOURCES = \ qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index c501b59ac..177b24e0a 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -28,6 +28,7 @@ #include "virnetdev.h" #include "virnetdevip.h" #include "virnetdevtap.h" +#include "virnetdevopenvswitch.h" #include "virnuma.h" #include "virrandom.h" #include "virscsi.h" @@ -180,3 +181,10 @@ virCryptoGenerateRandom(size_t nbytes) return buf; } + +int +virNetDevOpenvswitchGetVhostuserIfname(const char *path ATTRIBUTE_UNUSED, + char **ifname) +{ + return VIR_STRDUP(*ifname, "vhost-user0"); +} diff --git a/tests/qemuxml2xmlmock.c b/tests/qemuxml2xmlmock.c new file mode 100644 index 000000000..0d3e6f2bd --- /dev/null +++ b/tests/qemuxml2xmlmock.c @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2016 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> + */ + +#include <config.h> + +#include "virnetdevopenvswitch.h" +#include "virstring.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +int +virNetDevOpenvswitchGetVhostuserIfname(const char *path ATTRIBUTE_UNUSED, + char **ifname) +{ + return VIR_STRDUP(*ifname, "vhost-user0"); +} diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml index ac1d7e110..2bdcac358 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml @@ -30,12 +30,14 @@ <interface type='vhostuser'> <mac address='52:54:00:ee:96:6b'/> <source type='unix' path='/tmp/vhost0.sock' mode='server'/> + <target dev='vhost-user0'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <interface type='vhostuser'> <mac address='52:54:00:ee:96:6c'/> <source type='unix' path='/tmp/vhost1.sock' mode='client'/> + <target dev='vhost-user0'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </interface> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index ddd17cb1e..30931f581 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1031,7 +1031,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIRT_TEST_MAIN(mymain) +VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/qemuxml2xmlmock.so") #else -- 2.11.0

3 3

[libvirt] [PATCH] qemu: hotplug: Properly emit "DEVICE_DELETED" event when unplugging memory
by Peter Krempa 20 Jan '17

20 Jan '17

The event needs to be emitted after the last monitor call, so that it's not possible to find the device in the XML accidentally while the vm object is unlocked. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1414393 --- src/qemu/qemu_hotplug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 5b0a3f515..a6de25407 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3691,9 +3691,6 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, VIR_DEBUG("Removing memory device %s from domain %p %s", mem->info.alias, vm, vm->def->name); - event = virDomainEventDeviceRemovedNewFromObj(vm, mem->info.alias); - qemuDomainEventQueue(driver, event); - if (virAsprintf(&backendAlias, "mem%s", mem->info.alias) < 0) return -1; @@ -3708,6 +3705,9 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, if (rc < 0) return -1; + event = virDomainEventDeviceRemovedNewFromObj(vm, mem->info.alias); + qemuDomainEventQueue(driver, event); + if ((idx = virDomainMemoryFindByDef(vm->def, mem)) >= 0) virDomainMemoryRemove(vm->def, idx); -- 2.11.0

2 1

[libvirt] [ libvirt-python BUG ?] Memory leak in libvirt_virConnectDomainEventJobCompletedCallback
by Hailiang Zhang 20 Jan '17

20 Jan '17

Hi all, It seems that, there is a memory leak bug in libvirt_virConnectDomainEventJobCompletedCallback() function of libvirt-override.c. We didn't decrease the reference of 'pyobj_dict' in this function or any other places while pyt0bj_ret is not zero. libvirt_virConnectDomainEventJobCompletedCallback() { ... ... pyobj_ret = PyObject_CallMethod(pyobj_conn, (char*)"_dispatchDomainEventJobCompletedCallback", (char*)"OOO", pyobj_dom, pyobj_dict, pyobj_cbData); Py_DECREF(pyobj_cbData); Py_DECREF(pyobj_dom); cleanup: if (!pyobj_ret) { DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); PyErr_Print(); Py_XDECREF(pyobj_dict); } else { Py_DECREF(pyobj_ret); ret = 0; } LIBVIRT_RELEASE_THREAD_STATE; return ret; } I don't think the reference of pyobj_dict will be stolen by PyObject_CallMethod when it is passed to the Python function _dispatchDomainEventJobCompletedCallback. In fact, we have a test which triggered lots of events and found that the memory of the test process will keep raising slowly and could not be reclaimed even we called gc.collect() explicitly in our codes. So, is it a bug ? Any comments ? Thanks, hailiang

2 1

[libvirt] [V4] RFC for support cache tune(CAT) in libvirt
by 乔立勇(Eli Qiao) 20 Jan '17

20 Jan '17

hi all Sorry for resend this again, I forget to add subject :( ... Thanks all for the comment for previous RFC version, I summary all input here also with Opens which I am not sure, can you please review again? #Propose Changes ## Expose cache information into capabilities Extend capabilities to expose all level cache resource information and should tell the topology of caches also tell which kinds of resources can be tuned/allocation There information comes from /sys/devices/system/cpu/cpu0/cache/index${level}/size also /sys/fs/resctrl/ (this is CAT sys interface in linux kernel) virsh capabilities <cache> <bank id='0, 'type="l3" size="56320" units="KiB" cpus="0,1,2,6,7,8"/> <--------------------- level 3 cache is per socket, so group them by socket id <control unit="KiB" min="2816"/> <bank id='1', type="l3" size="56320" units="KiB" cpus="3,4,5,9,10,11"/> <bank id='2' type="l2" size="256" units="KiB" cpus="0"/> <bank id='3' type="l2" size="256" units="KiB" cpus="1"/> <bank id='4' type="l2" size="256" units="KiB" cpus="2"/> <bank id='5' type="l2" size="256" units="KiB" cpus="3"/> <bank id='6' type="l2" size="256" units="KiB" cpus="4"/> ... <cache> Opens 1. how about add socket id to bank for bank type = l3 ? 2. do we really want to expose l2/l3 cache for now , they are per core resource and linux kernel don't support l2 yet (depend no hardware)? 3. if enable CDP in resctrl, for bank type=l3 , it will be split to l3data l3code, should expose this ability. <bank type="l3" size="56320" units="KiB" cpus="0,1,2,6,7,8"/> <--------------------- level 3 cache is per socket, so group them by socket id <control unit="KiB" min="2816" cdp="enabled"/> ## Provide a new API to get the avail cache on each bank, such as the output are: id=0 type=l3 avail=56320 total = ?? <--------- do we need this? id=1 type=l3 avail=56320 id=3 type=l2 avail=256 Opens: · Don't expose the avail cache information if the host can not do the allocation of that type cache(eg, for l2 currently) ? · We can not make all of the cache , the reservation amount is the min_cbm_len (=1) * min_unit . · do we need to expose total? ## enable CAT for a domain 1 Domain XML changes <cputune> <cache id="1" host_id="0" type="l3" size="5632" unit="KiB"/> <cache id="2" host_id="1" type="l3" size="5632" unit="KiB"/> <cpu_cache vcpus="0-3" id="1"/> <cpu_cache vcpus="4-7" id="2"/> <iothread_cache iothreads="0-1" id="1"/> <emulator_cache id="2"/> </cputune> 2. Extend cputune command ? Opens: 1. Do we accept to extend existed API ? or using new API/virsh? 2. How to calculate cache size -> CBM bit? eg: 5632/ 2816 = 2 bits 5733/ 2816 = 2 bits or 3 bits? ## Restriction for using cache tune on multiple sockets' host. The l3 cache is per socket resource, kernel need to know about what's affinity looks like, so for a VM which running on a multiple socket's host, it should have NUMA setting or vcpuset pin setting. Or cache tune will fail. [1] kernel support https://git.kernel.org/cgit/linux/kernel/git/tip/tip .git/tree/arch/x86/kernel/cpu/intel_rdt.c?h=x86/cache [2] libvirt PoC(not finished yet) https://github.com/taget/ libvirt/commits/cat_new -- Best regards - Eli 天涯无处不重逢 a leaf duckweed belongs to the sea , where not to meet in life

3 3

[libvirt] Mirror on Github failed to sync from libvirt.org
by Chen Hanxiao 20 Jan '17

20 Jan '17

Dear list, Mirror on Github: https://github.com/libvirt/libvirt did not sync from libvirt.org for almost a month. Regards, - Chen

2 1

[libvirt] [PATCH] Interface: return appropriate status for bridge device
by Lin Ma 20 Jan '17

20 Jan '17

In function udevInterfaceIsActive, The current design relies on the sys attribute 'operstate' to determine whether the interface is active. For the device node of virtual network(say virbr0), There is already a dummy tap device to maintain a fixed mac on it, So it's available and its status should be considered as active. But if no anyelse tap device connects to it, The value of operstate of virbr0 in sysfs is 'down', So udevInterfaceIsActive returns 0, It causes 'virsh iface-list --all' to report the status of virbr0 as 'inactive'. This patch fixes the issue by counting slave devices for bridge device. Signed-off-by: Lin Ma <lma(a)suse.com> --- src/interface/interface_backend_udev.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 5d0fc64..9ac4674 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -1127,6 +1127,11 @@ udevInterfaceIsActive(virInterfacePtr ifinfo) struct udev_device *dev; virInterfaceDefPtr def = NULL; int status = -1; + struct dirent **member_list = NULL; + const char *devtype; + int member_count = 0; + char *member_path; + size_t i; dev = udev_device_new_from_subsystem_sysname(udev, "net", ifinfo->name); @@ -1146,6 +1151,23 @@ udevInterfaceIsActive(virInterfacePtr ifinfo) /* Check if it's active or not */ status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up"); + if (!status) { + devtype = udev_device_get_devtype(dev); + if (STREQ_NULLABLE(devtype, "bridge")) { + if (virAsprintf(&member_path, "%s/%s", + udev_device_get_syspath(dev), "brif") < 0) + goto cleanup; + member_count = scandir(member_path, &member_list, + udevBridgeScanDirFilter, alphasort); + if (member_count > 0) + status = 1; + for (i = 0; i < member_count; i++) + VIR_FREE(member_list[i]); + VIR_FREE(member_list); + VIR_FREE(member_path); + } + } + udev_device_unref(dev); cleanup: -- 2.9.2

1 0

[libvirt] [PATCH] bhyve: fix interface type handling for argv2xml
by Roman Bogorodskiy 19 Jan '17

19 Jan '17

When generating a domain XML from native command (i.e. via the connectDomainXMLFromNative call), we should use interface type 'bridge' rather than 'ethernet' because we only support bridges at this point. As we don't have bridge name explicitly specified on the command line, just use 'virbr0' as a default. --- src/bhyve/bhyve_parse_command.c | 9 ++++++--- tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml | 6 ++++-- tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net4.xml | 3 ++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c index 619004298..5b8712388 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -507,9 +507,12 @@ bhyveParsePCINet(virDomainDefPtr def, if (VIR_ALLOC(net) < 0) goto cleanup; - /* Let's just assume it is VIR_DOMAIN_NET_TYPE_ETHERNET, it could also be - * a bridge, but this is the most generic option. */ - net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; + /* As we only support interface type='bridge' and cannot + * guess the actual bridge name from the command line, + * try to come up with some reasonable defaults */ + net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; + if (VIR_STRDUP(net->data.bridge.brname, "virbr0") < 0) + goto error; net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; net->info.addr.pci.slot = pcislot; diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml index 09cc79b92..5895c8c53 100644 --- a/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml @@ -12,13 +12,15 @@ <on_reboot>destroy</on_reboot> <on_crash>destroy</on_crash> <devices> - <interface type='ethernet'> + <interface type='bridge'> <mac address='52:54:00:00:00:00'/> + <source bridge='virbr0'/> <target dev='tap0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </interface> - <interface type='ethernet'> + <interface type='bridge'> <mac address='fe:ed:ad:ea:df:15'/> + <source bridge='virbr0'/> <target dev='tap1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </interface> diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net4.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net4.xml index e1bda46a1..5f1972080 100644 --- a/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net4.xml +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net4.xml @@ -12,8 +12,9 @@ <on_reboot>destroy</on_reboot> <on_crash>destroy</on_crash> <devices> - <interface type='ethernet'> + <interface type='bridge'> <mac address='00:00:00:00:00:00'/> + <source bridge='virbr0'/> <target dev='tap1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </interface> -- 2.11.0

2 2

[libvirt] The libvirt Release Notes Game, v3.0.0 edition
by Andrea Bolognani 19 Jan '17

19 Jan '17

Hello everyone, and welcome to the libvirt Release Notes Game, v3.0.0 edition! Here's the deal: libvirt v3.0.0 is right around the corner, and so it's about time we get the release notes into shape. Most of the work has thankfully already been done during the development cycle, by bundling release notes entries with the code that implements the actual changes; however, some changes have managed to fly under the radar so far. Not documenting them properly in the release notes would be a disservice to our users, and would undersell what is once again a terrific release - I'd venture as far as calling it the best one of 2017! I've gone through all the commits between v2.5.0 and now, and highlighted the changes that look like they should be part of the release notes. Look for your name in the list below, and spend a few minutes to craft a beautiful release notes entry for each of the highlighted changes, then send the patch to the list as usual. Feel free to CC: me for a guaranteed[1] swift review! Please note that, unlike you, I don't have intimate knowledge of each and every line of code you've ever contributed to libvirt, and as such might have misjudged the weight and scope of the commits listed below, but that's the whole point: the only person worthy of documenting a change in the release notes is the author of the change himself! That said, if you feel that any of the changes below should not end up in the release notes feel free to raise an objection :) Happy documenting! ^^ * Cédric Bosdonnat - a30b08b libxl: define a per-domain logger. - 340bb6b libxl: add QED disk format support * Collin L. Walling, Jason J. Herne - 79d7201 s390: Cpu driver support for update and compare ..d47db7b qemu: command: Support new cpu feature argument syntax * Daniel P. Berrange - c500701 Add domain event for metadata changes ..dc2bfdc Update remote_protocol-structs for new events - 44f79a0 lxc: ensure libvirt_lxc and qemu-nbd move into systemd machine slice * intrigeri - de79efd AppArmor policy: support merged-/usr. ..a73e703 AppArmor: allow QEMU to set_process_name. * John Ferlan - 2b13361 nodedev: Add the ability to create vHBA by parent wwnn/wwpn or fabric_wwn * Laine Stump - 9838cad conf: use struct instead of int for each slot in virDomainPCIAddressBus ..5949b53 conf: eliminate virDomainPCIAddressReleaseSlot() in favor of ...Addr() * Lin Ma - 2922cd9 cpu: Add support for more AVX512 Intel features ..c80e6b9 cpu: Add support for pku and ospke Intel features for Memory Protection Keys * Marc Hartmayer - c344d4b conf: simplify functions virDomainSCSIDriveAddressIsUsedBy*() ..36d9965 tests: add test cases for address conflicts * Maxim Nestratov - ef5c8bb qemu: Fix pit timer tick policy=delay ..245d9ba tests: Add "no-kvm-pit-device" testcase * Mehdi Abaakouk - 013df87 Gathering vhostuser interface stats with ovs * Michal Privoznik - f55afd8 qemu: Create hugepage path on per domain basis * Nikolay Shirokovskiy - 61a0026 qemu: Fix xml dump of autogenerated websocket * Pavel Glushchak - 5bafa1d vz: set PVMT_DONT_CREATE_DISK migration flag ..b1f916a vz: added VIR_MIGRATE_NON_SHARED_INC migration flag support * Peter Krempa - b469853 qemu: blockjob: Fix locking of block copy/active block commit - f61e406 qemu: snapshot: Properly handle image locking - a4ed5b4 qemu: Don't try to find compression program for "raw" memory images - 9e93055 qemu: block copy: Forbid block copy to relative paths * Pino Toscano - 408a1ce rpc: libssh: allow a NULL known_hosts file ..1a5de3f remote: do not check for an existing config dir [1] Or you money back! -- Andrea Bolognani / Red Hat / Virtualization

4 4

[libvirt] [PATCH for 3.0.x] Disable use of namespaces by default
by Daniel P. Berrange 19 Jan '17

19 Jan '17

When namespaces are enabled there is currently breakage when using disk hotplug and when using AppArmor Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- I'm suggesting this for 3.0.x branch - we'll leave them enabled in master on the basis that we'll actually fix the real bugs there. src/qemu/qemu_conf.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 6613d59..aa05b46 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -317,13 +317,6 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) if (!(cfg->namespaces = virBitmapNew(QEMU_DOMAIN_NS_LAST))) goto error; -#if defined(__linux__) - if (privileged && - virProcessNamespaceAvailable(VIR_PROCESS_NAMESPACE_MNT) == 0 && - virBitmapSetBit(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT) < 0) - goto error; -#endif /* defined(__linux__) */ - #ifdef DEFAULT_LOADER_NVRAM if (virFirmwareParseList(DEFAULT_LOADER_NVRAM, &cfg->firmwares, -- 2.9.3

3 3

[libvirt] [PATCH] storage: avoid use of undefined GLUSTER_CLI variable
by Daniel P. Berrange 19 Jan '17

19 Jan '17

Previous commit tried to change configure logic such that the GLUSTER_CLI parameter would always be set: commit 9e97c8c0f0f3921d06bac2b92cd094a41373f748 Author: Peter Krempa <pkrempa(a)redhat.com> Date: Mon Jan 9 15:56:12 2017 +0100 storage: gluster: Remove build-time dependency on the 'gluster' cli tool This missed the fact that the AC_PATH_PROG call was itself inside an 'if' conditional that would not be called in with_storage_gluster was false. As a result, GLUSTER_CLI was still conditionally defined. Just kill the GLUSTER_CLI parameter and AC_PATH_PROG call entirely and pass a bare "gluster" string to virFindFileInPath instead. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Technically this is a build-break fix for FreeBSD, but I want to get a review to double-check before pushing this. configure.ac | 9 --------- src/storage/storage_util.c | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index a217fc1..7efaddb 100644 --- a/configure.ac +++ b/configure.ac @@ -603,15 +603,6 @@ LIBVIRT_STORAGE_CHECK_SHEEPDOG LIBVIRT_STORAGE_CHECK_GLUSTER LIBVIRT_STORAGE_CHECK_ZFS -if test "$with_storage_fs" = "yes" || - test "$with_storage_gluster" = "yes"; then - AC_PATH_PROG([GLUSTER_CLI], [gluster], [gluster], [$LIBVIRT_SBIN_PATH]) - if test "x$GLUSTER_CLI" != "x"; then - AC_DEFINE_UNQUOTED([GLUSTER_CLI], ["$GLUSTER_CLI"], - [Location or name of the gluster command line tool]) - fi -fi - with_storage=no for backend in dir fs lvm iscsi scsi mpath rbd disk; do if eval test \$with_storage_$backend = yes; then diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 895c623..e16c1a4 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2437,7 +2437,7 @@ virStorageBackendFindGlusterPoolSources(const char *host, int ret = -1; - if (!(glusterpath = virFindFileInPath(GLUSTER_CLI))) { + if (!(glusterpath = virFindFileInPath("gluster"))) { if (report) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("'gluster' command line tool not found")); -- 2.9.3

2 1

[libvirt] [PATCH] Fix segfault in GetIOThreadInfo
by Leonid Podolny 19 Jan '17

19 Jan '17

The pointers calculation included a typo which caused segfaults. Signed-off-by: Leonid Podolny <leonid(a)podolny.net> --- domain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain.go b/domain.go index 515138a..74061c2 100644 --- a/domain.go +++ b/domain.go @@ -3887,7 +3887,7 @@ func (d *Domain) GetIOThreadInfo(flags DomainModificationImpact) ([]DomainIOThre info := make([]DomainIOThreadInfo, int(ret)) for i := 0; i < int(ret); i++ { - cinfo := (*(**C.virDomainIOThreadInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(cinfolist)) + (unsafe.Sizeof(*cinfolist) + uintptr(i))))) + cinfo := (*(**C.virDomainIOThreadInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(cinfolist)) + (unsafe.Sizeof(*cinfolist) * uintptr(i))))) ncpus := int(cinfo.cpumaplen * 8) cpumap := make([]bool, ncpus) -- 2.11.0

2 1

[libvirt] [PATCH go] Fix segfault in GetIOThreadInfo
by Leonid Podolny 19 Jan '17

19 Jan '17

2 1

[libvirt] [PATCH] qemu: Reset hostModelInfo in virQEMUCapsReset
by Jiri Denemark 19 Jan '17

19 Jan '17

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_capabilities.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 89e9dd471..1e1b53b22 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3752,6 +3752,9 @@ virQEMUCapsReset(virQEMUCapsPtr qemuCaps) VIR_FREE(qemuCaps->gicCapabilities); qemuCaps->ngicCapabilities = 0; + qemuMonitorCPUModelInfoFree(qemuCaps->hostCPUModelInfo); + qemuCaps->hostCPUModelInfo = NULL; + virCPUDefFree(qemuCaps->hostCPUModel); qemuCaps->hostCPUModel = NULL; } -- 2.11.0

3 2

[libvirt] [PATCH 0/6] storage: Cleanups of the storage backends
by Peter Krempa 19 Jan '17

19 Jan '17

I'm working on splitting of the storage backend codebase into loadable modules so that ceratin libraries (ceph, gluster) can be installed only when the functionality is required. This is a dump of cleanup patches, but they tend to get merge conflicts pretty often so I'm sending them prior to finishing the driver module stuff. Peter Krempa (6): storage: Remove common code from specific driver backend storage: Split utility functions from storage_backend.(ch) storage: fs: Compile file backends even if filesystem support is disabled storage: scsi: Fix build if SCSI backend is disabled but iSCSI is enabled storage: scsi: Remove private constants from header storage: sheepdog: Split out functions required for tests po/POTFILES.in | 1 + src/Makefile.am | 6 +- src/storage/storage_backend.c | 2807 +--------------------- src/storage/storage_backend.h | 124 - src/storage/storage_backend_disk.c | 153 +- src/storage/storage_backend_disk.h | 3 - src/storage/storage_backend_fs.c | 4 +- src/storage/storage_backend_gluster.c | 1 + src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_logical.c | 1 + src/storage/storage_backend_mpath.c | 1 + src/storage/storage_backend_rbd.c | 1 + src/storage/storage_backend_scsi.c | 452 +--- src/storage/storage_backend_scsi.h | 8 - src/storage/storage_backend_sheepdog.c | 2 + src/storage/storage_backend_sheepdog.h | 5 - src/storage/storage_backend_sheepdog_priv.h | 29 + src/storage/storage_backend_zfs.c | 1 + src/storage/storage_driver.c | 1 + src/storage/storage_util.c | 3364 +++++++++++++++++++++++++++ src/storage/storage_util.h | 151 ++ tests/storagebackendsheepdogtest.c | 2 +- tests/storagevolxml2argvtest.c | 2 +- 23 files changed, 3602 insertions(+), 3519 deletions(-) create mode 100644 src/storage/storage_backend_sheepdog_priv.h create mode 100644 src/storage/storage_util.c create mode 100644 src/storage/storage_util.h -- 2.11.0

2 18

[libvirt] [PATCH V2] tests: fix compilation of shunloadtest
by Jim Fehlig 18 Jan '17

18 Jan '17

While local builds succeed fine, a build worker building in a chroot environment is encountering the following error with libvirt 3.0.0 release candidates [ 162s] shunloadtest.o: In function `main': [ 162s] /home/abuild/rpmbuild/BUILD/libvirt-3.0.0/tests/shunloadtest.c:110: undefined reference to `dlopen' [ 162s] /home/abuild/rpmbuild/BUILD/libvirt-3.0.0/tests/shunloadtest.c:114: undefined reference to `dlsym' [ 162s] /home/abuild/rpmbuild/BUILD/libvirt-3.0.0/tests/shunloadtest.c:133: undefined reference to `dlclose' [ 162s] /home/abuild/rpmbuild/BUILD/libvirt-3.0.0/tests/shunloadtest.c:111: undefined reference to `dlerror' [ 162s] /home/abuild/rpmbuild/BUILD/libvirt-3.0.0/tests/shunloadtest.c:115: undefined reference to `dlerror' [ 162s] /home/abuild/rpmbuild/BUILD/libvirt-3.0.0/tests/shunloadtest.c:116: undefined reference to `dlclose' Fix by appending DLOPEN_LIBS to shunloadtest_LDADD. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V2: Use DLOPEN_LIBS instead of LDADDS tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index c7d4748..bcc2d1e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1348,7 +1348,7 @@ libshunload_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) shunloadtest_SOURCES = \ shunloadtest.c -shunloadtest_LDADD = $(LIB_PTHREAD) +shunloadtest_LDADD = $(LIB_PTHREAD) $(DLOPEN_LIBS) shunloadtest_DEPENDENCIES = libshunload.la sysinfotest_SOURCES = \ -- 2.9.2

2 2

[libvirt] [PATCH] nss: Remove RES_USE_INET6 usage
by Andrea Bolognani 18 Jan '17

18 Jan '17

The recent deprecation in glibc (commit b76e065991ec) means the module will fail to build entirely: nss/libvirt_nss.c: In function '_nss_libvirt_gethostbyname_r': nss/libvirt_nss.c:363:13: error: RES_USE_INET6 is deprecated [-Werror] int af = ((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This resolver option was removed shortly after being introduced, and application using it are already broken anyway. --- tools/nss/libvirt_nss.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c index b69e62c..9904026 100644 --- a/tools/nss/libvirt_nss.c +++ b/tools/nss/libvirt_nss.c @@ -360,9 +360,7 @@ NSS_NAME(gethostbyname)(const char *name, struct hostent *result, char *buffer, size_t buflen, int *errnop, int *herrnop) { - int af = ((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET); - - return NSS_NAME(gethostbyname3)(name, af, result, buffer, buflen, + return NSS_NAME(gethostbyname3)(name, AF_INET, result, buffer, buflen, errnop, herrnop, NULL, NULL); } -- 2.7.4

2 1

[libvirt] [PATCH] storage_backend_rbd: always call rados_conf_read_file when connect a rbd pool
by Chen Hanxiao 18 Jan '17

18 Jan '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> This patch fix a dead lock when try to read a rbd image When trying to connect a rbd server (ceph-0.94.7-1.el7.centos.x86_64), rbd_list/rbd_open enter a dead lock state. Backtrace: Thread 30 (Thread 0x7fdb342d0700 (LWP 12105)): #0 0x00007fdb40b16705 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00007fdb294273f1 in librados::IoCtxImpl::operate_read(object_t const&, ObjectOperation*, ceph::buffer::list*, int) () from /lib64/librados.so.2 #2 0x00007fdb29429fcc in librados::IoCtxImpl::read(object_t const&, ceph::buffer::list&, unsigned long, unsigned long) () from /lib64/librados.so.2 #3 0x00007fdb293e850c in librados::IoCtx::read(std::string const&, ceph::buffer::list&, unsigned long, unsigned long) () from /lib64/librados.so.2 #4 0x00007fdb2b9dd15e in librbd::list(librados::IoCtx&, std::vector<std::string, std::allocator<std::string> >&) () from /lib64/librbd.so.1 #5 0x00007fdb2b98c089 in rbd_list () from /lib64/librbd.so.1 #6 0x00007fdb2e1a8052 in virStorageBackendRBDRefreshPool (conn=<optimized out>, pool=0x7fdafc002d50) at storage/storage_backend_rbd.c:366 #7 0x00007fdb2e193833 in storagePoolCreate (obj=0x7fdb1c1fd5a0, flags=<optimized out>) at storage/storage_driver.c:876 #8 0x00007fdb43790ea1 in virStoragePoolCreate (pool=pool@entry=0x7fdb1c1fd5a0, flags=0) at libvirt-storage.c:695 #9 0x00007fdb443becdf in remoteDispatchStoragePoolCreate (server=0x7fdb45fb2ab0, msg=0x7fdb45fb3db0, args=0x7fdb1c0037d0, rerr=0x7fdb342cfc30, client=<optimized out>) at remote_dispatch.h:14383 #10 remoteDispatchStoragePoolCreateHelper (server=0x7fdb45fb2ab0, client=<optimized out>, msg=0x7fdb45fb3db0, rerr=0x7fdb342cfc30, args=0x7fdb1c0037d0, ret=0x7fdb1c1b3260) at remote_dispatch.h:14359 #11 0x00007fdb437d9c42 in virNetServerProgramDispatchCall (msg=0x7fdb45fb3db0, client=0x7fdb45fd1a80, server=0x7fdb45fb2ab0, prog=0x7fdb45fcd670) at rpc/virnetserverprogram.c:437 #12 virNetServerProgramDispatch (prog=0x7fdb45fcd670, server=server@entry=0x7fdb45fb2ab0, client=0x7fdb45fd1a80, msg=0x7fdb45fb3db0) at rpc/virnetserverprogram.c:307 #13 0x00007fdb437d4ebd in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x7fdb45fb2ab0) at rpc/virnetserver.c:135 #14 virNetServerHandleJob (jobOpaque=<optimized out>, opaque=0x7fdb45fb2ab0) at rpc/virnetserver.c:156 #15 0x00007fdb436cfb35 in virThreadPoolWorker (opaque=opaque@entry=0x7fdb45fa7650) at util/virthreadpool.c:145 #16 0x00007fdb436cf058 in virThreadHelper (data=<optimized out>) at util/virthread.c:206 #17 0x00007fdb40b12df5 in start_thread () from /lib64/libpthread.so.0 #18 0x00007fdb408401ad in clone () from /lib64/libc.so.6 366 len = rbd_list(ptr.ioctx, names, &max_size); (gdb) n [New Thread 0x7fdb20758700 (LWP 22458)] [New Thread 0x7fdb20556700 (LWP 22459)] [Thread 0x7fdb20758700 (LWP 22458) exited] [New Thread 0x7fdb20455700 (LWP 22460)] [Thread 0x7fdb20556700 (LWP 22459) exited] [New Thread 0x7fdb20556700 (LWP 22461)] infinite loop... Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/storage/storage_backend_rbd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index b1c51ab..233737b 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -95,6 +95,9 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, goto cleanup; } + /* try default location, but ignore failure */ + rados_conf_read_file(ptr->cluster, NULL); + if (!conn) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("'ceph' authentication not supported " @@ -124,6 +127,10 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, _("failed to create the RADOS cluster")); goto cleanup; } + + /* try default location, but ignore failure */ + rados_conf_read_file(ptr->cluster, NULL); + if (virStorageBackendRBDRADOSConfSet(ptr->cluster, "auth_supported", "none") < 0) goto cleanup; -- 2.7.4

2 3

[libvirt] [PATCH] qemu_domain: add timestamp in tainting of guests log
by Chen Hanxiao 18 Jan '17

18 Jan '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We lacked of timestamp in tainting of guests log, which bring troubles for finding guest issues: such as whether a guest powerdown caused by qemu-monitor-command or others issues inside guests. If we had timestamp in tainting of guests log, it would be helpful when checking guest's logs(eg. /var/log/messages). Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/qemu/qemu_domain.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 35baffb..21c90a9 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4001,6 +4001,7 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver, bool closeLog = false; if (virDomainObjTaint(obj, taint)) { + char *timestamp = NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(obj->def->uuid, uuidstr); @@ -4018,27 +4019,31 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver, logCtxt = qemuDomainLogContextNew(driver, obj, QEMU_DOMAIN_LOG_CONTEXT_MODE_ATTACH); if (!logCtxt) { - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } VIR_WARN("Unable to open domainlog"); - return; + goto cleanup; } closeLog = true; } + if ((timestamp = virTimeStringNow()) == NULL) + goto cleanup; + if (qemuDomainLogContextWrite(logCtxt, - "Domain id=%d is tainted: %s\n", + "%s: Domain id=%d is tainted: %s\n", + timestamp, obj->def->id, virDomainTaintTypeToString(taint)) < 0) virResetLastError(); + + cleanup: if (closeLog) qemuDomainLogContextFree(logCtxt); if (orig_err) { virSetError(orig_err); virFreeError(orig_err); } + + VIR_FREE(timestamp); } } -- 2.7.4

2 1

[libvirt] [PATCH v2 0/3] virsh: pool-list: introduce option --name and --uuid
by Chen Hanxiao 18 Jan '17

18 Jan '17

virsh # pool-list --name default root virsh # pool-list --uuid 76bd3b4d-2d23-4741-b6de-7377fa4320a1 f97964af-a3df-44ff-8664-886729035c09 virsh # pool-list --uuid --name 76bd3b4d-2d23-4741-b6de-7377fa4320a1 default f97964af-a3df-44ff-8664-886729035c09 root v2: do something like 'virsh list` Chen Hanxiao (3): virsh: pool-list: introduce --uuid for printing pool's UUID only virsh: pool-list: introduce --name for printing pool's name only virsh: pool-list: allow both --uuid and --name in one cmd tools/virsh-pool.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- tools/virsh.pod | 9 +++++++-- 2 files changed, 53 insertions(+), 4 deletions(-) -- 2.5.5

2 4

[libvirt] [PATCH] util: disallow resetting a pci-bridge device
by Shivaprasad G Bhat 18 Jan '17

18 Jan '17

It is distructive to attempt a reset on pci-bridge, the host can crash. The bridges won't contain any guest data and neither they can be passed through using vfio/stub. So, no point in allowing a reset for them. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/util/virpci.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/util/virpci.c b/src/util/virpci.c index 0601f49..860f7aa 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -933,6 +933,16 @@ virPCIDeviceReset(virPCIDevicePtr dev, char *drvName = NULL; int ret = -1; int fd = -1; + int hdrType = -1; + + if (virPCIGetHeaderType(dev, &hdrType) < 0) + return -1; + + if (hdrType == VIR_PCI_HEADER_PCI_BRIDGE) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Resetting a pci-bridge device is not allowed")); + return -1; + } if (activeDevs && virPCIDeviceListFind(activeDevs, dev)) { virReportError(VIR_ERR_INTERNAL_ERROR,

3 2

[libvirt] [PATCH] Fix the incorrect memory freeing which will result in crash
by Wu Zongyong 18 Jan '17

18 Jan '17

The number of elements in new_params is equal to the length of info, instead of nparams, so it's wrong to free new_params using nparams. Signed-off-by: Wu Zongyong <wuzongyo(a)mail.ustc.edu.cn> --- libvirt-override.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index db14244..dac4250 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -632,7 +632,7 @@ libvirt_virDomainSetSchedulerParametersFlags(PyObject *self ATTRIBUTE_UNUSED, int nparams = 0; Py_ssize_t size = 0; unsigned int flags; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OOI:virDomainSetScedulerParametersFlags", @@ -694,7 +694,7 @@ libvirt_virDomainSetSchedulerParametersFlags(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } @@ -7682,7 +7682,7 @@ libvirt_virNodeSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, int nparams = 0; Py_ssize_t size = 0; unsigned int flags; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OOI:virNodeSetMemoryParameters", @@ -7741,7 +7741,7 @@ libvirt_virNodeSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } -- 2.10.0.windows.1

2 1

[libvirt] Entering freeze for libvirt-3.0.0
by Daniel Veillard 18 Jan '17

18 Jan '17

As planned, I tagged the RC1 in git and pushed signed tarball and rpms to the usual location: ftp://libvirt.org/libvirt/ This seems to work fine in my limited testing but as usual we need community feedback on it and especially testing on different systems and architectures, so please give it a try ! If everything works fine then I will push rc2 on Friday and hopefully 3.0.0 final on Monday, so please give it a try to make sure that 0.0 release is nonetheless a good one :-) 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/

7 16

[libvirt] TSC frequency configuration & invtsc migration (was Re: [PATCH 4/4] kvm: Allow migration with invtsc)
by Eduardo Habkost 18 Jan '17

18 Jan '17

On Wed, Jan 04, 2017 at 11:39:16AM -0200, Eduardo Habkost wrote: > On Wed, Jan 04, 2017 at 09:56:56AM -0200, Marcelo Tosatti wrote: > > On Tue, Dec 27, 2016 at 05:21:20PM -0200, Eduardo Habkost wrote: > > > Instead of blocking migration on the source when invtsc is > > > enabled, rely on the migration destination to ensure there's no > > > TSC frequency mismatch. > > > > > > We can't allow migration unconditionally because we don't know if > > > the destination is a QEMU version that is really going to ensure > > > there's no TSC frequency mismatch. To ensure we are migrating to > > > a destination that won't ignore SET_TSC_KHZ errors, allow invtsc > > > migration only on pc-*-2.9 and newer. > > > > > > Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> [...] > > > @@ -2655,12 +2656,14 @@ int kvm_arch_put_registers(CPUState *cpu, int level) > > > } > > > > > > if (level == KVM_PUT_FULL_STATE) { > > > - /* We don't check for kvm_arch_set_tsc_khz() errors here, > > > - * because TSC frequency mismatch shouldn't abort migration, > > > - * unless the user explicitly asked for a more strict TSC > > > - * setting (e.g. using an explicit "tsc-freq" option). > > > + /* Migration TSC frequency mismatch is fatal only if we are > > > + * actually reporting Invariant TSC to the guest. > > > */ > > > - kvm_arch_set_tsc_khz(cpu); > > > + ret = kvm_arch_set_tsc_khz(cpu); > > > + if ((x86_cpu->env.features[FEAT_8000_0007_EDX] & CPUID_APM_INVTSC) && > > > + ret < 0) { > > > + return ret; > > > + } > > > } > > > > Will the guest continue in the source in this case? > > > > I think this is past the point where migration has been declared > > successful. > > > > Otherwise looks good. > > Good point. I will make additional tests and see if there's some > other place where the kvm_arch_set_tsc_khz() call can be moved > to. So, if we solve this and do something on (for example) post_load, we still have a problem: device state is migrated after RAM. This means QEMU will check for TSC scaling and abort migration very late. We could solve that by manually registering a SaveVMHandler that will send the TSC frequency on save_live_setup, so migration is aborted earlier. But: this sounds like just a complex hack to work around the real problems: 1) TSC frequency is guest-visible, and anything that affects guest ABI should depend on the VM configuration, not on host capabilities; 2) Setting TSC frequency depending on the host will make migratability unpredictable for management software: the same VM config could be migratable to host A when started on host B, but not migratable to host A when started on host C. I suggest we allow migration with invtsc if and only if tsc-frequency is set explicitly by management software. In other words, apply only patches 1/4 and 2/4 from this series. After that, we will need libvirt support for configuring tsc-frequency. -- Eduardo

5 21