- Devel - libvirt List Archives

[libvirt] [PATCH] udev: Fix build on older platforms
by Erik Skultety 31 May '17

31 May '17

Caused by commit @d1eea6c1 due to the missing symbol on older platforms. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Despite falling under build-breaker category, I'd like to get a proper review, since I'm not really familiar with autoconf and there might be a better fix. Erik configure.ac | 2 +- src/node_device/node_device_udev.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 246f4e077..b78c8b790 100644 --- a/configure.ac +++ b/configure.ac @@ -322,7 +322,7 @@ AC_CHECK_FUNCS_ONCE([cfmakeraw fallocate geteuid getgid getgrnam_r \ getmntent_r getpwuid_r getrlimit getuid if_indextoname kill mmap \ newlocale posix_fallocate posix_memalign prlimit regexec \ sched_getaffinity setgroups setns setrlimit symlink sysctlbyname \ - getifaddrs sched_setscheduler unshare]) + getifaddrs sched_setscheduler unshare udev_monitor_set_receive_buffer_size]) dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([pwd.h regex.h sys/un.h \ diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index a69dc1175..01438ea17 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1764,12 +1764,14 @@ static int nodeStateInitialize(bool privileged, udev_monitor_enable_receiving(priv->udev_monitor); +#if HAVE_UDEV_MONITOR_SET_RECEIVE_BUFFER_SIZE /* mimic udevd's behaviour and override the systems rmem_max limit in case * there's a significant number of device 'add' events */ if (geteuid() == 0) udev_monitor_set_receive_buffer_size(priv->udev_monitor, 128 * 1024 * 1024); +#endif /* We register the monitor with the event callback so we are * notified by udev of device changes before we enumerate existing -- 2.13.0

3 3

[libvirt] [GSoC] Project of libvirt/qemu fuzzing
by Dan 30 May '17

30 May '17

Dear all, The project of qemu command line fuzzing has been accepted as a GSoC project [1] [2]. As a student participating Google Summer of Code activity, I am extremely exitited to get started today on May 30th, 2017. During the past months, I have received tremendous guidance from my mentors as well as many other contributors on the mailinglist. I look forward to contributing to the community and learning a lot over the summer. Any advice, comment, feedback, suggestion to my emails/commit, would always be highly appreciated and more than welcome. Thank you all for your time, Daniel Liu [1]. https://summerofcode.withgoogle.com/projects/#5088017038442496 [2]. https://wiki.libvirt.org/page/Google_Summer_of_Code_Ideas#QEMU_command_line…

2 2

[libvirt] [PATCH] maint: add sanitizers to the build process
by claudioandre.br＠gmail.com 30 May '17

30 May '17

From: Claudio André <claudioandre.br(a)gmail.com> Sanitizers are based on compile-time instrumentation. They are available in gcc and clang for a range of supported operation systems and platforms. More info at: https://github.com/google/sanitizers The address sanitizer finds bugs related to addressing memory: use after free, heap buffer overflow, stack buffer overflow, memory leaks, ... The undefined behavior sanitizer detects situations not prescribed by the language specification: bound violations, data overflows, ... The llvm.org states that Sanitizers have found thousands of bugs everywhere. Sanitizers running during CI can prevent bugs from taking up residence. A helper tool to keep bugs out. --- - I mean CI (in general) not only Travis; - The functionality is not tied to CI; it is useful for local testing; - A way to think about this (including the ongoing GSOC): - Phase 1: test with Sanitizers to achieve basic code sanity; - Phase 2: use fuzzing for stronger security & reliability; - MISSING: should I add the flag to which Makefile.am? Or, what do you guys think about this? configure.ac | 2 ++ m4/virt-compile-sanitizer.m4 | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 m4/virt-compile-sanitizer.m4 diff --git a/configure.ac b/configure.ac index 246f4e0..4334614 100644 --- a/configure.ac +++ b/configure.ac @@ -237,6 +237,7 @@ LIBVIRT_COMPILE_WARNINGS LIBVIRT_COMPILE_PIE LIBVIRT_LINKER_RELRO LIBVIRT_LINKER_NO_INDIRECT +LIBVIRT_COMPILE_SANITIZER LIBVIRT_ARG_APPARMOR LIBVIRT_ARG_ATTR @@ -1011,6 +1012,7 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_DEBUG +LIBVIRT_RESULT_SANITIZER AC_MSG_NOTICE([ Use -Werror: $enable_werror]) AC_MSG_NOTICE([ Warning Flags: $WARN_CFLAGS]) LIBVIRT_RESULT_DTRACE diff --git a/m4/virt-compile-sanitizer.m4 b/m4/virt-compile-sanitizer.m4 new file mode 100644 index 0000000..a7cac31 --- /dev/null +++ b/m4/virt-compile-sanitizer.m4 @@ -0,0 +1,51 @@ +dnl +dnl Check for support for Sanitizers +dnl Check for -fsanitize=address and -fsanitize=undefined support +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library. If not, see +dnl <http://www.gnu.org/licenses/>. +dnl + +AC_DEFUN([LIBVIRT_COMPILE_SANITIZER],[ + LIBVIRT_ARG_ENABLE([ASAN], [Build with address sanitizer support], [no]) + LIBVIRT_ARG_ENABLE([UBSAN], [Build with undefined behavior sanitizer support], [no]) + + SAN_CFLAGS= + SAN_LDFLAGS= + + AS_IF([test "x$enable_asan" = "xyes"], [ + gl_COMPILER_OPTION_IF([-fsanitize=address -fno-omit-frame-pointer], [ + SAN_CFLAGS="-fsanitize=address -fno-omit-frame-pointer" + SAN_LDFLAGS="-fsanitize=address" + ]) + + AC_SUBST([SAN_CFLAGS]) + AC_SUBST([SAN_LDFLAGS]) + ]) + + AS_IF([test "x$enable_ubsan" = "xyes"], [ + gl_COMPILER_OPTION_IF([-fsanitize=undefined -fno-omit-frame-pointer], [ + SAN_CFLAGS="$SAN_CFLAGS -fsanitize=undefined -fno-omit-frame-pointer" + SAN_LDFLAGS="$SAN_LDFLAGS -fsanitize=undefined" + ]) + + AC_SUBST([SAN_CFLAGS]) + AC_SUBST([SAN_LDFLAGS]) + ]) +]) + +AC_DEFUN([LIBVIRT_RESULT_SANITIZER], [ + AC_MSG_NOTICE([ ASan: $enable_asan]) + AC_MSG_NOTICE([ UBSan: $enable_ubsan]) +]) -- 2.11.0

3 2

[libvirt] [PATCH 0/9] virObject adjustments for common object
by John Ferlan 30 May '17

30 May '17

Originally posted in part as an RFC: https://www.redhat.com/archives/libvir-list/2017-April/msg00321.html Obviously not a 3.4.0 discussion, but I'm trying to get ahead of the curve for 3.5.0 and posting this now as I'm "close enough" to at least convert secrets, nwfilters, nodedevs, and interfaces to use a more common object methodolgy to add/store, fetch/find, search, list, etc. the objects in something other than a linear forward linked list. Converting the storage pool, storage volume, and network is taking longer than hoped since there are so many patches to get from pointA to pointB. So I'll focus on the 4 and work through getting the complete model published/adopted as those have been in my branches for a while now. Still these patches get as far as the creation of the common object which is a start. The first 4 patches are essentially setup. Patch 5 is new and covers the need for nwfilters (at least temporarily until self locking list mgmt is possible). Patches 6-7 were more or less what patch 7-8 were in the RFC. Patches 8-9 are essentially the driver/common object extension. Patches 5-6 from the RFC still exist in my branches and would be the next logical step. It was a conscious decision to just use the "default" string comparison for hash table key. That key could be a UUID, but since the UUID can easily be converted from unsigned to signed - I believe it would be far simpler to keep that mechanism rather than complexity introduced by having "different" key search algorithms when the key isn't a char *. John Ferlan (9): util: Formatting cleanups to virobject API util: Introduce virObjectGetLockableObj util: Generate a common internal only error print util: Add magic_marker for all virObjects util: Introduce virObjectLockableRecursiveNew util: Introduce virObjectPoolableHashElement util: Add virObjectPoolableHashElementGet*Key util: Introduce virObjectPoolableDef util: Add virObjectPoolableDef* accessor API's src/libvirt_private.syms | 12 ++ src/util/virobject.c | 492 +++++++++++++++++++++++++++++++++++++++++++---- src/util/virobject.h | 130 +++++++++++-- 3 files changed, 580 insertions(+), 54 deletions(-) -- 2.9.4

3 17

[libvirt] [PATCH v3 0/3] Loadparm support
by Farhan Ali 30 May '17

30 May '17

This patch series introduces the support for new s390x 'loadparm' feature. The 'loadparm' can be used to select the boot entry to boot from, for a boot device. Here is a link to the QEMU patches: https://lists.nongnu.org/archive/html/qemu-devel/2017-05/msg00192.html ChangeLog --------- v2 -> v3: - Updated news.xml and formatdomain.html.in with a more architectural description of loadparm (patch 1) v1 -> v2: - Rebased the patch series on the latest master, commit 2f69dd3 virfiletest: include linux/falloc.h Thanks Farhan Ali Farhan Ali (3): conf : Add loadparm boot option for a boot device qemu : Add loadparm to qemu command line string tests : Testcases for loadparm docs/formatdomain.html.in | 9 ++- docs/news.xml | 11 ++++ docs/schemas/domaincommon.rng | 7 +++ src/conf/device_conf.h | 1 + src/conf/domain_conf.c | 69 +++++++++++++++++++++- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 37 ++++++++++++ ...-machine-loadparm-multiple-disks-nets-s390.args | 28 +++++++++ ...v-machine-loadparm-multiple-disks-nets-s390.xml | 43 ++++++++++++++ .../qemuxml2argv-machine-loadparm-net-s390.args | 20 +++++++ .../qemuxml2argv-machine-loadparm-net-s390.xml | 26 ++++++++ ...xml2argv-machine-loadparm-s390-char-invalid.xml | 26 ++++++++ ...uxml2argv-machine-loadparm-s390-len-invalid.xml | 26 ++++++++ .../qemuxml2argv-machine-loadparm-s390.args | 20 +++++++ .../qemuxml2argv-machine-loadparm-s390.xml | 26 ++++++++ tests/qemuxml2argvtest.c | 19 ++++++ 17 files changed, 367 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-char-invalid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-len-invalid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.xml -- 1.9.1

2 10

[libvirt] [PATCH] qemu: Don't error out if allocation info can't be queried
by Peter Krempa 30 May '17

30 May '17

qemuDomainGetBlockInfo would error out if qemu did not report 'wr_highest_offset'. This usually does not happen, but can happen briefly during active layer block commit. There's no need to report the error, we can simply report that the disk is fully alocated at that point. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1452045 --- src/qemu/qemu_driver.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 67f54282a..f6b352b56 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11541,14 +11541,6 @@ qemuDomainGetBlockInfo(virDomainPtr dom, } if (!entry->wr_highest_offset_valid) { - if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_BLOCK && - disk->src->format != VIR_STORAGE_FILE_RAW) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to query the maximum written offset of " - "block device '%s'"), disk->dst); - goto endjob; - } - info->allocation = entry->physical; } else { if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_FILE && -- 2.12.2

2 1

[libvirt] [libvirt-sandbox PATCH] Drop library/ from template name and image path
by Guido Günther 30 May '17

30 May '17

If one pastes from the output of virt-sansbox-image $ virt-sandbox-image list docker:/library/ubuntu?tag=17.04 docker:/library/debian?tag=latest verbatim $ virt-sandbox-image run -c qemu:///session docker:/library/debian?tag=latest This fails like /home/<usr>/.local/share/libvirt/images/library/debian:qbeilwxard.qcow2: Could not create file: No such file or directory Unable to start sandbox: Failed to create domain: XML error: name library/debian:qbeilwxard cannot contain '/' /usr/bin/virt-sandbox-image: [Errno 2] No such file or directory: '/home/<user>/.local/share/libvirt/images/library/debian:qbeilwxard.qcow2' so strip of any leading components. --- This might not be the correct fix but I hope you get the idea. libvirt-sandbox/image/cli.py | 2 +- libvirt-sandbox/image/sources/docker.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-sandbox/image/cli.py b/libvirt-sandbox/image/cli.py index 3a5ccfa..0f27a16 100644 --- a/libvirt-sandbox/image/cli.py +++ b/libvirt-sandbox/image/cli.py @@ -96,7 +96,7 @@ def run(args): name = args.name if name is None: randomid = ''.join(random.choice(string.lowercase) for i in range(10)) - name = tmpl.path[1:] + ":" + randomid + name = tmpl.path[1:].split('/')[-1] + ":" + randomid diskfile = source.get_disk(template=tmpl, templatedir=template_dir, diff --git a/libvirt-sandbox/image/sources/docker.py b/libvirt-sandbox/image/sources/docker.py index aa5675e..6ca086c 100755 --- a/libvirt-sandbox/image/sources/docker.py +++ b/libvirt-sandbox/image/sources/docker.py @@ -655,7 +655,7 @@ class DockerSource(base.Source): def get_disk(self, template, templatedir, imagedir, sandboxname): image = DockerImage.from_template(template) configfile, diskfile = self._get_template_data(image, templatedir) - tempfile = imagedir + "/" + sandboxname + ".qcow2" + tempfile = imagedir + "/" + sandboxname.split('/')[-1] + ".qcow2" if not os.path.exists(imagedir): os.makedirs(imagedir) cmd = ["qemu-img","create","-q","-f","qcow2"] -- 2.11.0

2 1

[libvirt] [PATCH v2] nodedev: Increase the netlink socket buffer size to the one used by udev
by Erik Skultety 30 May '17

30 May '17

From: "ning.bo" <ning.bo9(a)zte.com.cn> When a number of SRIOV VFs (up to 128 on Intel XL710) is created: for i in `seq 0 1`; do echo 63 > /sys/class/net/<interface>/device/sriov_numvfs done libvirtd will then report "udev_monitor_receive_device returned NULL" error because the netlink socket buffer is not big enough (using GDB on libudev confirmed this with ENOBUFFS) and thus some udev events were dropped. This results in some devices being missing in the nodedev-list output. This patch overrides the system's rmem_max limit but for that, we need to make sure we've got root privileges. https://bugzilla.redhat.com/show_bug.cgi?id=1450960 Signed-off-by: ning.bo <ning.bo9(a)zte.com.cn> Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Additionally, we might want to check for the errno, providing a specific message if such issue occurs again in a further non-specified point in time and return the generic, yet cryptic one for all other cases. src/node_device/node_device_udev.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 4ecb0b18f..0b3717397 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1728,6 +1728,13 @@ static int nodeStateInitialize(bool privileged, udev_monitor_enable_receiving(priv->udev_monitor); + /* mimic udevd's behaviour and override the systems rmem_max limit in case + * there's a significant number of device 'add' events + */ + if (geteuid() == 0) + udev_monitor_set_receive_buffer_size(priv->udev_monitor, + 128 * 1024 * 1024); + /* We register the monitor with the event callback so we are * notified by udev of device changes before we enumerate existing * devices because libvirt will simply recreate the device if we -- 2.13.0

3 4

[libvirt] [PATCH] qemu:json: Fix daemon crash on handling domain shutdown event
by Erik Skultety 30 May '17

30 May '17

commit a8eba5036 added further checking of the guest shutdown cause, but this enhancement is available since qemu 2.10, causing a crash because of a NULL pointer dereference on older qemus. Thread 1 "libvirtd" received signal SIGSEGV, Segmentation fault. 0x00007ffff72441af in virJSONValueObjectGet (object=0x0, key=0x7fffd5ef11bf "guest") at util/virjson.c:769 769 if (object->type != VIR_JSON_TYPE_OBJECT) (gdb) bt 0 in virJSONValueObjectGet 1 in virJSONValueObjectGetBoolean 2 in qemuMonitorJSONHandleShutdown 3 in qemuMonitorJSONIOProcessEvent 4 in qemuMonitorJSONIOProcessLine 5 in qemuMonitorJSONIOProcess 6 in qemuMonitorIOProcess 7 in qemuMonitorIO 8 in virEventPollDispatchHandles 9 in virEventPollRunOnce 10 in virEventRunDefaultImpl 11 in virNetDaemonRun 12 in main Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 757595dd7..f208dd05a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -528,7 +528,7 @@ static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr da bool guest = false; virTristateBool guest_initiated = VIR_TRISTATE_BOOL_ABSENT; - if (virJSONValueObjectGetBoolean(data, "guest", &guest) == 0) + if (data && virJSONValueObjectGetBoolean(data, "guest", &guest) == 0) guest_initiated = guest ? VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; qemuMonitorEmitShutdown(mon, guest_initiated); -- 2.13.0

2 2

[libvirt] [PATCH v3] Regression: Report correct CPUs present on executing virsh nodecpumap
by Nitesh Konkar 30 May '17

30 May '17

On executing the virsh nodecpumap command, the number of CPUs present was shown as (last cpu online id + 1). This patch fixes the issue by reporting the current number of CPUs present. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/util/virhostcpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index aa9cfeac2..c485a9721 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -1093,7 +1093,7 @@ virHostCPUGetMap(unsigned char **cpumap, if (online) *online = virBitmapCountBits(cpus); - ret = virBitmapSize(cpus); + ret = virHostCPUGetCount(); cleanup: if (ret < 0 && cpumap) -- 2.11.0

2 1

[libvirt] [libvirt-sandbox PATCH] mkinitrd: Add missing fscrypto module
by Guido Günther 30 May '17

30 May '17

--- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c index bdec490..7204f71 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c @@ -186,6 +186,7 @@ static gchar *gvir_sandbox_builder_machine_mkinitrd(GVirSandboxConfig *config, /* In case ext4 is built as a module, include it and its deps * for the root mount */ + gvir_sandbox_config_initrd_add_module(initrd, "fscrypto.ko"); gvir_sandbox_config_initrd_add_module(initrd, "mbcache.ko"); gvir_sandbox_config_initrd_add_module(initrd, "jbd2.ko"); gvir_sandbox_config_initrd_add_module(initrd, "crc16.ko"); -- 2.11.0

2 2

[libvirt] [libvirt-sandbox PATCH] docker: Don't ignore qemu-img errors
by Guido Günther 30 May '17

30 May '17

--- libvirt-sandbox/image/sources/docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-sandbox/image/sources/docker.py b/libvirt-sandbox/image/sources/docker.py index 43e9c32..aa5675e 100755 --- a/libvirt-sandbox/image/sources/docker.py +++ b/libvirt-sandbox/image/sources/docker.py @@ -662,7 +662,7 @@ class DockerSource(base.Source): cmd.append("-o") cmd.append("backing_fmt=qcow2,backing_file=%s" % diskfile) cmd.append(tempfile) - subprocess.call(cmd) + subprocess.check_call(cmd) return tempfile def get_command(self, template, templatedir, userargs): -- 2.11.0

2 2

[libvirt] [PATCH] tools: make setvcpus --maximum imply --config
by Chen Hanxiao 29 May '17

29 May '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Currently --maximum was possible if and only if --config was specified. This patch makes setvcpus --maximum imply --config. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- tools/virsh-domain.c | 7 ++++--- tools/virsh.pod | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 5c42021..04ef816 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6819,8 +6819,8 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS_VAR(current, live); VSH_EXCLUSIVE_OPTIONS_VAR(current, config); VSH_EXCLUSIVE_OPTIONS_VAR(guest, config); - - VSH_REQUIRE_OPTION_VAR(maximum, config); + VSH_EXCLUSIVE_OPTIONS_VAR(maximum, live); + VSH_EXCLUSIVE_OPTIONS_VAR(maximum, current); if (config) flags |= VIR_DOMAIN_AFFECT_CONFIG; @@ -6829,7 +6829,8 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) if (guest) flags |= VIR_DOMAIN_VCPU_GUEST; if (maximum) - flags |= VIR_DOMAIN_VCPU_MAXIMUM; + flags |= VIR_DOMAIN_VCPU_MAXIMUM | + VIR_DOMAIN_AFFECT_CONFIG; if (hotpluggable) flags |= VIR_DOMAIN_VCPU_HOTPLUGGABLE; diff --git a/tools/virsh.pod b/tools/virsh.pod index e7c513b..bc8b539 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2501,10 +2501,11 @@ flag. Vcpus added to live domains supporting vcpu unplug are automatically marked as hotpluggable. The I<--maximum> flag controls the maximum number of virtual cpus that can -be hot-plugged the next time the domain is booted. As such, it must only be -used with the I<--config> flag, and not with the I<--live> or the I<--current> -flag. Note that it may not be possible to change the maximum vcpu count if -the processor topology is specified for the guest. +be hot-plugged the next time the domain is booted. As such, it implies +I<--config> be set. Also it can be used with the I<--config> flag, +but not with the I<--live> or the I<--current> flag. Note that it may not +be possible to change the maximum vcpu count if the processor topology +is specified for the guest. =item B<setvcpu> I<domain> I<vcpulist> [I<--enable>] | [I<--disable>] [[I<--live>] [I<--config>] | [I<--current>]] -- 2.7.4

3 4

[libvirt] [PATCH] virCapabilitiesInitCaches: Don't leak @cpus
by Michal Privoznik 29 May '17

29 May '17

The @cpus is allocated by virFileReadValueBitmap() but never freed: ==21274== 40 (32 direct, 8 indirect) bytes in 1 blocks are definitely lost in loss record 808 of 1,004 ==21274== at 0x4C2E080: calloc (vg_replace_malloc.c:711) ==21274== by 0x54BA561: virAlloc (viralloc.c:144) ==21274== by 0x54BC604: virBitmapNewEmpty (virbitmap.c:126) ==21274== by 0x54BD059: virBitmapParseUnlimited (virbitmap.c:570) ==21274== by 0x54EECE9: virFileReadValueBitmap (virfile.c:4113) ==21274== by 0x5563132: virCapabilitiesInitCaches (capabilities.c:1548) ==21274== by 0x2BB86E59: virQEMUCapsInit (qemu_capabilities.c:1132) ==21274== by 0x2BBEC067: virQEMUDriverCreateCapabilities (qemu_conf.c:928) ==21274== by 0x2BC3DEAA: qemuStateInitialize (qemu_driver.c:845) ==21274== by 0x5625AAC: virStateInitialize (libvirt.c:770) ==21274== by 0x124519: daemonRunStateInit (libvirtd.c:881) ==21274== by 0x554C927: virThreadHelper (virthread.c:206) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/capabilities.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index a91a72a35..43b15761a 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1643,5 +1643,6 @@ virCapabilitiesInitCaches(virCapsPtr caps) VIR_FREE(path); VIR_DIR_CLOSE(dirp); virCapsHostCacheBankFree(bank); + virBitmapFree(cpus); return ret; } -- 2.13.0

2 1

[libvirt] [PATCH] fix memory leak in daemonUnixSocketPaths and qemuMonitorJSONAttachCharDevCommand
by Yi Wang 29 May '17

29 May '17

From: Xi Xu <xu.xi8(a)zte.com.cn> The @rundir is allocated in virGetUserRuntimeDirectory, may lost when virFileMakePath failed. The tlsalias allocated in qemuAliasTLSObjFromSrcAlias may lost when append string to json. --- daemon/libvirtd.c | 1 + src/qemu/qemu_monitor_json.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 891238b..2447d78 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -288,6 +288,7 @@ daemonUnixSocketPaths(struct daemonConfig *config, old_umask = umask(077); if (virFileMakePath(rundir) < 0) { umask(old_umask); + VIR_FREE(rundir); goto error; } umask(old_umask); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 0837290..66f3f87 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6481,6 +6481,8 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (virJSONValueObjectAppendString(data, "tls-creds", tlsalias) < 0) goto error; + + VIR_FREE(tlsalias); } break; -- 1.8.3.1

2 1

[libvirt] [PATCH] util: fix virfcp build on non-Linux
by Roman Bogorodskiy 29 May '17

29 May '17

- Include virerror.h for virReportSystemError - Rename stub functions to match original function names --- Pushed under the build breaker rule. src/util/virfcp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/virfcp.c b/src/util/virfcp.c index 3c7fab917..7660ba720 100644 --- a/src/util/virfcp.c +++ b/src/util/virfcp.c @@ -26,6 +26,7 @@ #include "viralloc.h" #include "virfile.h" +#include "virerror.h" #include "virstring.h" #include "virfcp.h" @@ -80,14 +81,14 @@ virFCReadRportValue(const char *rport, #else bool -virSysfsIsCapableFCRport(const char *rport ATTRIBUTE_UNUSED) +virFCIsCapableRport(const char *rport ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")); return false; } int -virSysfsReadFCRport(const char *rport ATTRIBUTE_UNUSED, +virFCReadRportValue(const char *rport ATTRIBUTE_UNUSED, const char *entry ATTRIBUTE_UNUSED, char **result ATTRIBUTE_UNUSED) { -- 2.13.0

3 2

[libvirt] [PATCH] CI: show the log in case of failure
by claudioandre.br＠gmail.com 27 May '17

27 May '17

From: Claudio André <claudioandre.br(a)gmail.com> Disclosure the content of the 'test-suite.log' file (if available) in case of failures inside Travis-CI. This is needed to understand what happened and to provide hints about the proper fix (if applicable). --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 266ffff..5a3e765 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,3 +83,11 @@ matrix: # many unit tests fail & so does syntax-check, so skip for now # one day we must fix it though.... - make -j3 + +after_failure: + - echo '============================================================================' + - 'if [ -f $(pwd)/tests/test-suite.log ]; then + cat $(pwd)/tests/test-suite.log; + else + echo "=== NO LOG FILE FOUND ==="; + fi' -- 2.11.0

3 7

[libvirt] [libvirt-php PATCH] use proper arginfo for libvirt_domain_create
by Dawid Zamirski 27 May '17

27 May '17

this function takes only resource argument. --- src/libvirt-php.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index bfc9b7d..99d6397 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -629,7 +629,7 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_lookup_by_uuid, arginfo_libvirt_conn_uuid) PHP_FE(libvirt_domain_lookup_by_uuid_string, arginfo_libvirt_conn_uuid) PHP_FE(libvirt_domain_destroy, arginfo_libvirt_conn) - PHP_FE(libvirt_domain_create, arginfo_libvirt_conn_xml) + PHP_FE(libvirt_domain_create, arginfo_libvirt_conn) PHP_FE(libvirt_domain_resume, arginfo_libvirt_conn) PHP_FE(libvirt_domain_core_dump, arginfo_libvirt_domain_core_dump) PHP_FE(libvirt_domain_shutdown, arginfo_libvirt_conn) -- 2.13.0

2 1

[libvirt] libvirt-php changing release strategy
by Michal Privoznik 27 May '17

27 May '17

Dear list, as you've noticed, libvirt changed the versioning strategy and slowly other subprojects are adapting it too. I mean, the version number is changed right after the release and not just before it. It makes sense and therefore I'm letting you know that libvirt-php is adapting this scheme too: commit 3bdbd3175d159a96731bbb95bfd4bbeff7952f16 Author: Michal Privoznik <mprivozn(a)redhat.com> AuthorDate: Sat May 27 11:25:47 2017 +0200 Commit: Michal Privoznik <mprivozn(a)redhat.com> CommitDate: Sat May 27 11:25:47 2017 +0200 Post-release version bump to 0.5.4 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> Michal

1 0

[libvirt] [PATCH 0/7] extend node_device for CCW and fc_remote_port
by Bjoern Walk 26 May '17

26 May '17

Let's introduce two new capabilities to the node_device driver and fix two smaller issues on the way. The first is for CCW devices, most common on the S390 architecture. We expose the relevant cssid, ssid and devno values. The second is for fibre channel-backed SCSI devices, where we introduce the fc_remote_port subcapability for SCSI targets. Here we expose the relevant rport name as well as the port_name (WWPN). Bjoern Walk (5): node_device: detect CCW devices virsh: nodedev: ability to filter CCW capabilities util: helper functions for fibre channel devices node_device: introduce new capability FC_RPORT docs: update news.xml Marc Hartmayer (2): node_device: Use the iterator variable node_device: Unlock obj in case of an error too docs/formatnode.html.in | 12 ++ docs/news.xml | 11 ++ docs/schemas/basictypes.rng | 31 +++++ docs/schemas/domaincommon.rng | 30 ----- docs/schemas/nodedev.rng | 36 ++++++ include/libvirt/libvirt-nodedev.h | 1 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/node_device_conf.c | 150 +++++++++++++++++++++- src/conf/node_device_conf.h | 21 ++- src/conf/virnodedeviceobj.c | 3 +- src/libvirt-nodedev.c | 1 + src/libvirt_private.syms | 5 + src/node_device/node_device_driver.c | 16 ++- src/node_device/node_device_linux_sysfs.c | 56 ++++++++ src/node_device/node_device_linux_sysfs.h | 2 + src/node_device/node_device_udev.c | 39 +++++- src/util/virfcp.c | 96 ++++++++++++++ src/util/virfcp.h | 32 +++++ tests/nodedevschemadata/ccw_0_0_10000-invalid.xml | 10 ++ tests/nodedevschemadata/ccw_0_0_ffff.xml | 10 ++ tests/nodedevschemadata/scsi_target1_0_0.xml | 12 ++ tests/nodedevxml2xmltest.c | 2 + tools/virsh-nodedev.c | 3 + tools/virsh.pod | 2 +- 25 files changed, 539 insertions(+), 44 deletions(-) create mode 100644 src/util/virfcp.c create mode 100644 src/util/virfcp.h create mode 100644 tests/nodedevschemadata/ccw_0_0_10000-invalid.xml create mode 100644 tests/nodedevschemadata/ccw_0_0_ffff.xml create mode 100644 tests/nodedevschemadata/scsi_target1_0_0.xml -- 2.11.2

5 27

[libvirt] [PATCH v2 00/11] Multiple cleanups within interfaceobj and interface driver
by John Ferlan 26 May '17

26 May '17

v1: https://www.redhat.com/archives/libvir-list/2017-April/msg01225.html I've been informed via internal IRC that the patches 9, 10, and 11 don't apply cleanly - so here's a clean series. John John Ferlan (11): interface: Consistently use 'obj' for a virInterfaceObjPtr interface: Remove some unnecessary goto's for Interface tests interface: Use virInterfaceDefPtr rather than deref from virInterfaceObjPtr interface: Make _virInterfaceObj struct private interface: Make _virInterfaceObjList struct private interface: Rename some virInterfaceObj* API's interface: Clean up virInterfaceObjListFindByMACString interface: Introduce virInterfaceObjNew interface: Introduce virInterfaceObjEndAPI interface: Convert virInterfaceObj to use virObjectLockable interface: Alter virInterfaceObjListAssignDef @def param po/POTFILES.in | 1 - src/conf/virinterfaceobj.c | 277 +++++++++++++++++++++++++++++---------------- src/conf/virinterfaceobj.h | 72 ++++++------ src/libvirt_private.syms | 19 ++-- src/test/test_driver.c | 145 ++++++++++++------------ 5 files changed, 295 insertions(+), 219 deletions(-) -- 2.9.4

2 17

[libvirt] [PATCH go-xml] add support for disk cache and io add support for controller model extend DomainAddress struct for PCI address and target&unit
by zhenwei.pi 26 May '17

26 May '17

--- domain.go | 13 +++++++++++-- domain_test.go | 31 ++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/domain.go b/domain.go index 848835a..1382cd0 100644 --- a/domain.go +++ b/domain.go @@ -30,8 +30,10 @@ import ( ) type DomainController struct { - Type string `xml:"type,attr"` - Index string `xml:"index,attr"` + Type string `xml:"type,attr"` + Index string `xml:"index,attr"` + Model string `xml:"model,attr,omitempty"` + Address *DomainAddress `xml:"address"` } type DomainDiskSecret struct { @@ -77,6 +79,8 @@ type DomainDisk struct { Type string `xml:"type,attr"` Device string `xml:"device,attr"` Snapshot string `xml:"snapshot,attr,omitempty"` + Cache string `xml:"cache,attr,omitempty"` + Io string `xml:"io,attr,omitempty"` Driver *DomainDiskDriver `xml:"driver"` Auth *DomainDiskAuth `xml:"auth"` Source *DomainDiskSource `xml:"source"` @@ -196,8 +200,13 @@ type DomainAlias struct { type DomainAddress struct { Type string `xml:"type,attr"` Controller *uint `xml:"controller,attr"` + Domain *uint `xml:"domain,attr"` Bus *uint `xml:"bus,attr"` Port *uint `xml:"port,attr"` + Slot *uint `xml:"slot,attr"` + Function *uint `xml:"function,attr"` + Target *uint `xml:"target,attr"` + Unit *uint `xml:"unit,attr"` } type DomainChardev struct { diff --git a/domain_test.go b/domain_test.go index 265cf80..fd6914e 100644 --- a/domain_test.go +++ b/domain_test.go @@ -130,10 +130,12 @@ var domainTestData = []struct { }, }, DomainDisk{ - Type: "volume", + Type: "volume", Device: "cdrom", + Cache: "none", + Io: "native", Source: &DomainDiskSource{ - Pool: "default", + Pool: "default", Volume: "myvolume", }, Target: &DomainDiskTarget{ @@ -174,7 +176,7 @@ var domainTestData = []struct { ` </source>`, ` <target dev="vdd" bus="virtio"></target>`, ` </disk>`, - ` <disk type="volume" device="cdrom">`, + ` <disk type="volume" device="cdrom" cache="none" io="native">`, ` <source pool="default" volume="myvolume"></source>`, ` <target dev="vde" bus="virtio"></target>`, ` </disk>`, @@ -820,6 +822,29 @@ var domainTestData = []struct { `</domain>`, }, }, + { + Object: &Domain{ + Type: "kvm", + Name: "test", + Devices: &DomainDeviceList{ + Controllers: []DomainController{ + DomainController{ + Type: "usb", + Index: "0", + Model: "piix3-uhci", + }, + }, + }, + }, + Expected: []string{ + `<domain type="kvm">`, + ` <name>test</name>`, + ` <devices>`, + ` <controller type="usb" index="0" model="piix3-uhci"></controller>`, + ` </devices>`, + `</domain>`, + }, + }, } func TestDomain(t *testing.T) { -- 2.7.4

2 1

[libvirt] Double deference error in libvirt_virConnectDomainEventRegisterAny
by fangying 26 May '17

26 May '17

Hi, We'd like to report a double dereference error of 'pyobj_cbData' in libvirt_virConnectDomainEventRegisterAny. The bug can be triggered in the situation where 'domainEventRegisterAny' (the python interface of libvirt_virConnectDomainEventRegisterAny) is invoked and network connection is coincidently lost (likely libvirtd restarted) at same time. We get the following stacktrace when the bug is hit. Program terminated with signal 6, Aborted. #0 0x00007fc45cba15d7 in raise () from /usr/lib64/libc.so.6 #1 0x00007fc45cba2cc8 in abort () from /usr/lib64/libc.so.6 #2 0x00007fc45cbe12f7 in __libc_message () from /usr/lib64/libc.so.6 #3 0x00007fc45cbe86d3 in _int_free () from /usr/lib64/libc.so.6 #4 0x00007fc45d8d292c in PyDict_Fini () from /usr/lib64/libpython2.7.so.1.0 #5 0x00007fc45d94f46a in Py_Finalize () from /usr/lib64/libpython2.7.so.1.0 #6 0x00007fc45d960735 in Py_Main () from /usr/lib64/libpython2.7.so.1.0 #7 0x00007fc45cb8daf5 in __libc_start_main () from /usr/lib64/libc.so.6 #8 0x0000000000400721 in _start () The double dereference of 'pyobj_cbData' is triggered in the following way: (1) libvirt_virConnectDomainEventRegisterAny is invoked. (2) the event is successfully added to the event callback list (virDomainEventStateRegisterClient in remoteConnectDomainEventRegisterAny returns 1 which means ok). (3) when function remoteConnectDomainEventRegisterAny is hit, network connection disconnected coincidently (or libvirtd is restarted) in the context of function 'call' then the connection is lost and the function 'call' failed, the branch virObjectEventStateDeregisterID is therefore taken. (4) 'pyobj_conn' is dereferenced the 1st time in libvirt_virConnectDomainEventFreeFunc. (5) 'pyobj_cbData' (refered to pyobj_conn) is dereferenced the 2nd time in libvirt_virConnectDomainEventRegisterAny. (6) the double free error is triggered. static void libvirt_virConnectDomainEventFreeFunc(void *opaque) { PyObject *pyobj_conn = (PyObject*)opaque; LIBVIRT_ENSURE_THREAD_STATE; Py_DECREF(pyobj_conn); /* 1st dereference comes here */ LIBVIRT_RELEASE_THREAD_STATE; } static PyObject * libvirt_virConnectDomainEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { ... Py_INCREF(pyobj_cbData); LIBVIRT_BEGIN_ALLOW_THREADS; ret = virConnectDomainEventRegisterAny(conn, dom, eventID, cb, pyobj_cbData, libvirt_virConnectDomainEventFreeFunc); if (ret < 0) { Py_DECREF(pyobj_cbData); /* 2nd dereference comes here */ } } Currently we cannot find a good solution to fix this problem, could anyone guide us to fix it ?

2 1

[libvirt] [PATCH v2] rpc: Allow up to 256K records to be returned per domain from virConnectGetAllDomainStats.
by Richard W.M. Jones 26 May '17

26 May '17

The number of records that virConnectGetAllDomainStats can return per domain is currently limited to 4096. This is quite low -- for example, a single guest with ~320 disks will hit this limit. This increases the limit to make it much larger. Note that VIR_NET_MESSAGE_MAX still protects the total message size in the case where there are many domains and many disks per domain. I tested this using a guest with 500 disks with no issues. Signed-off-by: Richard W.M. Jones <rjones(a)redhat.com> Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1440683 --- src/remote/remote_protocol.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 25e62a181..aa0aa38b6 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -233,7 +233,7 @@ const REMOTE_DOMAIN_FSFREEZE_MOUNTPOINTS_MAX = 256; const REMOTE_NETWORK_DHCP_LEASES_MAX = 65536; /* Upper limit on count of parameters returned via bulk stats API */ -const REMOTE_CONNECT_GET_ALL_DOMAIN_STATS_MAX = 4096; +const REMOTE_CONNECT_GET_ALL_DOMAIN_STATS_MAX = 262144; /* Upper limit of message size for tunable event. */ const REMOTE_DOMAIN_EVENT_TUNABLE_MAX = 2048; -- 2.13.0

2 1

[libvirt] [PATCH] rpc: Allow up to 256K records to be returned from virConnectGetAllDomainStats.
by Richard W.M. Jones 26 May '17

26 May '17

In commit 89a706681cb3a4aa003d920db3163b809cfbc9ca, the returned array of stats is limited to REMOTE_DOMAIN_LIST_MAX entries (4096). As well as being far too low -- this breaks if a single guest is added with 320 disks -- it also seems as if use of REMOTE_DOMAIN_LIST_MAX was a mistake, and it should be using REMOTE_CONNECT_GET_ALL_DOMAIN_STATS_MAX instead. However REMOTE_CONNECT_GET_ALL_DOMAIN_STATS_MAX is also too low (also 4096), so this patch also increases the limit to something more sensible, allowing us to cope with lots of stats from lots of domains in future. (This limit could be increased further quite easily since each stats record takes about 32 bytes, and the maximum message size is currently 32 MB, so we could increase the limit by another factor of 4 without touching the maximum message size). I tested this using a guest with 320, 500 and 1000 disks with no issues. Signed-off-by: Richard W.M. Jones <rjones(a)redhat.com> Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1440683 --- src/remote/remote_protocol.x | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 25e62a181..142508713 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -233,7 +233,7 @@ const REMOTE_DOMAIN_FSFREEZE_MOUNTPOINTS_MAX = 256; const REMOTE_NETWORK_DHCP_LEASES_MAX = 65536; /* Upper limit on count of parameters returned via bulk stats API */ -const REMOTE_CONNECT_GET_ALL_DOMAIN_STATS_MAX = 4096; +const REMOTE_CONNECT_GET_ALL_DOMAIN_STATS_MAX = 262144; /* Upper limit of message size for tunable event. */ const REMOTE_DOMAIN_EVENT_TUNABLE_MAX = 2048; @@ -3264,7 +3264,7 @@ struct remote_domain_event_callback_agent_lifecycle_msg { }; struct remote_connect_get_all_domain_stats_ret { - remote_domain_stats_record retStats<REMOTE_DOMAIN_LIST_MAX>; + remote_domain_stats_record retStats<REMOTE_CONNECT_GET_ALL_DOMAIN_STATS_MAX>; }; struct remote_domain_fsinfo { -- 2.13.0

3 2

[libvirt] [PATCH] rpc: Double buffer size instead of quadrupling buffer size.
by Richard W.M. Jones 26 May '17

26 May '17

When increasing the buffer size up to VIR_NET_MESSAGE_MAX, we currently quadruple it each time. This unfortunately means that we cannot allow certain buffer sizes -- for example the current VIR_NET_MESSAGE_MAX == 33554432 can never be "hit" since ‘newlen’ jumps from 16MB to 64MB. Instead of quadrupling, double it each time. Thanks: Daniel Berrange. --- src/rpc/virnetmessage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index c3a2e595c..5908b074a 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -358,7 +358,8 @@ int virNetMessageEncodePayload(virNetMessagePtr msg, /* Try to encode the payload. If the buffer is too small increase it. */ while (!(*filter)(&xdr, data, 0)) { - unsigned int newlen = (msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX) * 4; + unsigned int newlen = msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX; + newlen *= 2; if (newlen > VIR_NET_MESSAGE_MAX) { virReportError(VIR_ERR_RPC, "%s", _("Unable to encode message payload")); -- 2.13.0

2 1

[libvirt] [PATCH] node: Don't return invalid pointers
by Peter Krempa 26 May '17

26 May '17

Commit 4337bc57be introduced code that would in certain error paths unref the last reference of a pointer, but return it. Clear the pointers before returning them --- src/node_device/node_device_driver.c | 8 ++++++-- src/test/test_driver.c | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index ba3da6288..3a6eeaaae 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -241,8 +241,10 @@ nodeDeviceLookupByName(virConnectPtr conn, const char *name) goto cleanup; if ((ret = virGetNodeDevice(conn, name))) { - if (VIR_STRDUP(ret->parent, obj->def->parent) < 0) + if (VIR_STRDUP(ret->parent, obj->def->parent) < 0) { virObjectUnref(ret); + ret = NULL; + } } cleanup: @@ -285,8 +287,10 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, goto out; if ((dev = virGetNodeDevice(conn, obj->def->name))) { - if (VIR_STRDUP(dev->parent, obj->def->parent) < 0) + if (VIR_STRDUP(dev->parent, obj->def->parent) < 0) { virObjectUnref(dev); + dev = NULL; + } } virNodeDeviceObjUnlock(obj); goto out; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 2db3f7ddf..9330d9ea6 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5331,8 +5331,10 @@ testNodeDeviceLookupByName(virConnectPtr conn, const char *name) goto cleanup; if ((ret = virGetNodeDevice(conn, name))) { - if (VIR_STRDUP(ret->parent, obj->def->parent) < 0) + if (VIR_STRDUP(ret->parent, obj->def->parent) < 0) { virObjectUnref(ret); + ret = NULL; + } } cleanup: -- 2.12.2

2 1

[libvirt] [PATCH] node_device: fix memory leak in nodeDeviceSysfsGetSCSIHostCaps
by Yi Wang 26 May '17

26 May '17

The @tmp is allocated in virVHBAGetConfig in virVHBAIsVportCapable condition, it will lost when virVHBAGetConfig called again. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/node_device/node_device_linux_sysfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index 1b7aa94..a9c7c9c 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -95,7 +95,8 @@ nodeDeviceSysfsGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host) goto cleanup; } - if (!(tmp = virVHBAGetConfig(NULL, scsi_host->host, + VIR_FREE(tmp); + if (!(tmp = virVHBAGetConfig(NULL, scsi_host->host, "npiv_vports_inuse"))) { VIR_WARN("Failed to read npiv_vports_inuse for host%d", scsi_host->host); -- 1.8.3.1

2 1

[libvirt] [PATCH] util: fix memory leak in virSocketAddrFormatFull
by Yi Wang 26 May '17

26 May '17

The @ipv6_host allocated in virAsprintf may be lost when virAsprintf addrstr failed. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/util/virsocketaddr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 9dffbc7..95b5274 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -417,8 +417,10 @@ virSocketAddrFormatFull(const virSocketAddr *addr, if (virAsprintf(&addrstr, "%s%s%s", ipv6_host ? ipv6_host : host, - separator ? separator : ":", port) == -1) + separator ? separator : ":", port) == -1) { + VIR_FREE(ipv6_host); goto error; + } VIR_FREE(ipv6_host); } else { -- 1.8.3.1

2 1

[libvirt] [PATCH 2/2] lxc: fixing wrong VIR_FREE after a return statement.
by Julio Faracco 26 May '17

26 May '17

There is a VIR_FREE after a return statement. That code section is never executed and for this reason the "tty" variable is not being freed. This commit rearrange the logic. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/lxc/lxc_container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a936342..af02b54 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1143,8 +1143,8 @@ static int lxcContainerSetupDevices(char **ttyPaths, size_t nttyPaths) return -1; if (virFileBindMountDevice(ttyPaths[i], tty) < 0) { - return -1; VIR_FREE(tty); + return -1; } VIR_FREE(tty); -- 1.8.3.1

2 1

[libvirt] [PATCH 1/2] configure: fixing acl missing variable.
by Julio Faracco 26 May '17

26 May '17

This commit fixes an acl missing variable. The virt-acl.m4 inside the macro directory does not contain the variable 'with_acl'. So, it is being set as an empty string "with_acl=''". This is causing a missing option during the configuration, even if you have acl libs installed. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- m4/virt-acl.m4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/m4/virt-acl.m4 b/m4/virt-acl.m4 index f7d1c6d..d548729 100644 --- a/m4/virt-acl.m4 +++ b/m4/virt-acl.m4 @@ -23,8 +23,10 @@ AC_DEFUN([LIBVIRT_CHECK_ACL], [ ACL_CFLAGS="" ACL_LIBS="" + with_acl=no if test "x$ac_cv_header_sys_acl_h:x$with_linux" = "xyes:xyes"; then ACL_LIBS="-lacl" + with_acl=yes fi AC_SUBST([ACL_CFLAGS]) AC_SUBST([ACL_LIBS]) -- 1.8.3.1

2 1

[libvirt] [PATCH v2 0/3] Check for <memoryBacking/>
by Michal Privoznik 26 May '17

26 May '17

Technically this is v2 of: https://www.redhat.com/archives/libvir-list/2017-May/msg00626.html diff to v1: - Patches split and reworked as suggested by Peter in the review Michal Privoznik (3): virDomainDefCheckABIStabilityFlags: move memtune checks into a separate function virDomainXMLOption: Introduce virDomainABIStabilityDomain virQEMUDriverDomainABIStability: Check for memoryBacking src/conf/domain_conf.c | 93 ++++++++++++++++++++++++++++++-------------- src/conf/domain_conf.h | 16 +++++++- src/conf/snapshot_conf.c | 5 ++- src/conf/snapshot_conf.h | 3 +- src/libvirt_private.syms | 6 +++ src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_domain.c | 4 +- src/lxc/lxc_conf.c | 3 +- src/openvz/openvz_driver.c | 2 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_domain.c | 41 +++++++++++++++++++ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 7 ++-- src/test/test_driver.c | 8 ++-- src/uml/uml_driver.c | 2 +- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_driver.c | 2 +- src/vmx/vmx.c | 2 +- src/xen/xen_driver.c | 2 +- src/xenapi/xenapi_driver.c | 2 +- tests/qemuargv2xmltest.c | 2 +- tests/qemuxml2argvtest.c | 2 +- tests/sexpr2xmltest.c | 2 +- tests/testutils.c | 4 +- tests/vmx2xmltest.c | 2 +- tests/xlconfigtest.c | 2 +- tests/xmconfigtest.c | 2 +- tests/xml2sexprtest.c | 2 +- tests/xml2vmxtest.c | 2 +- 31 files changed, 167 insertions(+), 63 deletions(-) -- 2.13.0

3 8

[libvirt] Remotable Libvirt
by Peter Volpe 25 May '17

25 May '17

Hi Everyone, We are working towards building on the virtualization management functionality in cockpit (http://cockpit-project.org/) and wanted to get some feedback on the best way to integrate with libvirt. As a quick overview, cockpit aims to talk to existing remotable system APIs. Usually these API’s take the form of dbus, REST or executable commands. The majority of cockpit is implemented in javascript. There is no cockpit backend that knows how to change a hostname for example. The cockpit backend knows how to handle a dbus payload. The javascript running in the users browser knows how to use the systemd dbus API at org.freedesktop.hostname1 to manage the system hostname. Right now some of the basics have been implemented by spawning commands on the system. This isn't ideal because it involves parsing / screen scraping output and doesn't support receiving events so we have to poll (ei run the command again) to keep the UI up to date. As far as I know libvirt doesn't currently have a remoteable API. It does have a daemon that communicates with clients via a XDR RPC. (https://libvirt.org/internals/rpc.html) However from what I'm hearing the RPC is considered an internal implementation and shouldn't be used by external applications. Is that still the case? Is there any chance of getting talking the daemon directly using the XDR standard for a subset of methods blessed as part of the externally supported API? An alternative is to implement a standards based remotable API, using something like dbus or REST, that can be used by external applications. I imagine that this would be at a bit of a higher level than the current RPC and contain at least some of the logic around the actions it performs rather than being a direct passthrough to the daemon. Of course that is a pretty big undertaking and would, in my opinion, only be worth it if there is broader interest in the community and use cases beyond what cockpit would like to.

1 0

[libvirt] RFE: virsh list improvement (--description and --details)
by Przemysław Sztoch 25 May '17

25 May '17

Hello, 1. Please add —description parameter to virsh list command. It should be similar to —title. It will be very helpful for administrators who like to leave the order and documentation after their work. 2. Please add new columns to virsh list (for —details): a) CPUs b) MaxMem c) Flags: p-persistent, t-transient, a-autostart, m-managed save, s-with snapshot(s) and total sum for column vCPUs and Mem. In my opinion it is very popular use case. It will help you control vCPU and memory overcommiting in very simple and fast way. Put flags on list will prevents many additional commands from being executed. You will get all important information in one place. 3. Please add —domtime parameter to virsh list command. It should show column with domain’s system time similar to virsh domtime domname --pretty. It will be very helpful for fast guest-agent checking for every domain. 4. Please add column Parent and Metadata to virsh snapshot-list. — Przemyslaw Sztoch

5 9

[libvirt] [PATCH 0/8] Multiple cleanups within interfaceobj and interface driver
by John Ferlan 25 May '17

25 May '17

Sensing a theme lately yet? More adjustments in preparation for having virobject code handle the bulk of the object management code. Far less in this series than the other two... The Clone code was a bit unique and required more of a rewrite than a refigure since now we have two allocated lists rather than two static lists. John Ferlan (8): interface: Consistently use 'obj' for a virInterfaceObjPtr interface: Remove some unnecessary goto's for Interface tests interface: Use virInterfaceDefPtr rather than deref from virInterfaceObjPtr interface: Make _virInterfaceObj struct private interface: Make _virInterfaceObjList struct private interface: Rename some virInterfaceObj* API's interface: Clean up virInterfaceObjListFindByMACString interface: Introduce virInterfaceObjNew src/conf/virinterfaceobj.c | 232 +++++++++++++++++++++++++++++---------------- src/conf/virinterfaceobj.h | 65 ++++++------- src/libvirt_private.syms | 15 +-- src/test/test_driver.c | 143 ++++++++++++++-------------- 4 files changed, 262 insertions(+), 193 deletions(-) -- 2.9.3

2 22

Re: [libvirt] [virt-tools-list] Problem with firewalls on Arch Linux
by Cole Robinson 25 May '17

25 May '17

On 05/25/2017 06:08 AM, Derek Richline wrote: > Hi all: > > I noticed that Virt Manager will not start the network "default" unless > it detects a running firewalld. Arch Linux only ships with iptables by > default. Can Virt-Manager be patched to not check as aggressively for a > firewall (or just issue a warning)? > virt-manager doesn't have any specific firewalld checking so this is likely coming from libvirt. I don't know anything about arch packaging, but if the libvirt package doesn't pull in firewalld then maybe libvirt should be built --without-firewalld What libvirt version is this? And what's the exact error message you are seeing? - Cole

2 1

[libvirt] [PATCH] qemu: Fix memory leak in qemuDomainUpdateMemoryDeviceInfo
by Yi Wang 25 May '17

25 May '17

The @meminfo allocated in qemuMonitorGetMemoryDeviceInfo may be lost when exit monitor failed. Luckily we can free it according to rc. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/qemu/qemu_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c8dc748..c34ec5a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5767,8 +5767,11 @@ qemuDomainUpdateMemoryDeviceInfo(virQEMUDriverPtr driver, rc = qemuMonitorGetMemoryDeviceInfo(priv->mon, &meminfo); - if (qemuDomainObjExitMonitor(driver, vm) < 0) + if (qemuDomainObjExitMonitor(driver, vm) < 0) { + if (0 == rc) + virHashFree(meminfo); return -1; + } /* if qemu doesn't support the info request, just carry on */ if (rc == -2) -- 1.8.3.1

3 2

[libvirt] [PATCH v2 RFC 0/4] qemu: replace nested job with interruptible async job state
by Nikolay Shirokovskiy 25 May '17

25 May '17

This is the next version of RFC [1] 'drop nested job concept'. Actually it is quite different from the first. Patches that accomodate callers to use functions to enter/exit monitor with without driver and asyncJob arguments are moved out of this series. I guess this can be done as soon as this series is upstream. Most of approach details are in the first patch. Pros: - better async job and concurrent regular job isolation - more straightforward implementation - more simple to use - no need to pass async job argument down the stack - safer to use - no warnings to be fixed if function is started to be used from asynchronous job context. TODO: - replace qemuDomainObjEnterMonitorAsync with qemuDomainObjEnterMonitor - accomodate callers to qemuDomainObjExitMonitor became returning void - remove passing driver and asyncJob down the stack - reflect changes in THREADS.txt [1] https://www.redhat.com/archives/libvir-list/2016-November/msg01357.html Nikolay Shirokovskiy (4): qemu: replace nested job with interruptible async job state qemu: remove liveness check from qemuDomainObjExitMonitor qemu: remove nesting job usage from qemuProcessStop qemu: remove the rest of nested job parts src/conf/domain_conf.c | 19 ---- src/conf/domain_conf.h | 1 - src/libvirt_private.syms | 1 - src/qemu/qemu_domain.c | 253 +++++++++++++++++++++++++++++----------------- src/qemu/qemu_domain.h | 29 ++++-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_migration.c | 70 +++++++------ src/qemu/qemu_process.c | 31 ++---- 8 files changed, 225 insertions(+), 181 deletions(-) -- 1.8.3.1

1 5

[libvirt] [PATCH] qemu: Use correct variable in qemuDomainSetBlockIoTune
by Peter Krempa 25 May '17

25 May '17

'param' contains the correct element from 'params'. If the group name would not be the first element libvirtd would crash. Introduced in c53bd25b13. --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cd513ff9f..67f54282a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17443,7 +17443,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, /* NB: Cannot use macro since this is a value.s not a value.ul */ if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_GROUP_NAME)) { - if (VIR_STRDUP(info.group_name, params->value.s) < 0) + if (VIR_STRDUP(info.group_name, param->value.s) < 0) goto endjob; set_fields |= QEMU_BLOCK_IOTUNE_SET_GROUP_NAME; if (virTypedParamsAddString(&eventParams, &eventNparams, -- 2.12.2

3 3

[libvirt] [PATCH v2] Regression: Report correct CPUs present on executing virsh nodecpumap
by Nitesh Konkar 25 May '17

25 May '17

On executing the virsh nodecpumap command, the number of CPUs present was shown as (last cpu online id + 1). This patch fixes the issue by reporting the current number of CPUs present. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/util/virhostcpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index aa9cfeac2..6d7e8b4f4 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -1093,7 +1093,7 @@ virHostCPUGetMap(unsigned char **cpumap, if (online) *online = virBitmapCountBits(cpus); - ret = virBitmapSize(cpus); + ret = virHostCPUParseCountLinux(); cleanup: if (ret < 0 && cpumap) -- 2.11.0

3 3

Re: [libvirt] [PATCH v2] Regression: Report correct CPUs present on executing virsh nodecpumap
by Nitesh Konkar 25 May '17

25 May '17

Yes I did, limited to my knowledge. On Thu, May 25, 2017 at 2:08 PM, Nitesh Konkar < niteshkonkar.libvirt(a)gmail.com> wrote: > Yes I did. > > On Thu, May 25, 2017 at 2:07 PM, Peter Krempa <pkrempa(a)redhat.com> wrote: > >> On Thu, May 25, 2017 at 14:04:16 +0530, Nitesh Konkar wrote: >> > On executing the virsh nodecpumap command, the number >> > of CPUs present was shown as (last cpu online id + 1). This >> > patch fixes the issue by reporting the current number of >> > CPUs present. >> > >> > Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> >> > --- >> > src/util/virhostcpu.c | 2 +- >> > 1 file changed, 1 insertion(+), 1 deletion(-) >> >> Did you test it? I did not. >> > >

1 0

[libvirt] [PATCH] Regression: Report correct CPUs present on executing virsh nodecpumap
by Nitesh Konkar 25 May '17

25 May '17

Recent changes to virbitmap.c file created a regression where on executing the virsh nodecpumap command, the number of CPUs present was shown as (last cpu online id + 1). This patch fixes the issue. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/Makefile.am | 2 ++ src/util/virbitmap.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index f95f30e2f..96c541c9c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3303,6 +3303,8 @@ libvirt_nss_la_SOURCES = \ util/viratomic.h \ util/virbitmap.c \ util/virbitmap.h \ + util/virhostcpu.c \ + util/virhostcpu.h \ util/virbuffer.c \ util/virbuffer.h \ util/vircommand.c \ diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index eac63d997..dc427f430 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -37,6 +37,7 @@ #include "count-one-bits.h" #include "virstring.h" #include "virerror.h" +#include "virhostcpu.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -565,9 +566,14 @@ virBitmapParseUnlimited(const char *str) const char *cur = str; char *tmp; size_t i; - int start, last; + int start, last, bitmapSize; + + bitmapSize = virHostCPUGetCount(); + + if (bitmapSize < 0) + return NULL; - if (!(bitmap = virBitmapNewEmpty())) + if (!(bitmap = virBitmapNew(bitmapSize))) return NULL; if (!str) -- 2.11.0

3 4

[libvirt] [PATCH v2] lib: Add note that bulk stats API queries may overrun RPC buffers
by Peter Krempa 25 May '17

25 May '17

Hint that the users should limit the number of VMs queried in the bulk stats API. --- v2: - added a suggestion of the number of queried VMs (valid after bump to 32M message) src/libvirt-domain.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 310b91b37..aef061943 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11315,6 +11315,10 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * VIR_CONNECT_GET_ALL_DOMAINS_STATS_SHUTOFF and/or * VIR_CONNECT_GET_ALL_DOMAINS_STATS_OTHER for all other states. * + * Note that this API is prone to exceeding maximum RPC message size on hosts + * with lots of VMs so it's suggested to use virDomainListGetStats with a + * reasonable list of VMs as the argument. + * * Returns the count of returned statistics structures on success, -1 on error. * The requested data are returned in the @retStats parameter. The returned * array should be freed by the caller. See virDomainStatsRecordListFree. @@ -11386,6 +11390,10 @@ virConnectGetAllDomainStats(virConnectPtr conn, * Note that any of the domain list filtering flags in @flags may be rejected * by this function. * + * Note that this API is prone to exceeding maximum RPC if querying too many VMs + * with lots of statistics. It's suggested to query in batches of 10VMs, which + * should be good enough for VMs with 3000 disks + networks. + * * Returns the count of returned statistics structures on success, -1 on error. * The requested data are returned in the @retStats parameter. The returned * array should be freed by the caller. See virDomainStatsRecordListFree. -- 2.12.2

4 22

[libvirt] [V4 RESEND PATCH] Expose resource control capabilites on cache bank
by Eli Qiao 25 May '17

25 May '17

* This patch amends the cache bank capability as follow: <cache> <bank id='0' level='3' type='unified' size='15360' unit='KiB' cpus='0-5'> <control min='768' unit='KiB' scope='both' max_allocation='4'/> </bank> <bank id='1' level='3' type='unified' size='15360' unit='KiB' cpus='6-11'> <control min='768' unit='KiB' scope='both' max_allocation='4'/> </bank> </cache> For CDP enabled on x86 arch, we will have: <cache> <bank id='0' level='3' type='unified' size='15360' unit='KiB' cpus='0-5'> <control min='768' unit='KiB' scope='code' max_allocation='4'/> <control min='768' unit='KiB' scope='data' max_allocation='4'/> </bank> ... * Added a new testdata directory `linux-resctrl-cdp` to test CDP enabled case. * Along with vircaps2xmltest case updated. Signed-off-by: Eli Qiao <liyong.qiao(a)intel.com> --- docs/schemas/capability.rng | 20 +++ src/conf/capabilities.c | 138 ++++++++++++++++++++- src/conf/capabilities.h | 12 ++ .../vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus | 1 + .../linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask | 1 + .../resctrl/info/L3CODE/min_cbm_bits | 1 + .../resctrl/info/L3CODE/num_closids | 1 + .../linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask | 1 + .../resctrl/info/L3DATA/min_cbm_bits | 1 + .../resctrl/info/L3DATA/num_closids | 1 + .../linux-resctrl-cdp/resctrl/manualres/cpus | 1 + .../linux-resctrl-cdp/resctrl/manualres/schemata | 2 + .../linux-resctrl-cdp/resctrl/manualres/tasks | 0 .../linux-resctrl-cdp/resctrl/schemata | 2 + .../linux-resctrl-cdp/resctrl/tasks | 0 tests/vircaps2xmldata/linux-resctrl-cdp/system | 1 + .../vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml | 55 ++++++++ tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 8 +- tests/vircaps2xmltest.c | 10 +- 19 files changed, 252 insertions(+), 4 deletions(-) create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/cpus create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/schemata create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/tasks create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks create mode 120000 tests/vircaps2xmldata/linux-resctrl-cdp/system create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index 26f0aa2..927fc18 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -277,6 +277,26 @@ <attribute name='cpus'> <ref name='cpuset'/> </attribute> + <zeroOrMore> + <element name='control'> + <attribute name='min'> + <ref name='unsignedInt'/> + </attribute> + <attribute name='unit'> + <ref name='unit'/> + </attribute> + <attribute name='scope'> + <choice> + <value>both</value> + <value>code</value> + <value>data</value> + </choice> + </attribute> + <attribute name='max_allocation'> + <ref name='unsignedInt'/> + </attribute> + </element> + </zeroOrMore> </element> </oneOrMore> </element> diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index a91a72a..0888605 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -51,6 +51,7 @@ #define VIR_FROM_THIS VIR_FROM_CAPABILITIES #define SYSFS_SYSTEM_PATH "/sys/devices/system" +#define SYSFS_RESCTRL_PATH "/sys/fs/resctrl" VIR_LOG_INIT("conf.capabilities") @@ -872,6 +873,9 @@ virCapabilitiesFormatCaches(virBufferPtr buf, virCapsHostCacheBankPtr *caches) { size_t i = 0; + size_t j = 0; + int indent = virBufferGetIndent(buf, false); + virBuffer controlBuf = VIR_BUFFER_INITIALIZER; if (!ncaches) return 0; @@ -893,13 +897,35 @@ virCapabilitiesFormatCaches(virBufferPtr buf, */ virBufferAsprintf(buf, "<bank id='%u' level='%u' type='%s' " - "size='%llu' unit='%s' cpus='%s'/>\n", + "size='%llu' unit='%s' cpus='%s'", bank->id, bank->level, virCacheTypeToString(bank->type), bank->size >> (kilos * 10), kilos ? "KiB" : "B", cpus_str); + virBufferAdjustIndent(&controlBuf, indent + 4); + for (j = 0; j < bank->ncontrols; j++) { + bool min_kilos = !(bank->controls[j]->min % 1024); + virBufferAsprintf(&controlBuf, + "<control min='%llu' unit='%s' " + "scope='%s' max_allocation='%u'/>\n", + bank->controls[j]->min >> (min_kilos * 10), + min_kilos ? "KiB" : "B", + virCacheTypeToString(bank->controls[j]->scope), + bank->controls[j]->max_allocation); + } + + if (virBufferUse(&controlBuf)) { + virBufferAddLit(buf, ">\n"); + virBufferAddBuffer(buf, &controlBuf); + virBufferAddLit(buf, "</bank>\n"); + + } else { + virBufferAddLit(buf, "/>\n"); + } + + virBufferFreeAndReset(&controlBuf); VIR_FREE(cpus_str); } @@ -1519,13 +1545,102 @@ virCapsHostCacheBankEquals(virCapsHostCacheBankPtr a, void virCapsHostCacheBankFree(virCapsHostCacheBankPtr ptr) { + size_t i; + if (!ptr) return; virBitmapFree(ptr->cpus); + for (i = 0; i < ptr->ncontrols; i++) + VIR_FREE(ptr->controls[i]); + VIR_FREE(ptr->controls); VIR_FREE(ptr); } +/* test which TYPE of cache control supported + * -1: don't support + * 0: cat + * 1: cdp + */ +static int +virCapabilitiesGetCacheControlType(virCapsHostCacheBankPtr bank) +{ + int ret = -1; + char *path = NULL; + if (virAsprintf(&path, + SYSFS_RESCTRL_PATH "/info/L%u", + bank->level) < 0) + return -1; + + if (virFileExists(path)) { + ret = 0; + } else { + VIR_FREE(path); + /* for CDP enabled case, CODE and DATA will show together */ + if (virAsprintf(&path, + SYSFS_RESCTRL_PATH "/info/L%uCODE", + bank->level) < 0) + return -1; + if (virFileExists(path)) + ret = 1; + } + + VIR_FREE(path); + return ret; +} + +static int +virCapabilitiesGetCacheControl(virCapsHostCacheBankPtr bank, + virCacheType scope) +{ + int ret = -1; + char *path = NULL; + char *cbm_mask = NULL; + char *type_upper = NULL; + virCapsHostCacheControlPtr control; + + if (VIR_ALLOC(control) < 0) + goto cleanup; + + if ((scope > VIR_CACHE_TYPE_BOTH) + && (virStringToUpper(&type_upper, virCacheTypeToString(scope)) < 0)) + goto cleanup; + + if (virFileReadValueUint(&control->max_allocation, + SYSFS_RESCTRL_PATH "/info/L%u%s/num_closids", + bank->level, + type_upper ? type_upper : "") < 0) + goto cleanup; + + if (virFileReadValueString(&cbm_mask, + SYSFS_RESCTRL_PATH + "/info/L%u%s/cbm_mask", + bank->level, + type_upper ? type_upper: "") < 0) + goto cleanup; + + virStringTrimOptionalNewline(cbm_mask); + + /* cbm_mask: cache bit mask, it's in hex, eg: fffff */ + control->min = bank->size / (strlen(cbm_mask) * 4); + + control->scope = scope; + + if (VIR_APPEND_ELEMENT(bank->controls, + bank->ncontrols, + control) < 0) + goto cleanup; + + ret = 0; + + cleanup: + VIR_FREE(path); + VIR_FREE(cbm_mask); + VIR_FREE(type_upper); + VIR_FREE(control); + return ret; +} + int virCapabilitiesInitCaches(virCapsPtr caps) { @@ -1534,6 +1649,7 @@ virCapabilitiesInitCaches(virCapsPtr caps) ssize_t pos = -1; DIR *dirp = NULL; int ret = -1; + int typeret; char *path = NULL; char *type = NULL; struct dirent *ent = NULL; @@ -1609,6 +1725,26 @@ virCapabilitiesInitCaches(virCapsPtr caps) SYSFS_SYSTEM_PATH, pos, ent->d_name) < 0) goto cleanup; + typeret = virCapabilitiesGetCacheControlType(bank); + + if ((bank->level >= cache_min_level) || (typeret >= 0)) { + if (typeret == 0) { + if (virCapabilitiesGetCacheControl(bank, + VIR_CACHE_TYPE_BOTH) < 0) + goto cleanup; + } else if (typeret == 1) { + if ((virCapabilitiesGetCacheControl(bank, + VIR_CACHE_TYPE_CODE) < 0) || + (virCapabilitiesGetCacheControl(bank, + VIR_CACHE_TYPE_DATA) < 0)) + goto cleanup; + } + } else { + virCapsHostCacheBankFree(bank); + bank = NULL; + continue; + } + kernel_type = virCacheKernelTypeFromString(type); if (kernel_type < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index a8cccf7..598016d 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -146,6 +146,16 @@ typedef enum { VIR_CACHE_TYPE_LAST } virCacheType; +VIR_ENUM_DECL(virResctrlCache); + +typedef struct _virCapsHostCacheControl virCapsHostCacheControl; +typedef virCapsHostCacheControl *virCapsHostCacheControlPtr; +struct _virCapsHostCacheControl { + unsigned long long min; /* minimum cache control size in B */ + virCacheType scope; /* data, code or both */ + unsigned int max_allocation; /* max number of supported allocations */ +}; + VIR_ENUM_DECL(virCache); typedef struct _virCapsHostCacheBank virCapsHostCacheBank; @@ -156,6 +166,8 @@ struct _virCapsHostCacheBank { unsigned long long size; /* B */ virCacheType type; /* Data, Instruction or Unified */ virBitmapPtr cpus; /* All CPUs that share this bank */ + size_t ncontrols; + virCapsHostCacheControlPtr *controls; }; typedef struct _virCapsHost virCapsHost; diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus new file mode 100644 index 0000000..b3a79aa --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus @@ -0,0 +1 @@ +ffffff,ffffffff,ffffffff diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask new file mode 100755 index 0000000..78031da --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask @@ -0,0 +1 @@ +fffff diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits new file mode 100755 index 0000000..d00491f --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids new file mode 100755 index 0000000..45a4fb7 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids @@ -0,0 +1 @@ +8 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask new file mode 100755 index 0000000..78031da --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask @@ -0,0 +1 @@ +fffff diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits new file mode 100755 index 0000000..d00491f --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids new file mode 100755 index 0000000..45a4fb7 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids @@ -0,0 +1 @@ +8 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/cpus b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/cpus new file mode 100644 index 0000000..ede4cc2 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/cpus @@ -0,0 +1 @@ +000000,00000000,00000000 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/schemata b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/schemata new file mode 100644 index 0000000..a0ef381 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/schemata @@ -0,0 +1,2 @@ +L3DATA:0=c0000;1=c0000 +L3CODE:0=30000;1=30000 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/tasks b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/tasks new file mode 100644 index 0000000..e69de29 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata new file mode 100644 index 0000000..89dc76b --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata @@ -0,0 +1,2 @@ +L3DATA:0=fffff;1=fffff +L3CODE:0=fffff;1=fffff diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks new file mode 100644 index 0000000..e69de29 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/system b/tests/vircaps2xmldata/linux-resctrl-cdp/system new file mode 120000 index 0000000..2f3a1d9 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/system @@ -0,0 +1 @@ +../linux-resctrl/system/ \ No newline at end of file diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml new file mode 100644 index 0000000..c9f460d --- /dev/null +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml @@ -0,0 +1,55 @@ +<capabilities> + + <host> + <cpu> + <arch>x86_64</arch> + </cpu> + <power_management/> + <migration_features> + <live/> + </migration_features> + <topology> + <cells num='2'> + <cell id='0'> + <memory unit='KiB'>1048576</memory> + <pages unit='KiB' size='4'>2048</pages> + <pages unit='KiB' size='2048'>4096</pages> + <pages unit='KiB' size='1048576'>6144</pages> + <cpus num='6'> + <cpu id='0' socket_id='0' core_id='0' siblings='0'/> + <cpu id='1' socket_id='0' core_id='1' siblings='1'/> + <cpu id='2' socket_id='0' core_id='2' siblings='2'/> + <cpu id='3' socket_id='0' core_id='3' siblings='3'/> + <cpu id='4' socket_id='0' core_id='4' siblings='4'/> + <cpu id='5' socket_id='0' core_id='5' siblings='5'/> + </cpus> + </cell> + <cell id='1'> + <memory unit='KiB'>2097152</memory> + <pages unit='KiB' size='4'>4096</pages> + <pages unit='KiB' size='2048'>6144</pages> + <pages unit='KiB' size='1048576'>8192</pages> + <cpus num='6'> + <cpu id='6' socket_id='1' core_id='0' siblings='6'/> + <cpu id='7' socket_id='1' core_id='1' siblings='7'/> + <cpu id='8' socket_id='1' core_id='2' siblings='8'/> + <cpu id='9' socket_id='1' core_id='3' siblings='9'/> + <cpu id='10' socket_id='1' core_id='4' siblings='10'/> + <cpu id='11' socket_id='1' core_id='5' siblings='11'/> + </cpus> + </cell> + </cells> + </topology> + <cache> + <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'> + <control min='768' unit='KiB' scope='code' max_allocation='8'/> + <control min='768' unit='KiB' scope='data' max_allocation='8'/> + </bank> + <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'> + <control min='768' unit='KiB' scope='code' max_allocation='8'/> + <control min='768' unit='KiB' scope='data' max_allocation='8'/> + </bank> + </cache> + </host> + +</capabilities> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml index 6677791..04a5eb8 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml @@ -41,8 +41,12 @@ </cells> </topology> <cache> - <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'/> - <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'/> + <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'> + <control min='768' unit='KiB' scope='both' max_allocation='4'/> + </bank> + <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'> + <control min='768' unit='KiB' scope='both' max_allocation='4'/> + </bank> </cache> </host> diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index 137598e..c5887af 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -47,6 +47,7 @@ test_virCapabilities(const void *opaque) char *capsXML = NULL; char *path = NULL; char *dir = NULL; + char *resctrl = NULL; int ret = -1; /* @@ -58,7 +59,12 @@ test_virCapabilities(const void *opaque) data->resctrl ? "/system" : "") < 0) goto cleanup; - virFileWrapperAddPrefix("/sys/devices/system", dir); + if (virAsprintf(&resctrl, "%s/vircaps2xmldata/linux-%s/resctrl", + abs_srcdir, data->filename) < 0) + goto cleanup; + +virFileWrapperAddPrefix("/sys/devices/system", dir); +virFileWrapperAddPrefix("/sys/fs/resctrl", resctrl); caps = virCapabilitiesNew(data->arch, data->offlineMigrate, data->liveMigrate); if (!caps) @@ -84,6 +90,7 @@ test_virCapabilities(const void *opaque) cleanup: VIR_FREE(dir); + VIR_FREE(resctrl); VIR_FREE(path); VIR_FREE(capsXML); virObjectUnref(caps); @@ -112,6 +119,7 @@ mymain(void) DO_TEST("caches", VIR_ARCH_X86_64); DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true, true); + DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true, true); return ret; } -- 1.9.1

1 0

[libvirt] [PATCH 0/2] Fix issue with attempting to use polkit
by John Ferlan 25 May '17

25 May '17

The "issue" is when using a remote URI and authn when attempting to connect to the local system when a local URI and usage of pkttyagent was "expected" for local authn. The current bug is: https://bugzilla.redhat.com/show_bug.cgi?id=1374126 which was "forked off" from: https://bugzilla.redhat.com/show_bug.cgi?id=986365 which added the support for pkttyagent processing for "local" authn when the GUI option wasn't available (e.g. when ssh@localhost, run virsh) in order to perform the authn of the user. This is one of those "either" patch 1 or patch 2 will fix the problem, but I really couldn't decide which I liked better. I'm leaning towards the second one only because of the one authn failure; however, I'm not sure I like the escape path comparison to ":///". With only the first patch one would get two challenge/responses before failure, e.g.: $ virsh -c qemu+ssh://someuser@localhost/system list --all someuser@localhost's password: someuser@localhost's password: error: failed to connect to the hypervisor error: authentication unavailable: no polkit agent available to authenticate action 'org.libvirt.unix.manage' $ With the second patch one would get one challenge/reponse before failure e.g.: $ virsh -c qemu+ssh://someuser@localhost/system list --all someuser@localhost's password: error: failed to connect to the hypervisor error: authentication unavailable: no polkit agent available to authenticate action 'org.libvirt.unix.manage' $ Going with #2 restores essentially older (e.g. 1.3.4) processing when the pkttyagent processing loop didn't exist. The challenge/response in either case comes from ssh and is successful; however, code in remoteDispatchAuthList doesn't let a non root user to take this URI option for a local authn/authz because the callerUid is not 0 (root). Although, I suppose it would be possible to check whether the @callerUid was authorized (e.g. part of some group), but that I think "outside" the scope of what the bz is reporting, so I didn't take that route. The reality is the bug is mostly a problem for non UI type processing where providing that ctrl-c to quit isn't as likely/possible. John Ferlan (2): virsh: Track when create pkttyagent virsh: Don't attempt polkit processing for non local authn/authz tools/virsh.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 2.9.3

2 8

[libvirt] [PATCH] usb: keep leading zeros of vendor/product id in USB device
by Chen Hanxiao 24 May '17

24 May '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Some vendor id or product id may have leading zeros. We should show them. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/util/virusb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/virusb.c b/src/util/virusb.c index 8cd2f57..6359235 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -221,7 +221,7 @@ virUSBDeviceFindByVendor(unsigned int vendor, if (list->count == 0) { virObjectUnref(list); if (!mandatory) { - VIR_DEBUG("Did not find USB device %x:%x", + VIR_DEBUG("Did not find USB device %04x:%04x", vendor, product); if (devices) *devices = NULL; @@ -229,7 +229,7 @@ virUSBDeviceFindByVendor(unsigned int vendor, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Did not find USB device %x:%x"), vendor, product); + _("Did not find USB device %04x:%04x"), vendor, product); return -1; } @@ -300,7 +300,7 @@ virUSBDeviceFind(unsigned int vendor, if (list->count == 0) { virObjectUnref(list); if (!mandatory) { - VIR_DEBUG("Did not find USB device %x:%x bus:%u device:%u", + VIR_DEBUG("Did not find USB device %04x:%04x bus:%u device:%u", vendor, product, bus, devno); if (usb) *usb = NULL; @@ -308,7 +308,7 @@ virUSBDeviceFind(unsigned int vendor, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Did not find USB device %x:%x bus:%u device:%u"), + _("Did not find USB device %04x:%04x bus:%u device:%u"), vendor, product, bus, devno); return -1; } -- 2.7.4

2 2

[libvirt] [PATCH 00/13] Make the virNodeDeviceObjPtr private
by John Ferlan 24 May '17

24 May '17

All part of the effort I have to have a common object model. This series is node device test, driver, and virnodedevobj related. There's also a couple of bug fixes at the beginning of the series from things I have found during this effort. There's still a few more patches in local branches to make the virNodeDeviceObjListPtr private as well, but those have some merge needs with other patches currently on list elsewhere, so I'll hold onto them for now. John Ferlan (13): test: Adjust cleanup/error paths for nodedev test APIs nodedev: Fix locking in virNodeDeviceObjRemove nodedev: Need to check for vport capable scsi_host for vHBA searches nodedev: Move node_device_linux_sysfs from node_driver to conf nodedev: Use common naming for virnodedeviceobj nodedev: Cleanup driver code and prototypes nodedev: Alter param to nodeDeviceUpdateDriverName nodedev: Alter param to nodeDeviceUpdateCaps nodedev: Create helper for finding by name in driver nodedev: Use consistent names for driver variables nodedev: Introduce virNodeDeviceObjGetDef nodedev: Remove privateData from virNodeDeviceObj nodedev: Introduce virNodeDeviceObjNew src/Makefile.am | 8 +- src/conf/node_device_conf.h | 2 - .../node_device_linux_sysfs.c | 24 +- .../node_device_linux_sysfs.h | 9 +- src/conf/virnodedeviceobj.c | 170 ++++++----- src/conf/virnodedeviceobj.h | 2 + src/libvirt_private.syms | 6 + src/node_device/node_device_driver.c | 235 +++++++-------- src/node_device/node_device_driver.h | 93 ++++-- src/node_device/node_device_hal.c | 60 ++-- src/node_device/node_device_udev.c | 323 ++++++++++++--------- src/test/test_driver.c | 113 ++++--- 12 files changed, 576 insertions(+), 469 deletions(-) rename src/{node_device => conf}/node_device_linux_sysfs.c (89%) rename src/{node_device => conf}/node_device_linux_sysfs.h (82%) -- 2.9.3

3 21

[libvirt] [PATCH 0/2] Add eim attribute to iommu device
by Ján Tomko 24 May '17

24 May '17

Extended interrupt mode allows >255 vCPUs with q35-based machine types. https://bugzilla.redhat.com/show_bug.cgi?id=1451282 Ján Tomko (2): conf: add eim attribute to <iommu><driver> qemu: format eim on intel-iommu command line docs/formatdomain.html.in | 10 +++++++ docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 20 ++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 ++++++++ src/qemu/qemu_domain.c | 20 ++++++++++++++ tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../qemuxml2argv-intel-iommu-eim.args | 19 +++++++++++++ .../qemuxml2argv-intel-iommu-eim.xml | 31 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 7 +++++ .../qemuxml2xmlout-intel-iommu-eim.xml | 1 + tests/qemuxml2xmltest.c | 1 + 15 files changed, 131 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-eim.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-eim.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-eim.xml -- 2.10.2

2 5

[libvirt] [PATCH python] Fix error check for virDomainGetTime method
by Daniel P. Berrange 24 May '17

24 May '17

The virDomainGetTime returns either a dict or None, but the python glue layer for checking for '-1'. Thus it failed to raise an exception on error. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-override-virDomain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-override-virDomain.py b/libvirt-override-virDomain.py index fa5f75f..7c417b8 100644 --- a/libvirt-override-virDomain.py +++ b/libvirt-override-virDomain.py @@ -63,7 +63,7 @@ def getTime(self, flags=0): """Extract information about guest time """ ret = libvirtmod.virDomainGetTime(self._o, flags) - if ret == -1: raise libvirtError ('virDomainGetTime() failed', dom=self) + if ret == None: raise libvirtError ('virDomainGetTime() failed', dom=self) return ret def setTime(self, time=None, flags=0): -- 2.9.3

2 1

[libvirt] [PATCH] conf: Resolve corner case on fc_host deletion
by John Ferlan 24 May '17

24 May '17

https://bugzilla.redhat.com/show_bug.cgi?id=1420740 Testing found an inventive way to cause an error at shutdown by providing the parent name for the fc host creation using the "same name" as the HBA. Since the code thus assumed the parent host name provided was the parent HBA and just extracted out the host number and sent that along to the vport_destroy this avoided checks made for equality. So just add the equality check to that path to resolve. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/conf/node_device_conf.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 85cfd83..3f995da 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2127,17 +2127,25 @@ virNodeDeviceDeleteVport(virConnectPtr conn, goto cleanup; } + if (virAsprintf(&scsi_host_name, "scsi_%s", name) < 0) + goto cleanup; + /* If at startup time we provided a parent, then use that to * get the parent_host value; otherwise, we have to determine * the parent scsi_host which we did not save at startup time */ if (fchost->parent) { + /* Someone provided a parent string at startup time that + * was the same as the scsi_host - meaning we have a pool + * backed to an HBA, so there won't be a vHBA to delete */ + if (STREQ(scsi_host_name, fchost->parent)) { + ret = 0; + goto cleanup; + } + if (virSCSIHostGetNumber(fchost->parent, &parent_host) < 0) goto cleanup; } else { - if (virAsprintf(&scsi_host_name, "scsi_%s", name) < 0) - goto cleanup; - if (!(vhba_parent = virNodeDeviceGetParentName(conn, scsi_host_name))) goto cleanup; -- 2.9.3

2 3