July 2017 - Devel - libvirt List Archives

[Libvir] Hang with virt-install graphic=no on FC 6 6.93/F7 RC2
by libvirtuser 23 Dec '25

23 Dec '25

I had this problem and another user confirmed the same behavior on his machine: http://pastie.caboo.se/65417 Haven't tried it with *2925.10* yet. Also, is there a way to get more verbose info about what calls are causing the "configuration file syntax error" errors? Thanks. virt-install How large would you like the disk () to be (in gigabytes)? 4 ERROR: Must provide a file, not a directory for the disk What would you like to use as the disk (path)? /xen/images/x6.img Would you like to enable graphics support? (yes or no) no What is the install location? http://mirror.anl.gov/pub/fedora-linux-core/test/6.93/Fedora/i386/os/ Starting install... libvir: Xen Daemon error : GET operation failed: libvir: error : configuration file syntax error: expecting a name libvir: error : configuration file syntax error: expecting a name libvir: error : configuration file syntax error: expecting a name Retrieving Fedora... 276 kB 00:01 Retrieving vmlinuz... 100% |=========================| 2.1 MB 00:16 Retrieving initrd.img... 100% |=========================| 5.4 MB 00:28 libvir: Xen Daemon error : GET operation failed: libvir: error : configuration file syntax error: expecting a name libvir: error : configuration file syntax error: expecting a name libvir: error : configuration file syntax error: expecting a name Creating domain... 0 B 00:06 Linux version 2.6.20-2925.5.fc7xen (brewbuilder(a)ls20-bc1-14.build.redhat.com) (gcc version 4.1.2 20070317 (Red Hat 4.1.2-5)) #1 SMP Thu Mar 22 13:51:38 EDT 2007 BIOS-provided physical RAM map: sanitize start sanitize bail 0 copy_e820_map() start: 0000000000000000 size: 0000000020800000 end: 0000000020800000 type: 1 Xen: 0000000000000000 - 0000000020800000 (usable) 0MB HIGHMEM available. 520MB LOWMEM available. Using x86 segment limits to approximate NX protection Zone PFN ranges: DMA 0 -> 133120 Normal 133120 -> 133120 HighMem 133120 -> 133120 early_node_map[1] active PFN ranges 0: 0 -> 133120 ACPI in unprivileged domain disabled Built 1 zonelists. Total pages: 132080 Kernel command line: method=http://mirror.anl.gov/pub/fedora-linux-core/test/6.93/Fedora/i386/os/ Enabling fast FPU save and restore... done. Enabling unmasked SIMD FPU exception support... done. Initializing CPU#0 CPU 0 irqstacks, hard=c135f000 soft=c133f000 PID hash table entries: 4096 (order: 12, 16384 bytes) Xen reported: 1694.994 MHz processor. Console: colour dummy device 80x25 Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar ... MAX_LOCKDEP_SUBCLASSES: 8 ... MAX_LOCK_DEPTH: 30 ... MAX_LOCKDEP_KEYS: 2048 ... CLASSHASH_SIZE: 1024 ... MAX_LOCKDEP_ENTRIES: 8192 ... MAX_LOCKDEP_CHAINS: 16384 ... CHAINHASH_SIZE: 8192 memory used by lock dependency info: 1064 kB per task-struct memory footprint: 1200 bytes Dentry cache hash table entries: 131072 (order: 7, 524288 bytes) Inode-cache hash table entries: 65536 (order: 6, 262144 bytes) Software IO TLB disabled vmalloc area: e1000000-f4ffe000, maxmem 2d7fe000 Memory: 503936k/532480k available (2030k kernel code, 19948k reserved, 1079k data, 180k init, 0k highmem) virtual kernel memory layout: fixmap : 0xf5315000 - 0xf57fe000 (5028 kB) pkmap : 0xf5000000 - 0xf5200000 (2048 kB) vmalloc : 0xe1000000 - 0xf4ffe000 ( 319 MB) lowmem : 0xc0000000 - 0xe0800000 ( 520 MB) .init : 0xc130e000 - 0xc133b000 ( 180 kB) .data : 0xc11fb9d9 - 0xc1309714 (1079 kB) .text : 0xc1000000 - 0xc11fb9d9 (2030 kB) Checking if this processor honours the WP bit even in supervisor mode... Ok. Calibrating delay using timer specific routine.. 4262.67 BogoMIPS (lpj=8525343) Security Framework v1.0.0 initialized SELinux: Initializing. SELinux: Starting in permissive mode selinux_register_security: Registering secondary module capability Capability LSM initialized as secondary Mount-cache hash table entries: 512 CPU: Trace cache: 12K uops, L1 D cache: 8K CPU: L2 cache: 256K Checking 'hlt' instruction... OK. SMP alternatives: switching to UP code Freeing SMP alternatives: 11k freed Brought up 1 CPUs Grant table initialized NET: Registered protocol family 16 Brought up 1 CPUs PCI: Fatal: No config space access function found PCI: setting up Xen PCI frontend stub Setting up standard PCI resources ACPI: Interpreter disabled. Linux Plug and Play Support v0.97 (c) Adam Belay pnp: PnP ACPI: disabled xen_mem: Initialising balloon driver. usbcore: registered new interface driver usbfs usbcore: registered new interface driver hub usbcore: registered new device driver usb PCI: System does not support PCI PCI: System does not support PCI NetLabel: Initializing NetLabel: domain hash size = 128 NetLabel: protocols = UNLABELED CIPSOv4 NetLabel: unlabeled traffic allowed by default NET: Registered protocol family 2 IP route cache hash table entries: 32768 (order: 5, 131072 bytes) TCP established hash table entries: 131072 (order: 10, 4194304 bytes) TCP bind hash table entries: 65536 (order: 9, 2097152 bytes) TCP: Hash tables configured (established 131072 bind 65536) TCP reno registered checking if image is initramfs... it is Freeing initrd memory: 7256k freed IA-32 Microcode Update Driver: v1.14-xen <tigran(a)veritas.com> audit: initializing netlink socket (disabled) audit(1180379657.981:1): initialized VFS: Disk quotas dquot_6.5.1 Dquot-cache hash table entries: 1024 (order 0, 4096 bytes) SELinux: Registering netfilter hooks io scheduler noop registered io scheduler anticipatory registered io scheduler deadline registered io scheduler cfq registered (default) pci_hotplug: PCI Hot Plug PCI Core version: 0.5 BUG: at kernel/fork.c:994 copy_process() [<c1005d9a>] show_trace_log_lvl+0x1a/0x2f [<c1006343>] show_trace+0x12/0x14 [<c10063be>] dump_stack+0x16/0x18 [<c101d044>] copy_process+0x195/0x1245 [<c101e144>] do_fork+0x50/0x117 [<c1003351>] kernel_thread+0x8e/0x96 [<c102c701>] __call_usermodehelper+0x2d/0x46 [<c102cd4f>] run_workqueue+0x89/0x145 [<c102d711>] worker_thread+0xd5/0x102 [<c102ff27>] kthread+0xb3/0xdc [<c10058db>] kernel_thread_helper+0x7/0x10 ======================= rtc: IRQ 8 is not free. Non-volatile memory driver v1.2 Linux agpgart interface v0.101 (c) Dave Jones RAMDISK driver initialized: 16 RAM disks of 16384K size 4096 blocksize input: Macintosh mouse button emulation as /class/input/input0 Xen virtual console successfully installed as xvc0 Event-channel device installed. usbcore: registered new interface driver libusual usbcore: registered new interface driver hiddev usbcore: registered new interface driver usbhid drivers/usb/input/hid-core.c: v2.6:USB HID core driver PNP: No PS/2 controller found. Probing ports directly. i8042.c: No controller found. mice: PS/2 mouse device common for all mice TCP bic registered Initializing XFRM netlink socket NET: Registered protocol family 1 NET: Registered protocol family 17 Using IPI No-Shortcut mode XENBUS: Device with no driver: device/vbd/51712 XENBUS: Device with no driver: device/vif/0 Freeing unused kernel memory: 180k freed Write protecting the kernel read-only data: 762k ^[Domain installation still in progress. You can reconnect

2 1

[libvirt] [PATCH] Fix python error reporting for some storage operations
by Cole Robinson 07 Mar '25

07 Mar '25

In the python bindings, all vir* classes expect to be passed a virConnect object when instantiated. Before the storage stuff, these classes were only instantiated in virConnect methods, so the generator is hardcoded to pass 'self' as the connection instance to these classes. Problem is there are some methods that return pool or vol instances which aren't called from virConnect: you can lookup a storage volume's associated pool, and can lookup volumes from a pool. In these cases passing 'self' doesn't give the vir* instance a connection, so when it comes time to raise an exception crap hits the fan. Rather than rework the generator to accomodate this edge case, I just fixed the init functions for virStorage* to pull the associated connection out of the passed value if it's not a virConnect instance. Thanks, Cole diff --git a/python/generator.py b/python/generator.py index 01a17da..c706b19 100755 --- a/python/generator.py +++ b/python/generator.py @@ -962,8 +962,12 @@ def buildWrappers(): list = reference_keepers[classname] for ref in list: classes.write(" self.%s = None\n" % ref[1]) - if classname in [ "virDomain", "virNetwork", "virStoragePool", "virStorageVol" ]: + if classname in [ "virDomain", "virNetwork" ]: classes.write(" self._conn = conn\n") + elif classname in [ "virStorageVol", "virStoragePool" ]: + classes.write(" self._conn = conn\n" + \ + " if not isinstance(conn, virConnect):\n" + \ + " self._conn = conn._conn\n") classes.write(" if _obj != None:self._o = _obj;return\n") classes.write(" self._o = None\n\n"); destruct=None

4 3

[libvirt] [PATCH] Fix compile error for stable 1.2.9
by Yang hongyang 27 Oct '23

27 Oct '23

Seems a backport miss. An extra member is passed to struct virLXCBasicMountInfo. Signed-off-by: Yang hongyang <hongyang.yang(a)easystack.cn> --- src/lxc/lxc_container.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 28dabec..1c65fa9 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -760,7 +760,7 @@ typedef struct { static const virLXCBasicMountInfo lxcBasicMounts[] = { { "proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, - { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false, false, false }, + { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false, false }, { "sysfs", "/sys", "sysfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false, false }, { "securityfs", "/sys/kernel/security", "securityfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true, true }, #if WITH_SELINUX -- 1.7.1

3 2

[libvirt] [PATCH] web docs -- macvtap mode explanation
by Stefan Berger 27 Oct '23

27 Oct '23

This adds more information about the different macvtap device modes. Regards, Stefan

3 2

[libvirt] Supporting vhost-net and macvtap in libvirt for QEMU
by Anthony Liguori 27 Oct '23

27 Oct '23

Disclaimer: I am neither an SR-IOV nor a vhost-net expert, but I've CC'd people that are who can throw tomatoes at me for getting bits wrong :-) I wanted to start a discussion about supporting vhost-net in libvirt. vhost-net has not yet been merged into qemu but I expect it will be soon so it's a good time to start this discussion. There are two modes worth supporting for vhost-net in libvirt. The first mode is where vhost-net backs to a tun/tap device. This is behaves in very much the same way that -net tap behaves in qemu today. Basically, the difference is that the virtio backend is in the kernel instead of in qemu so there should be some performance improvement. Current, libvirt invokes qemu with -net tap,fd=X where X is an already open fd to a tun/tap device. I suspect that after we merge vhost-net, libvirt could support vhost-net in this mode by just doing -net vhost,fd=X. I think the only real question for libvirt is whether to provide a user visible switch to use vhost or to just always use vhost when it's available and it makes sense. Personally, I think the later makes sense. The more interesting invocation of vhost-net though is one where the vhost-net device backs directly to a physical network card. In this mode, vhost should get considerably better performance than the current implementation. I don't know the syntax yet, but I think it's reasonable to assume that it will look something like -net tap,dev=eth0. The effect will be that eth0 is dedicated to the guest. On most modern systems, there is a small number of network devices so this model is not all that useful except when dealing with SR-IOV adapters. In that case, each physical device can be exposed as many virtual devices (VFs). There are a few restrictions here though. The biggest is that currently, you can only change the number of VFs by reloading a kernel module so it's really a parameter that must be set at startup time. I think there are a few ways libvirt could support vhost-net in this second mode. The simplest would be to introduce a new tag similar to <source network='br0'>. In fact, if you probed the device type for the network parameter, you could probably do something like <source network='eth0'> and have it Just Work. Another model would be to have libvirt see an SR-IOV adapter as a network pool whereas it handled all of the VF management. Considering how inflexible SR-IOV is today, I'm not sure whether this is the best model. Has anyone put any more thought into this problem or how this should be modeled in libvirt? Michael, could you share your current thinking for -net syntax? -- Regards, Anthony Liguori

8 26

[libvirt] [PATCH v4 0/8] Virtio-crypto device support
by Longpeng(Mike) 19 Nov '18

19 Nov '18

As virtio-crypto has been supported in QEMU 2.8 and the frontend driver has been merged in linux 4.10, so it's necessary to support virtio-crypto in libvirt. --- Changes since v3: - spilt the capabilities part into a separate patch. [Boris] - include Boris's virtio-crypto ccw support(PATCH 6 & 8). [Boris] - add the missing capabilities in caps_2.9.0.x86_64.xml. [Boris] - fix Indentation and missing virDomainCryptoDefFree. [Marc] Changes since v2: - PATCH 1: modify docs as Martin & Boris's suggestion. [Martin & Boris] - PATCH 2: add the missing 'ToString'. [Martin] - PATCH 3: use virAsprintf instead of virBufferAsprintf. [Martin] remove pointless virBufferCheckError. [Martin] - rebase on master. [Longpeng] Changes since v1: - split patch [Martin] - rebase on master [Martin] - add docs/tests/schema [Martin] - fix typos [Gonglei] --- Boris Fiuczynski (2): qemu: virtio-crypto: add ccw support qemu: virtio-crypto: add test for ccw support Longpeng(Mike) (6): docs: schema: Add basic documentation for the virtual docs: news: Add virtio-crypto devices conf: Parse virtio-crypto in the domain XML caps: Add qemu capabilities about virtio-crypto qemu: Implement support for 'builtin' backend for virtio-crypto tests: Add testcase for virtio-crypto parsing docs/formatdomain.html.in | 61 ++++++ docs/news.xml | 10 + docs/schemas/domaincommon.rng | 30 +++ src/conf/domain_conf.c | 213 ++++++++++++++++++++- src/conf/domain_conf.h | 32 ++++ src/libvirt_private.syms | 5 + src/qemu/qemu_alias.c | 20 ++ src/qemu/qemu_alias.h | 3 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 130 +++++++++++++ src/qemu/qemu_command.h | 3 + src/qemu/qemu_domain_address.c | 25 +++ src/qemu/qemu_driver.c | 6 + src/qemu/qemu_hotplug.c | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 + .../qemuxml2argv-virtio-crypto-builtin.xml | 26 +++ .../qemuxml2argv-virtio-crypto-ccw.args | 22 +++ .../qemuxml2argv-virtio-crypto-ccw.xml | 16 ++ .../qemuxml2argv-virtio-crypto.args | 22 +++ tests/qemuxml2argvtest.c | 6 + .../qemuxml2xmlout-virtio-crypto-builtin.xml | 31 +++ tests/qemuxml2xmltest.c | 2 + 25 files changed, 679 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-crypto-builtin.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-crypto-ccw.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-crypto-ccw.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-crypto.args create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-crypto-builtin.xml -- 1.8.3.1

5 14

[libvirt] [PATCH] Let virt-manager 1.4.0+ work to access console of VM
by Bryan Quigley 19 Dec '17

19 Dec '17

Also see Ubuntu bug https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1668681 First reported https://askubuntu.com/questions/833964/virt-manager-cant-connect-to-graphic… --- examples/apparmor/libvirt-qemu | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index a9020aa..19d99e5 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -151,3 +151,6 @@ /etc/udev/udev.conf r, /sys/bus/ r, /sys/class/ r, + + # allow connect with openGraphicsFD to work + unix (send, receive) type=stream peer=(label=/usr/sbin/libvirtd), -- 2.10.2

3 5

[libvirt] [PATCH v2] vz: allow to start vz driver without host cache info
by Mikhail Feoktistov 07 Nov '17

07 Nov '17

Show warning message instead of fail operation. It happens if kernel or cpu doesn't support reporting cpu cache info. In case of Virtuozzo file "id" doesn't exist. --- src/vz/vz_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 6f4aee3..eb97e54 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -119,7 +119,7 @@ vzBuildCapabilities(void) goto error; if (virCapabilitiesInitCaches(caps) < 0) - goto error; + VIR_WARN("Failed to get host CPU cache info"); verify(ARRAY_CARDINALITY(archs) == ARRAY_CARDINALITY(emulators)); -- 1.8.3.1

2 5

[libvirt] Exposing mem-path in domain XML
by Michal Privoznik 23 Oct '17

23 Oct '17

Dear list, there is the following bug [1] which I'm not quite sure how to grasp. So there is this application/infrastructure called Kove [2] that allows you to have memory for your application stored on a distant host in network and basically fetch needed region on pagefault. Now imagine that somebody wants to use it for backing up domain memory. However, the way that the tool works is it has some kernel module and then some userland binary that is fed with the path of the mmaped file. I don't know all the details, but the point is, in order to let users use this we need to expose the paths for mem-path for the guest memory. I know we did not want to do this in the past, but now it looks like we don't have a way around it, do we? Michal 1: https://bugzilla.redhat.com/show_bug.cgi?id=1461214 2: http://kove.net

3 15

[libvirt] [libvirt-sandbox PATCH 0/2] virt-sandbox-image: unbreak start from library
by Guido Günther 15 Sep '17

15 Sep '17

This is basically a V2 of "Drop library/ from template name and image path" with Dan's comment implemented. Guido Günther (2): Drop library/ from image path Sanitize domain name libvirt-sandbox/image/cli.py | 8 ++++++-- libvirt-sandbox/image/sources/docker.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) -- 2.11.0

2 7

[libvirt] [PATCH] tpm: Use /dev/null for cancel path if none was found
by Stefan Berger 07 Sep '17

07 Sep '17

TPM 2 does not implement sysfs files for cancellation of commands. We therefore use /dev/null for the cancel path passed to QEMU. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/util/virtpm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 6d9b065..d5c10da 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -61,9 +61,7 @@ virTPMCreateCancelPath(const char *devpath) VIR_FREE(path); } if (!path) - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("No usable sysfs TPM cancel file could be " - "found")); + ignore_value(VIR_STRDUP(path, "/dev/null")); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("TPM device path %s is invalid"), devpath); -- 2.5.5

5 6

[libvirt] [PATCH v4 0/3] Add support for Veritas HyperScale (VxHS) block device protocol
by Ashish Mittal 29 Aug '17

29 Aug '17

From: Ashish Mittal <ashish.mittal(a)veritas.com> QEMU changes for VxHS (including TLS support) are already upstream. This series of patches adds support for VxHS block devices in libvirt. Patch 1 adds the base functionality for supporting VxHS protocol. Patch 2 adds two new configuration options in qemu.conf to enable TLS for VxHS devices. Patch 3 implements the main TLS functionality. Ashish Mittal (3): Add support for Veritas HyperScale (VxHS) block device protocol conf: Introduce TLS options for VxHS block device clients Add TLS support for Veritas HyperScale (VxHS) block device protocol docs/formatdomain.html.in | 31 ++++- docs/schemas/domaincommon.rng | 18 +++ src/conf/domain_conf.c | 19 +++ src/libxl/libxl_conf.c | 1 + src/qemu/libvirtd_qemu.aug | 4 + src/qemu/qemu.conf | 23 +++ src/qemu/qemu_command.c | 155 +++++++++++++++++++++ src/qemu/qemu_conf.c | 7 + src/qemu/qemu_conf.h | 3 + src/qemu/qemu_driver.c | 3 + src/qemu/qemu_parse_command.c | 25 ++++ src/qemu/test_libvirtd_qemu.aug.in | 2 + src/util/virstoragefile.c | 77 +++++++++- src/util/virstoragefile.h | 10 ++ src/xenconfig/xen_xl.c | 1 + .../qemuargv2xml-disk-drive-network-vxhs-fail.args | 24 ++++ tests/qemuargv2xmltest.c | 17 ++- ...ml2argv-disk-drive-network-tlsx509-err-vxhs.xml | 34 +++++ ...-disk-drive-network-tlsx509-multidisk-vxhs.args | 41 ++++++ ...k-drive-network-tlsx509-multidisk-vxhs.args.new | 41 ++++++ ...v-disk-drive-network-tlsx509-multidisk-vxhs.xml | 56 ++++++++ ...muxml2argv-disk-drive-network-tlsx509-vxhs.args | 28 ++++ ...emuxml2argv-disk-drive-network-tlsx509-vxhs.xml | 34 +++++ .../qemuxml2argv-disk-drive-network-vxhs.args | 25 ++++ .../qemuxml2argv-disk-drive-network-vxhs.xml | 34 +++++ tests/qemuxml2argvtest.c | 10 ++ tests/virstoragetest.c | 30 ++++ 27 files changed, 748 insertions(+), 5 deletions(-) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-vxhs-fail.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-err-vxhs.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-multidisk-vxhs.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-multidisk-vxhs.args.new create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-multidisk-vxhs.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.xml -- 2.5.5

4 24

[libvirt] [PATCH] qemu: undefine is not allowed during domain starting up
by Yi Wang 28 Aug '17

28 Aug '17

Start a domain whilst undefine it, if starting failed duing ProcessLaunch, on which period qemu exited unexpectedly, the operation will lead to failure of undefine the domain until libvirtd restarted. The reason is that libvirtd will unlock vm during qemuProcessStart, qemuDomainUndefineFlags can get the lock and set vm->persistent 0 but not remove the "active" domain. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/conf/domain_conf.h | 1 + src/qemu/qemu_driver.c | 6 ++++++ src/qemu/qemu_process.c | 3 +++ 3 files changed, 10 insertions(+) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index af15ee8..f339f84 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2468,6 +2468,7 @@ struct _virDomainObj { virDomainSnapshotObjPtr current_snapshot; bool hasManagedSave; + bool starting; void *privateData; void (*privateDataFreeFunc)(void *); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6568def..5d9acfc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7317,6 +7317,12 @@ qemuDomainUndefineFlags(virDomainPtr dom, if (!(vm = qemuDomObjFromDomain(dom))) return -1; + if (vm->starting) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("cannot undefine during domain starting up")); + goto cleanup; + } + cfg = virQEMUDriverGetConfig(driver); if (virDomainUndefineFlagsEnsureACL(dom->conn, vm->def) < 0) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 525521a..7b708be 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5847,6 +5847,8 @@ qemuProcessStart(virConnectPtr conn, if (!migrateFrom && !snapshot) flags |= VIR_QEMU_PROCESS_START_NEW; + vm->starting = true; + if (qemuProcessInit(driver, vm, updatedCPU, asyncJob, !!migrateFrom, flags) < 0) goto cleanup; @@ -5892,6 +5894,7 @@ qemuProcessStart(virConnectPtr conn, ret = 0; cleanup: + vm->starting = false; qemuProcessIncomingDefFree(incoming); return ret; -- 1.8.3.1

4 5

[libvirt] [PATCH 0/8] qemu: Default to video type=virtio for machvirt
by Cole Robinson 27 Aug '17

27 Aug '17

This series aim is to change the qemu machvirt video type default to virtio, but rather than continue to hack things into place in domain_conf.c, this rearranges things to allow drivers to set a video type default. Patches 1-4 are small cleanups/improvements in this area Patches 5-7 are the plumbing to allow drivers to set their own default Patch 8 is the actual default change https://bugzilla.redhat.com/show_bug.cgi?id=1404112 Cole Robinson (8): qemu: parse: drop redundant video config qemu: domain: Move some validation out of DeviceDefPostParse qemu: annotate some VIDEO_TYPE enum switch conf: add virDomainVideoDefNew conf: domain: add VIDEO_TYPE_DEFAULT conf: domain: move video type validation to DeviceDefValidate qemu: Set default video type in qemu PostParse qemu: Default to video type=virtio for machvirt src/conf/domain_conf.c | 54 +++++++++++------- src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 7 +-- src/qemu/qemu_domain.c | 66 ++++++++++++++-------- src/qemu/qemu_domain_address.c | 1 + src/qemu/qemu_monitor_json.c | 16 ++---- src/qemu/qemu_parse_command.c | 14 +---- src/qemu/qemu_process.c | 7 +-- src/vz/vz_sdk.c | 3 +- tests/domaincapsschemadata/full.xml | 1 + .../qemuxml2argv-aarch64-video-default.args | 24 ++++++++ .../qemuxml2argv-aarch64-video-default.xml | 17 ++++++ tests/qemuxml2argvtest.c | 6 ++ .../qemuxml2xmlout-aarch64-video-default.xml | 46 +++++++++++++++ tests/qemuxml2xmltest.c | 6 ++ 16 files changed, 191 insertions(+), 80 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-default.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-default.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-video-default.xml -- 2.13.0

2 19

[libvirt] libvirt 3.5.0 locks
by Vasiliy Tolstov 25 Aug '17

25 Aug '17

Hi. I'm testing libvirt 3.5.0 and have many issues like this: Jul 14 09:47:25 cn25 libvirtd[18820]: 2017-07-14 06:47:25.598+0000: 18841: error : qemuDomainObjBeginJobInternal:3872 : Timed out during operation: cannot acquire state change lock (held by remoteDispatchConnectGetAllDomainStats) Jul 14 09:47:25 cn25 libvirtd[18820]: 2017-07-14 06:47:25.598+0000: 18841: warning : qemuDomainObjBeginJobInternal:3860 : Cannot start job (query, none) for domain 147565; current job is (query, none) owned by (18828 remoteDispatchConnectGetAllDomainStats, 0 <null>) for (53670s, 0s) Jul 14 09:46:55 cn25 libvirtd[18820]: 2017-07-14 06:46:55.576+0000: 18836: error : virNetDevTapInterfaceStats:751 : internal error: /proc/net/dev: Interface not found Jul 14 09:46:55 cn25 libvirtd[18820]: 2017-07-14 06:46:55.542+0000: 18832: warning : qemuGetProcessInfo:1428 : cannot parse process status data Jul 14 09:46:31 cn25 libvirtd[18820]: 2017-07-14 06:46:31.050+0000: 18838: warning : qemuGetProcessInfo:1428 : cannot parse process status data Domain in status in shutdown as i see tap device already removed from the system, so virNetDevTapInterfaceStats says right info. My question - why lock now released and why only libvirt restart can helps in this case -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

2 8

[libvirt] [PATCH v2] vz: support disabled items in vz boot order
by Nikolay Shirokovskiy 23 Aug '17

23 Aug '17

At the time the check was written virtuozzo did not use disabled items in boot order configuration. Boot items were always enabled. Now they can be disabled as well. Supporting such items is easy - they just should be ignored. --- src/vz/vz_sdk.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 8ccd7ea..a6eb0dd 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1736,11 +1736,8 @@ prlsdkConvertBootOrderVm(PRL_HANDLE sdkdom, virDomainDefPtr def) pret = PrlBootDev_IsInUse(bootDev, &inUse); prlsdkCheckRetGoto(pret, cleanup); - if (!inUse) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Boot ordering with disabled items is not supported")); - goto cleanup; - } + if (!inUse) + continue; pret = PrlBootDev_GetSequenceIndex(bootDev, &bootIndex); prlsdkCheckRetGoto(pret, cleanup); -- 1.8.3.1

2 3

[libvirt] [PATCH v2] qemu: command: align disk serial check to schema
by Nikolay Shirokovskiy 23 Aug '17

23 Aug '17

Disk serial schema has extra '.+' allowed characters in comparison with check in code. Looks like there is no reason for that as qemu allows any character AFAIK for serial. This discrepancy is originated in 85d15b51 where ability to add serial was added. --- Diff from v1: * fix xml2argv disk serial test to use all valid chars Looks like there is no existing infrastructure to test every invalid character. src/qemu/qemu_command.c | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-serial.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c76f923..c5369b0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -432,7 +432,7 @@ qemuBuildIoEventFdStr(virBufferPtr buf, } #define QEMU_SERIAL_PARAM_ACCEPTED_CHARS \ - "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_ " + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_ .+" static int qemuSafeSerialParamValue(const char *value) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args index 2cefdca..fa0fc93 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args @@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive 'file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1,\ -serial=\ \ WD-WMAP9A966149' \ +serial=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_\ .+' \ -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.xml index 565462e..d54d73b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.xml @@ -17,7 +17,7 @@ <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> - <serial> WD-WMAP9A966149</serial> + <serial>abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_ .+</serial> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </disk> <controller type='usb' index='0'/> -- 1.8.3.1

2 3

[libvirt] [PATCH 0/5] A few fixes and improvements to the nodedev driver
by Erik Skultety 17 Aug '17

17 Aug '17

These are just the few I came across when working on another nodedev-related series. Erik Skultety (5): nodedev: mdev: Report an error when virFileResolveLink fails nodedev: udev: Remove the udevEventHandleCallback on fatal error nodedev: Clear the udev_monitor reference once unref'd nodedev: Introduce udevHandleOneDevice nodedev: Protect every access to udev_monitor by locking the driver src/node_device/node_device_udev.c | 59 +++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 17 deletions(-) -- 2.13.3

2 14

[libvirt] [PATCH v2 00/20] Make the virNetworkObjPtr private
by John Ferlan 16 Aug '17

16 Aug '17

v1: https://www.redhat.com/archives/libvir-list/2017-May/msg00701.html (but reviewed much more recently) NOTE from v1: Patches 1-3 already pushed Former patch 4: * Patch 1 (NEW) - splits out the formatting change in bridge_driver.h * Patch 2 - Remainder of the change for consistent naming NB: Without the split, there was a R-B, but I didn't push so that the split could be "seen". Former patch 5: * Patch 3 (NEW) - from review create virMacMapFileName in src/util/virmacmap.c * Patch 4 - Remainder of the previous change w/ adjusted name of course * Patch 5 (NEW) - from review, alter virNetworkObjUnrefMacMap Former patch 6: * Patch 6 - No change Former patch 7: * Patch 7 (NEW) - Split out the @class_id to @classIdMap change * Patch 8 - Remainder of previous change Former patch 8: * Patch 9 - No change Former patch 9: * Patch 10 - Make suggested naming adjustments Add/use virNetworkObjSetDef API Former patch 10: * Patch 11 - Move code back to driver, just have accessors for @autostart Former patch 11: * Patch 12 - No change Former patch 12: * Patch 13 - Use virNetworkObjIsPersistent in networkSetAutostart Former patch 13: * Patch 14 - No change Former patch 14: * Patch 15 - Just have the virNetworkObjNew lock the object now and make use of that with using virNetworkObjEndAPI in networkxml2conftest NB: Since we'll have a refcnt=1 and lock=true after New the EndAPI is proper * Patch 16 (NEW) - Just move the virObjectRef - makes it clearer why it's being ref'd Former patch 15: * Patch 17 (NEW) - Split out the rename of @nnames to @maxnames and explain the reason better * Patch 18 (NEW) - Split out the rename of @filter to @aclnames and explain the reason better * Patch 19 - The remainder of the former patch Former patch 16: * Patch 20 - No change (other than merge conflict resolution) John Ferlan (20): network: Perform some formatting cleanup in bridge_driver.h network: Use consistent naming in bridge_driver for virNetwork objects network: Move and rename networkMacMgrFileName network: Move macmap mgmt from bridge_driver to virnetworkobj network: Unconditionally initialize macmap when stopping virtual network network: Add virNetworkObj Get/Set API's for @dnsmasqPid and @radvdPid network: Alter virNetworkObj @class_id to be @classIdMap network: Introduce virNetworkObjGetClassIdMap network: Add virNetworkObj Get/Set API's for @floor_sum network: Add virNetworkObj Get/Set API's for @def and @newDef network: Introduce virNetworkObj{Get|Set}Autostart network: Introduce virNetworkObj{Is|Set}Active network: Introduce virNetworkObjIsPersistent network: Consistent use of @obj for virnetworkobj network: Have virNetworkObjNew lock the returned object network: Move virObjectRef during AssignDef processing network: Use @maxnames instead of @nnames network: Rename @filter to @aclfilter network: Modify naming for virNetworkObjList* fetching APIs network: Privatize virNetworkObj src/conf/virnetworkobj.c | 614 +++++++++++++++------- src/conf/virnetworkobj.h | 105 ++-- src/libvirt_private.syms | 21 + src/network/bridge_driver.c | 1218 ++++++++++++++++++++++--------------------- src/network/bridge_driver.h | 50 +- src/test/test_driver.c | 83 +-- src/util/virmacmap.c | 12 + src/util/virmacmap.h | 4 + tests/networkxml2conftest.c | 11 +- 9 files changed, 1231 insertions(+), 887 deletions(-) -- 2.9.4

3 38

[libvirt] [PATCH] qemu: Fix bug assuming usage of default UUID for certificate passphrase
by John Ferlan 15 Aug '17

15 Aug '17

If an environment specific _tls_x509_cert_dir is provided, then do not VIR_STRDUP the defaultTLSx509secretUUID as that would be for the "default" environment and not the vnc, spice, chardev, or migrate environments. If the environment needs a secret to decode it's certificate, then it must provide the secret. If the secrets happen to be the same, then configuration would use the same UUID as the default (but we cannot assume that nor can we assume that the secret would be necessary). Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- While responding to a different patch today regarding Veritas and usage of a default environment w/ or w/o secrets I realized that the existing logic has a flaw in "assuming" that someone would want to use the default secret. What if they defined their own environment without a secret? Then the code would create a secret object to pass to QEMU which would think it needs to use it to decode the server certificate (but it doesn't), so it would seemingly fail the start. I assume based on the lack of complaints about this that everyone just uses the default environment! src/qemu/qemu_conf.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c4714ed..a7a2aaa 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -526,14 +526,18 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, goto cleanup; \ if (rv == 0) \ cfg->val## TLSx509verify = cfg->defaultTLSx509verify; \ - if (virConfGetValueString(conf, #val "_tls_x509_cert_dir", \ - &cfg->val## TLSx509certdir) < 0) \ + if ((rv = virConfGetValueString(conf, #val "_tls_x509_cert_dir", \ + &cfg->val## TLSx509certdir)) < 0) \ goto cleanup; \ if (virConfGetValueString(conf, \ #val "_tls_x509_secret_uuid", \ &cfg->val## TLSx509secretUUID) < 0) \ goto cleanup; \ - if (!cfg->val## TLSx509secretUUID && \ + /* Only if a *tls_x509_cert_dir wasn't found (e.g. rv == 0), should \ + * we copy the defaultTLSx509secretUUID. If this environment needs \ + * a passphrase to decode the certificate, then it should provide \ + * it's own secretUUID for that. */ \ + if (rv == 0 && !cfg->val## TLSx509secretUUID && \ cfg->defaultTLSx509secretUUID) { \ if (VIR_STRDUP(cfg->val## TLSx509secretUUID, \ cfg->defaultTLSx509secretUUID) < 0) \ -- 2.9.4

2 2

[libvirt] [PATCHv2 0/3] exposing busy polling support for vhost-net
by sferdjao＠redhat.com 15 Aug '17

15 Aug '17

From: Sahid Orentino Ferdjaoui <sahid.ferdjaoui(a)redhat.com> In version 2.7.0, QEMU introduced support of busy polling for vhost-net [0]. To avoid paraphrasing original authors of that feature and the purpose it I prefer to share a pointer [1]. This patch serie exposes throught the NIC driver-specific element a new option 'poll_us'. That option is only available with the backend driver 'vhost' and that because libvirt automatically fallback to QEMU if the driver is not specified where that option is not available. The option 'poll_us' takes a positive. 0 means that the option is not going to be exposed. [0] 69e87b32680a41d9761191443587c595b6f5fc3f [1] https://lists.gnu.org/archive/html/qemu-devel/2016-11/msg04595.html Sahid Orentino Ferdjaoui (3): qemu: detect support for vhost-net busy polling conf: introduce 'poll_us' attribute for domain interface This patch finalizes support of 'poll_us' attribute as an option of the NIC driver-specific element, the commit also takes care of hotplug. docs/formatdomain.html.in | 12 +++++++- docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 16 +++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 5 ++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 28 ++++++++++++++++++ src/qemu/qemu_hotplug.c | 12 ++++++++ tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../qemuxml2argv-net-virtio-netdev-pollus-fail.xml | 23 +++++++++++++++ ...xml2argv-net-virtio-netdev-pollus-qemu-fail.xml | 23 +++++++++++++++ .../qemuxml2argv-net-virtio-netdev-pollus.args | 25 ++++++++++++++++ .../qemuxml2argv-net-virtio-netdev-pollus.xml | 23 +++++++++++++++ .../qemuxml2argv-net-virtio-poll-us.xml | 23 +++++++++++++++ tests/qemuxml2argvtest.c | 9 ++++++ .../qemuxml2xmlout-net-virtio-poll-us.xml | 33 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 21 files changed, 244 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev-pollus-fail.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev-pollus-qemu-fail.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev-pollus.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev-pollus.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-poll-us.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-poll-us.xml -- 2.9.4

4 6

[libvirt] [PATCH v2 0/6] nwfilter adjustments for common object
by John Ferlan 15 Aug '17

15 Aug '17

v1: https://www.redhat.com/archives/libvir-list/2017-June/msg00079.html Changes since v1 (if I can recall all of them!): Patches 1, 4, 8-13 were pushed Patches 2, 3, 5-7 are dropped This this is a rework of patches 14-17 Patch 1 (former patch14): * Requested adjustments made to ACK'd patch, but since this and the remaining ones were related I didn't yet push it. Patch 2 (new): * From review though... As it turns out, virNWFilterDefEqual doesn't require the @cmpUUIDs patch. Patch 3 (fromer patch 15): * Fixed the line as requested. Patch was ACK'd by like Patch 1 I held onto it since it was related. Patch 4 (former patch 16): * Let's call it a complete rewrite. Rather than rely solely on the refcnt of the object, I've added/implemented a 'trylock' mechanism which essentially will allow the subsequent patch to use the virObjectLockable (e.g. a non recursive lock). Of course as I got further into the code - I think I've come to the conclusion that there isn't a way for a @def to disappear between threads with a refcnt only mechanism because there's a few other serialized locks which would need to be hurdled before hand. Still as I found out while running the Avocado test 'nwfilter_update_vm_running.update_arp_rule' the recursion would occur because the AssignDef code would call the Instantiation with the lock from the def being updated and that's where all the awful magic needs to occur. Additionally, I found that one wouldn't want to attempt to lock the nwfilters list inside the virNWFilterObjListFindInstantiateFilter because AssignDef already had that lock. I debated needing a recursive lock there until I came to the conclusion that the list couldn't change because the DefineXML is protected by a driver level lock (as is the Undefine and Reload paths). Patch 5 (former patch 17): * No changes, it was ACK'd, but without 1-4 is useless Patch 6 (NEW): * Remove the need for the driver level lock for a few API's since we have self locking nwfilters list. Also left comments in the 3 places where that lock remained to hopefully cause someone great anxiety if they decided to attempt to remove the lock without first consulting a specialist. NB: Ran all of the changes through the 'nwfilter' tests found in the Avocado test suite. John Ferlan (6): nwfilter: Add @refs logic to __virNWFilterObj nwfilter: Remove unnecessary UUID comparison bypass nwfilter: Convert _virNWFilterObjList to be a virObjectLockable nwfilter: Remove recursive locking for nwfilter instantiation nwfilter: Convert virNWFilterObj to use virObjectLockable nwfilter: Remove need for nwfilterDriverLock in some API's src/conf/virnwfilterobj.c | 635 ++++++++++++++++++++++++--------- src/conf/virnwfilterobj.h | 12 +- src/libvirt_private.syms | 6 +- src/nwfilter/nwfilter_driver.c | 66 ++-- src/nwfilter/nwfilter_gentech_driver.c | 66 +++- src/util/virobject.c | 24 ++ src/util/virobject.h | 4 + src/util/virthread.c | 5 + src/util/virthread.h | 1 + 9 files changed, 586 insertions(+), 233 deletions(-) -- 2.9.4

1 8

[libvirt] [PATCH] hostdev: display leading zeros of USB vendor/product id's in error messages
by Chen Hanxiao 15 Aug '17

15 Aug '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Many vendor id's and product id's have leading zeros. Show them in error messages. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/util/virhostdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 579563c..0e6b5a3 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -1390,7 +1390,7 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev, } else if (!autoAddress) { goto out; } else { - VIR_INFO("USB device %x:%x could not be found at previous" + VIR_INFO("USB device %04x:%04x could not be found at previous" " address (bus:%u device:%u)", vendor, product, bus, device); } @@ -1418,12 +1418,12 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev, } else if (rc > 1) { if (autoAddress) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Multiple USB devices for %x:%x were found," + _("Multiple USB devices for %04x:%04x were found," " but none of them is at bus:%u device:%u"), vendor, product, bus, device); } else { virReportError(VIR_ERR_OPERATION_FAILED, - _("Multiple USB devices for %x:%x, " + _("Multiple USB devices for %04x:%04x, " "use <address> to specify one"), vendor, product); } @@ -1435,7 +1435,7 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostdev, usbsrc->autoAddress = true; if (autoAddress) { - VIR_INFO("USB device %x:%x found at bus:%u device:%u (moved" + VIR_INFO("USB device %04x:%04x found at bus:%u device:%u (moved" " from bus:%u device:%u)", vendor, product, usbsrc->bus, usbsrc->device, -- 2.7.4

2 4

[libvirt] [PATCH v3 0/3] implement migrate-getmaxdowntime command
by Scott Garfinkle 15 Aug '17

15 Aug '17

Currently, the maximum tolerable downtime for a domain being migrated is write-only. This patch implements a way to query that value nondestructively. Changes from [v2]: * Resequenced and renamed patches * Use updated qemuMonitorJSONGetMigrationParams for querying migration parameters. [v1} https://www.redhat.com/archives/libvir-list/2017-July/msg00908.html [v2} https://www.redhat.com/archives/libvir-list/2017-July/msg01010.html Scott Garfinkle (3) Add virDomainMigrateGetMaxDowntime public API qemu: Implement virDomainMigrateGetMaxDowntime virsh: Add support for virDomainMigrateGetMaxDowntime --- include/libvirt/libvirt-domain.h | 4 ++++ src/driver-hypervisor.h | 6 ++++++ src/libvirt-domain.c | 45 ++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 4 ++++ src/qemu/qemu_driver.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 3 +++ src/qemu/qemu_monitor_json.c | 4 ++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 16 +++++++++++++- src/remote_protocol-structs | 8 +++++++ tools/virsh-domain.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 18 ++++++++++++++++++ 12 files changed, 205 insertions(+), 1 deletion(-)

2 6

[libvirt] [PATCH] docs: Add "PCI topology and hotplug" guidelines
by Andrea Bolognani 08 Aug '17

08 Aug '17

For all machine types except i440fx, making a guest hotplug capable requires some sort of planning. Add some information to help users make educated choices when defining the PCI topology of guests. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/formatdomain.html.in | 4 +- docs/pci-hotplug.html.in | 164 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 docs/pci-hotplug.html.in diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index bceddd2..7c4450c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3505,7 +3505,9 @@ appear more than once, with a group of virtual devices tied to a virtual controller. Normally, libvirt can automatically infer such controllers without requiring explicit XML markup, but sometimes - it is necessary to provide an explicit controller element. + it is necessary to provide an explicit controller element, notably + when planning the <a href="pci-hotplug.html">PCI topology</a> + for guests where device hotplug is expected. </p> <pre> diff --git a/docs/pci-hotplug.html.in b/docs/pci-hotplug.html.in new file mode 100644 index 0000000..f3d1610 --- /dev/null +++ b/docs/pci-hotplug.html.in @@ -0,0 +1,164 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <h1>PCI topology and hotplug</h1> + + <ul id="toc"></ul> + + <p> + Perhaps surprisingly, most libvirt guests support only limited PCI + device hotplug out of the box, or even none at all. + </p> + <p> + The reason for this apparent limitation is the fact that each + hotplugged PCI device might require additional PCI controllers to + be added to the guest, and libvirt has no way of knowing in advance + how many devices will be hotplugged during the guest's lifetime, + thus making it impossible to automatically provide the right amount + of PCI controllers: any arbitrary number would end up being too big + for some users, and too small for others. + </p> + <p> + Ultimately, the user is the only one who knows how much the guest + will need to grow dynamically, so the responsability of planning + a suitabile PCI topology in advance falls on them. + </p> + <p> + This document aims at providing all the information needed to + successfully plan the PCI topology of a guest. Note that the + details can vary a lot between architectures and even machine + types, hence the way it's organized. + </p> + + <h2><a name="x86_64">x86_64 architecture</a></h2> + + <h3><a name="x86_64-q35">q35 machine type</a></h3> + + <p> + This is a PCI Express native machine type. The default PCI topology + looks like + </p> + +<pre> +<controller type='pci' index='0' model='pcie-root'/> +<controller type='pci' index='1' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='1' port='0x10'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> +</controller></pre> + + <p> + and supports hotplugging a single PCI Express device, either + emulated or assigned from the host. + </p> + <p> + Slots on the <code>pcie-root</code> controller do not support + hotplug, so the device will be hotplugged into the + <code>pcie-root-port</code> controller. If you plan to hotplug + more than a single PCI Express device, you should add a suitable + number of <code>pcie-root-port</code> controllers when defining + the guest: for example, add + </p> + +<pre> +<controller type='pci' model='pcie-root-port'/> +<controller type='pci' model='pcie-root-port'/> +<controller type='pci' model='pcie-root-port'/></pre> + + <p> + if you expect to hotplug up to three PCI Express devices, + either emulated or assigned from the host. That's all the + information you need to provide: libvirt will fill in the + remaining details automatically. + </p> + <p> + If you expect to hotplug legacy PCI devices, then you will need + specialized controllers, since all those mentioned above are + intended for PCI Express devices only: add + </p> + +<pre> +<controller type='pci' model='dmi-to-pci-bridge'/> +<controller type='pci' model='pci-bridge'/></pre> + + <p> + and you'll be able to hotplug up to 31 legacy PCI devices, + either emulated or assigned from the host. + </p> + + <h3><a name="x86_64-i440fx">i440fx (pc) machine type</a></h3> + + <p> + This is a legacy PCI native machine type. The default PCI + topology looks like + </p> + +<pre> +<controller type='pci' index='0' model='pci-root'/></pre> + + <p> + where each of the 31 slots on the <code>pci-root</code> + controller is hotplug capable and can accept a legacy PCI + device, either emulated or assigned from the guest. + </p> + + <h2><a name="ppc64">ppc64 architecture</a></h2> + + <h3><a name="ppc64-pseries">pseries machine type</a></h3> + + <p> + The default PCI topology for the <code>pseries</code> machine + type looks like + </p> + +<pre> +<controller type='pci' index='0' model='pcie-root'> + <model name='spapr-pci-host-bridge'/> + <target index='0'/> +</controller></pre> + + <p> + The 31 slots on a <code>pci-root</code> controller are all + hotplug capable and, despite the name suggesting otherwise, + starting with QEMU 2.9 all of them can accept PCI Express + devices in addition to legacy PCI devices; however, + libvirt will only place emulated devices on the default + <code>pci-root</code> controller. + </p> + <p> + In order to take advantage of improved error reporting and + recovering capabilities, PCI devices assigned from the + host need to be isolated by placing each on a separate + <code>pci-root</code> controller, which has to be prepared + in advance for hotplug to work: for example, add + </p> + +<pre> +<controller type='pci' model='pci-root'/> +<controller type='pci' model='pci-root'/> +<controller type='pci' model='pci-root'/></pre> + + <p> + if you expect to hotplug up to three PCI devices assigned + from the host. + </p> + + <h2><a name="aarch64">aarch64 architecture</a></h2> + + <h3><a name="aarch64-virt">mach-virt (virt) machine type</a></h3> + + <p> + This machine type mostly behaves the same as the + <a href="#x86_64-q35">q35 machine type</a>, so you can just + refer to that section for information. + </p> + <p> + The only difference worth mentioning is that using legacy + PCI for <code>mach-virt</code> guests is extremely uncommon, + so you'll probably never need to add controllers other than + <code>pcie-root-port</code>. + </p> + + </body> +</html> -- 2.7.5

3 5

Re: [libvirt] [RFC]Add new mdev interface for QoS
by Alex Williamson 08 Aug '17

08 Aug '17

[cc +libvir-list] On Wed, 26 Jul 2017 21:16:59 +0800 "Gao, Ping A" <ping.a.gao(a)intel.com> wrote: > The vfio-mdev provide the capability to let different guest share the > same physical device through mediate sharing, as result it bring a > requirement about how to control the device sharing, we need a QoS > related interface for mdev to management virtual device resource. > > E.g. In practical use, vGPUs assigned to different quests almost has > different performance requirements, some guests may need higher priority > for real time usage, some other may need more portion of the GPU > resource to get higher 3D performance, corresponding we can define some > interfaces like weight/cap for overall budget control, priority for > single submission control. > > So I suggest to add some common attributes which are vendor agnostic in > mdev core sysfs for QoS purpose. I think what you're asking for is just some standardization of a QoS attribute_group which a vendor can optionally include within the existing mdev_parent_ops.mdev_attr_groups. The mdev core will transparently enable this, but it really only provides the standard, all of the support code is left for the vendor. I'm fine with that, but of course the trouble with and sort of standardization is arriving at an agreed upon standard. Are there QoS knobs that are generic across any mdev device type? Are there others that are more specific to vGPU? Are there existing examples of this that we can steal their specification? Also, mdev devices are not necessarily the exclusive users of the hardware, we can have a native user such as a local X client. They're not an mdev user, so we can't support them via the mdev_attr_group. Does there need to be a per mdev parent QoS attribute_group standard for somehow defining the QoS of all the child mdev devices, or perhaps representing the remaining host QoS attributes? Ultimately libvirt and upper level management tools would be the consumer of these control knobs, so let's immediately get libvirt involved in the discussion. Thanks, Alex

5 16

[libvirt] [PATCH] hyperv: Reduce usage of libxml API functions
by Sri Ramanujam 07 Aug '17

07 Aug '17

Slight refactor of the WMI serialization code to minimize mixing openwsman and libxml2 APIs. The only usage of libxml2 APIs now is in creating CDATA blocks, because the openwsman API does not provide that functionality. --- src/hyperv/hyperv_wmi.c | 65 ++++++++++++------------------------------------- 1 file changed, 16 insertions(+), 49 deletions(-) diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 57125ae..99efa1c 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -489,17 +489,14 @@ hypervSerializeSimpleParam(hypervParamPtr p, const char *resourceUri, static int hypervSerializeEprParam(hypervParamPtr p, hypervPrivate *priv, - const char *resourceUri, WsXmlDocH doc, WsXmlNodeH *methodNode) + const char *resourceUri, WsXmlNodeH *methodNode) { int result = -1; WsXmlNodeH xmlNodeParam = NULL, xmlNodeTemp = NULL, xmlNodeAddr = NULL, xmlNodeRef = NULL; - xmlNodePtr xmlNodeAddrPtr = NULL, - xmlNodeRefPtr = NULL; WsXmlDocH xmlDocResponse = NULL; - xmlDocPtr docPtr = (xmlDocPtr) doc->parserDoc; WsXmlNsH ns = NULL; client_opt_t *options = NULL; filter_t *filter = NULL; @@ -573,11 +570,6 @@ hypervSerializeEprParam(hypervParamPtr p, hypervPrivate *priv, goto cleanup; } - if (!(xmlNodeAddrPtr = xmlDocCopyNode((xmlNodePtr) xmlNodeAddr, docPtr, 1))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not copy EPR address")); - goto cleanup; - } - if (!(xmlNodeRef = ws_xml_get_child(xmlNodeTemp, 0, XML_NS_ADDRESSING, WSA_REFERENCE_PARAMETERS))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -585,17 +577,11 @@ hypervSerializeEprParam(hypervParamPtr p, hypervPrivate *priv, goto cleanup; } - if (!(xmlNodeRefPtr = xmlDocCopyNode((xmlNodePtr) xmlNodeRef, docPtr, 1))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not copy EPR item reference parameters")); - goto cleanup; - } - /* now build a new xml doc with the EPR node children */ if (!(xmlNodeParam = ws_xml_add_child(*methodNode, resourceUri, p->epr.name, NULL))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add child node to xmlNodeParam")); + _("Could not add child node to methodNode")); goto cleanup; } @@ -613,23 +599,8 @@ hypervSerializeEprParam(hypervParamPtr p, hypervPrivate *priv, goto cleanup; } - if (xmlAddChild((xmlNodePtr) *methodNode, (xmlNodePtr) xmlNodeParam) == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add child to xml parent node")); - goto cleanup; - } - - if (xmlAddChild((xmlNodePtr) xmlNodeParam, xmlNodeAddrPtr) == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add child to xml parent node")); - goto cleanup; - } - - if (xmlAddChild((xmlNodePtr) xmlNodeParam, xmlNodeRefPtr) == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add child to xml parent node")); - goto cleanup; - } + ws_xml_duplicate_tree(xmlNodeParam, xmlNodeAddr); + ws_xml_duplicate_tree(xmlNodeParam, xmlNodeRef); /* we did it! */ result = 0; @@ -656,8 +627,7 @@ hypervSerializeEmbeddedParam(hypervParamPtr p, const char *resourceUri, xmlNodeArray = NULL; WsXmlDocH xmlDocTemp = NULL, xmlDocCdata = NULL; - xmlBufferPtr xmlBufferNode = NULL; - const xmlChar *xmlCharCdataContent = NULL; + char *xmlCharCdataContent = NULL; xmlNodePtr xmlNodeCdata = NULL; hypervWmiClassInfoPtr classInfo = p->embedded.info; virHashKeyValuePairPtr items = NULL; @@ -761,25 +731,22 @@ hypervSerializeEmbeddedParam(hypervParamPtr p, const char *resourceUri, } /* create CDATA node */ - xmlBufferNode = xmlBufferCreate(); - if (xmlNodeDump(xmlBufferNode, (xmlDocPtr) xmlDocTemp->parserDoc, - (xmlNodePtr) xmlNodeInstance, 0, 0) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not get root of temp XML doc")); - goto cleanup; - } + ws_xml_dump_memory_node_tree(xmlNodeInstance, &xmlCharCdataContent, &len); - len = xmlBufferLength(xmlBufferNode); - xmlCharCdataContent = xmlBufferContent(xmlBufferNode); if (!(xmlNodeCdata = xmlNewCDataBlock((xmlDocPtr) xmlDocCdata, - xmlCharCdataContent, len))) { + (xmlChar *)xmlCharCdataContent, len))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not create CDATA element")); goto cleanup; } - /* Add CDATA node to the doc root */ - if (!(xmlAddChild((xmlNodePtr) xmlNodeParam, xmlNodeCdata))) { + /* + * Add CDATA node to the doc root + * + * FIXME: there is no openwsman wrapper for xmlNewCDataBlock, so instead + * silence clang by casting to a void pointer first + */ + if (!(xmlAddChild((xmlNodePtr)(void *)xmlNodeParam, xmlNodeCdata))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not add CDATA to doc root")); goto cleanup; @@ -792,7 +759,7 @@ hypervSerializeEmbeddedParam(hypervParamPtr p, const char *resourceUri, VIR_FREE(items); ws_xml_destroy_doc(xmlDocCdata); ws_xml_destroy_doc(xmlDocTemp); - xmlBufferFree(xmlBufferNode); + ws_xml_free_memory(xmlCharCdataContent); return result; } @@ -854,7 +821,7 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokeParamsListPtr params, break; case HYPERV_EPR_PARAM: if (hypervSerializeEprParam(p, priv, params->resourceUri, - paramsDocRoot, &methodNode) < 0) + &methodNode) < 0) goto cleanup; break; case HYPERV_EMBEDDED_PARAM: -- 2.9.4

2 1

[libvirt] [PATCH] hyperv: Correct number of milliseconds in five minutes
by Sri Ramanujam 07 Aug '17

07 Aug '17

--- src/hyperv/hyperv_wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 57125ae..33ad964 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -42,7 +42,7 @@ #define VIR_FROM_THIS VIR_FROM_HYPERV -#define HYPERV_JOB_TIMEOUT_MS 5000 +#define HYPERV_JOB_TIMEOUT_MS 300000 VIR_LOG_INIT("hyperv.hyperv_wmi"); -- 2.9.4

2 1

[libvirt] [PATCH] docs: bhyve: document autoport support
by Roman Bogorodskiy 06 Aug '17

06 Aug '17

- Update the driver page with the information about using autport for VNC ports - Add a news entry --- docs/drvbhyve.html.in | 8 ++++++++ docs/news.xml | 10 ++++++++++ 2 files changed, 18 insertions(+) It's a freeze now, but I guess it won't hurt if I push the actual feature ACKed before the freeze [1] along with this docs change. If not, it's not a big deal to let it wait for the next release though. PS I've been semi-afk for last couple of weeks, hence the delay, sorry about that. 1: https://www.redhat.com/archives/libvir-list/2017-July/msg00704.html diff --git a/docs/drvbhyve.html.in b/docs/drvbhyve.html.in index f083db91c..0cc9f0aa0 100644 --- a/docs/drvbhyve.html.in +++ b/docs/drvbhyve.html.in @@ -381,6 +381,14 @@ will be used. Please refer to the manual page and the <a href="https://wiki.freebsd.org/bhyve">bhyve wiki</a> for more details on using the <code>vgaconf</code> option.</p> +<p><span class="since">Since 3.6.0</span>, it's possible to use <code>autoport</code> +to let libvirt allocate VNC port automatically (instead of explicitly specifying +it with the <code>port</code> attribute):</p> + +<pre> + <graphics type='vnc' autoport='yes'> +</pre> + <h3><a name="clockconfig">Clock configuration</a></h3> <p>Originally bhyve supported only localtime for RTC. Support for UTC time was introduced in diff --git a/docs/news.xml b/docs/news.xml index ea21cbc3e..e84dea9ad 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -61,6 +61,16 @@ on separate PHBs (PCI Host Bridges). </description> </change> + <change> + <summary> + bhyve: Support autoport for VNC ports + </summary> + <description> + It's no longer necessary to explicitly specify VNC port for the bhyve + guests. With the autoport feature it will be allocated automatically. + Please refer to the bhyve driver documentation for examples. + </description> + </change> </section> <section title="Improvements"> <change> -- 2.13.1

3 5

[libvirt] [PATCH v2] bhyve: Add support for VNC autoport
by Roman Bogorodskiy 06 Aug '17

06 Aug '17

From: Alexander Nusov <alexander.nusov(a)nfvexpress.com> This patch adds support for automatic VNC port assignment for bhyve guests. --- Changes from v1: * Call virPortAllocatorRelease() in virBhyveProcessStop() to release VNC port; that's done unconditionally of using autoport * Call virPortAllocatorSetUsed(.., true) in virBhyveProcessReconnect() to reserve already used VNC ports after daemon restart * Call virPortAllocatorSetUsed(.., true) in bhyveBuildGraphicsArgStr() for domains that don't use autoport so allocator didn't try to use ports allocated by these domains * In dryRun mode (i.e. for domxml-to-native) don't allocate any ports * Add a couple of unit tests Note 1: while adding tests I noticed that port allocator will actually skip already bound ports, so I'm wondering if it makes any sense to use virPortAllocatorSetUsed(.., true)? Right now I cannot come up with any case to trigger this except probably some races when spawning guests simultaneously, but that's hard to reproduce. Note 2: there are still some cases where resources allocated during command preparation are not properly cleaned up; that's not only VNC ports, but also TAP devices. I plan to add proper cleanup routines separately. src/bhyve/bhyve_command.c | 25 +++++++++++-- src/bhyve/bhyve_driver.c | 5 +++ src/bhyve/bhyve_process.c | 20 +++++++++++ src/bhyve/bhyve_utils.h | 3 ++ .../bhyvexml2argv-vnc-autoport.args | 12 +++++++ .../bhyvexml2argv-vnc-autoport.ldargs | 1 + .../bhyvexml2argv-vnc-autoport.xml | 26 ++++++++++++++ tests/bhyvexml2argvtest.c | 7 ++++ .../bhyvexml2xmlout-vnc-autoport.xml | 41 ++++++++++++++++++++++ tests/bhyvexml2xmltest.c | 1 + 10 files changed, 138 insertions(+), 3 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-autoport.xml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index eae5cb3ca..e62b5df66 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -330,15 +330,19 @@ bhyveBuildLPCArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, } static int -bhyveBuildGraphicsArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, +bhyveBuildGraphicsArgStr(const virDomainDef *def, virDomainGraphicsDefPtr graphics, virDomainVideoDefPtr video, virConnectPtr conn, - virCommandPtr cmd) + virCommandPtr cmd, + bool dryRun) { virBuffer opt = VIR_BUFFER_INITIALIZER; virDomainGraphicsListenDefPtr glisten = NULL; bool escapeAddr; + unsigned short port; + + bhyveConnPtr driver = conn->privateData; if (!(bhyveDriverGetCaps(conn) & BHYVE_CAP_LPC_BOOTROM) || def->os.bootloader || @@ -401,6 +405,20 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, virBufferAdd(&opt, glisten->address, -1); } + if (!dryRun) { + if (graphics->data.vnc.autoport) { + if (virPortAllocatorAcquire(driver->remotePorts, &port) < 0) + return -1; + graphics->data.vnc.port = port; + } else { + if (virPortAllocatorSetUsed(driver->remotePorts, + graphics->data.vnc.port, + true) < 0) + VIR_WARN("Failed to mark VNC port '%d' as used by '%s'", + graphics->data.vnc.port, def->name); + } + } + virBufferAsprintf(&opt, ":%d", graphics->data.vnc.port); break; default: @@ -553,7 +571,8 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, if (def->ngraphics && def->nvideos) { if (def->ngraphics == 1 && def->nvideos == 1) { - if (bhyveBuildGraphicsArgStr(def, def->graphics[0], def->videos[0], conn, cmd) < 0) + if (bhyveBuildGraphicsArgStr(def, def->graphics[0], def->videos[0], + conn, cmd, dryRun) < 0) goto error; add_lpc = true; } else { diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index ed2221a35..bffeea7d9 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -52,6 +52,7 @@ #include "viraccessapicheck.h" #include "virhostcpu.h" #include "virhostmem.h" +#include "virportallocator.h" #include "conf/domain_capabilities.h" #include "bhyve_conf.h" @@ -1219,6 +1220,7 @@ bhyveStateCleanup(void) virObjectUnref(bhyve_driver->closeCallbacks); virObjectUnref(bhyve_driver->domainEventState); virObjectUnref(bhyve_driver->config); + virObjectUnref(bhyve_driver->remotePorts); virMutexDestroy(&bhyve_driver->lock); VIR_FREE(bhyve_driver); @@ -1265,6 +1267,9 @@ bhyveStateInitialize(bool privileged, if (!(bhyve_driver->domainEventState = virObjectEventStateNew())) goto cleanup; + if (!(bhyve_driver->remotePorts = virPortAllocatorNew(_("display"), 5900, 65535, 0))) + goto cleanup; + bhyve_driver->hostsysinfo = virSysinfoRead(); if (!(bhyve_driver->config = virBhyveDriverConfigNew())) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index a97e300ff..7211156ca 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -293,6 +293,16 @@ virBhyveProcessStop(bhyveConnPtr driver, /* Cleanup network interfaces */ bhyveNetCleanup(vm); + /* VNC autoport cleanup */ + if ((vm->def->ngraphics == 1) && + vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { + if (virPortAllocatorRelease(driver->remotePorts, + vm->def->graphics[0]->data.vnc.port) < 0) { + VIR_WARN("Failed to release VNC port for '%s'", + vm->def->name); + } + } + ret = 0; virCloseCallbacksUnset(driver->closeCallbacks, vm, @@ -412,6 +422,16 @@ virBhyveProcessReconnect(virDomainObjPtr vm, if (STREQ(expected_proctitle, proc_argv[0])) { ret = 0; priv->mon = bhyveMonitorOpen(vm, data->driver); + if (vm->def->ngraphics == 1 && + vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { + int vnc_port = vm->def->graphics[0]->data.vnc.port; + if (virPortAllocatorSetUsed(data->driver->remotePorts, + vnc_port, + true) < 0) { + VIR_WARN("Failed to mark VNC port '%d' as used by '%s'", + vnc_port, vm->def->name); + } + } } } diff --git a/src/bhyve/bhyve_utils.h b/src/bhyve/bhyve_utils.h index db50e012a..8ad2698d4 100644 --- a/src/bhyve/bhyve_utils.h +++ b/src/bhyve/bhyve_utils.h @@ -28,6 +28,7 @@ # include "virdomainobjlist.h" # include "virthread.h" # include "virclosecallbacks.h" +# include "virportallocator.h" # define BHYVE_AUTOSTART_DIR SYSCONFDIR "/libvirt/bhyve/autostart" # define BHYVE_CONFIG_DIR SYSCONFDIR "/libvirt/bhyve" @@ -58,6 +59,8 @@ struct _bhyveConn { virCloseCallbacksPtr closeCallbacks; + virPortAllocatorPtr remotePorts; + unsigned bhyvecaps; unsigned grubcaps; }; diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args new file mode 100644 index 000000000..039526ff3 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args @@ -0,0 +1,12 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,/path/to/test.fd \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 4:0,fbuf,tcp=127.0.0.1:5900 \ +-s 1,lpc bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.ldargs new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.xml new file mode 100644 index 000000000..afb73f040 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.xml @@ -0,0 +1,26 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + <loader readonly="yes" type="pflash">/path/to/test.fd</loader> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='-1' autoport='yes'> + <listen type='address' address='127.0.0.1'/> + </graphics> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index c8f8c685a..95fada0bd 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -145,6 +145,11 @@ mymain(void) if ((driver.xmlopt = virBhyveDriverCreateXMLConf(&driver)) == NULL) return EXIT_FAILURE; + if (!(driver.remotePorts = virPortAllocatorNew("display", 5900, 65535, + VIR_PORT_ALLOCATOR_SKIP_BIND_CHECK))) + return EXIT_FAILURE; + + # define DO_TEST_FULL(name, flags) \ do { \ static struct testInfo info = { \ @@ -193,6 +198,7 @@ mymain(void) DO_TEST("net-e1000"); DO_TEST("uefi"); DO_TEST("vnc"); + DO_TEST("vnc-autoport"); /* Address allocation tests */ DO_TEST("addr-single-sata-disk"); @@ -231,6 +237,7 @@ mymain(void) virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); + virObjectUnref(driver.remotePorts); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-autoport.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-autoport.xml new file mode 100644 index 000000000..d6cfe76b7 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-autoport.xml @@ -0,0 +1,41 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <loader readonly='yes' type='pflash'>/path/to/test.fd</loader> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <interface type='bridge'> + <mac address='52:54:00:00:00:00'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <model type='gop' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index b3759919e..c16eb2b2c 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -105,6 +105,7 @@ mymain(void) DO_TEST_DIFFERENT("serial-grub"); DO_TEST_DIFFERENT("serial-grub-nocons"); DO_TEST_DIFFERENT("vnc"); + DO_TEST_DIFFERENT("vnc-autoport"); /* Address allocation tests */ DO_TEST_DIFFERENT("addr-single-sata-disk"); -- 2.13.1

3 4

[libvirt] [PATCH v2 0/4] Add setting CPU features (CPUID) with libxenlight driver.
by Marek Marczykowski-Górecki 04 Aug '17

04 Aug '17

Tests (patches 3 and 4) depends on libxl_domain_config test suite: https://www.redhat.com/archives/libvir-list/2017-February/msg01477.html But first two patches can be applied independently. Marek Marczykowski-Górecki (4): cpu: define sub-leaf 0 for leaf 7 in cpu_map.xml libxl: add support for CPUID features policy tests: switch libxlxml2domconfig test to use testXLInintCaps tests: check CPU features handling in libxl driver src/cpu/cpu_map.xml | 58 ++++++------- src/libxl/libxl_conf.c | 77 ++++++++++++++++- src/libxl/libxl_conf.h | 1 +- tests/libxlxml2domconfigdata/basic-pv.xml | 2 +- tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 64 ++++++++++++++- tests/libxlxml2domconfigdata/fullvirt-cpuid.xml | 37 ++++++++- tests/libxlxml2domconfigtest.c | 3 +- 7 files changed, 207 insertions(+), 35 deletions(-) create mode 100644 tests/libxlxml2domconfigdata/fullvirt-cpuid.json create mode 100644 tests/libxlxml2domconfigdata/fullvirt-cpuid.xml base-commit: fbcc08b245bb7d5502633d9cb4048281cc9d8532 -- git-series 0.9.1

3 12

[libvirt] [PATCH RESEND] Interface: return appropriate status for bridge device
by Lin Ma 03 Aug '17

03 Aug '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

3 2

[libvirt] [PATCH 0/3] qemu: command: clean up default cpu formatting
by Cole Robinson 03 Aug '17

03 Aug '17

Just some minor patches to do with encoding a default CPU on the qemu command line. Patch 1 adds a test case Patch 2 simplifies the code Patch 3 throws an explicit error for a confusing situation Cole Robinson (3): tests: add qemu x86 kvm 32-on-64 test qemu: command: rework adding of default cpu model qemu: command: explicitly error for non-x86 default CPU src/qemu/qemu_command.c | 95 +++++++++------------- .../qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 1 - .../qemuxml2argv-kvm-features-off.args | 1 - .../qemuxml2argv-x86-kvm-32-on-64.args | 21 +++++ .../qemuxml2argv-x86-kvm-32-on-64.xml | 13 +++ tests/qemuxml2argvtest.c | 1 + tests/testutilsqemu.c | 18 +++- 7 files changed, 90 insertions(+), 60 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-x86-kvm-32-on-64.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-x86-kvm-32-on-64.xml -- 2.13.3

4 10

[libvirt] [PATCH v3 0/2] Restrict usage of unsupported clock timers
by Kothapally Madhu Pavan 03 Aug '17

03 Aug '17

hpet and kvm.pit clock timers are specific to x86 architecture and are not to be used by unsuported architectures. Similarly sPAPR guests only allow RTC timer. This patchset will restrict the usage of unsupported clock timers. Kothapally Madhu Pavan (2): qemu: Restrict usage of hpet and kvm.pit timers by unsupported architectures qemu: Default hwclock source for sPAPR to RTC src/qemu/qemu_domain.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- 1.8.3.1

2 3

[libvirt] [PATCH 0/8] Delete a function
by Ján Tomko 03 Aug '17

03 Aug '17

*** BLURB HERE *** Ján Tomko (8): Remove superfluous usage of virDomainDeviceInfoNeedsFormat virDomainDeviceInfoFormat: delete outdated comments Use a separate buffer for <smartcard> subelements Use a separate buffer for <sound> subelements Use a separate buffer for <watchdog> subelements Use a separate buffer for <hub> subelements conf: check for buffer errors before virBufferUse Turn virDomainDeviceInfoFormat into void src/conf/capabilities.c | 5 + src/conf/cpu_conf.c | 4 + src/conf/domain_conf.c | 237 +++++++++++++++++++++--------------------------- 3 files changed, 114 insertions(+), 132 deletions(-) -- 2.13.0

3 21

[libvirt] [PATCH 00/24] qemu: refactor node name detection
by Peter Krempa 03 Aug '17

03 Aug '17

Since query-blockstats provides full hierarchy of node names without any doubtful matching algorithm, use it to make the node name detector reliable. Unfortunately some of the changes are ugly when viewed as a diff since they delete and rewrite chunks of code. This series can be fetched at: git fetch git://pipo.sk/pipo/libvirt.git node-name-detect-refactor-1 Peter Krempa (24): qemu: monitor: Extract call of 'query-blockstats' and add new API for it tests: qemumonitorjson: Consolidate basic node name detection test cases tests: qemumonitor: Prepare for more test data in testBlockNodeNameDetect tests: qemumonitorjson: Drop redundant data from testBlockNodeNameDetectFormat tests: utils: Don't calculate file size in virTestLoadFile util: buffer: Add virBufferStrcatVArgs tests: utils: Add virTestLoadFilePath helper tests: qemuhelp: convert to virTestLoadFilePath tests: utils: Add virTestLoadFileJSON helper tests: qemumonitorjson: simplify path handling in testBlockNodeNameDetect tests: qemumontitorjson: temporarily disable node name detection tests qemu: block: Rename qemuBlockFillNodeData and move it to the top util: storagefile: rename 'nodebacking' to 'nodestorage' in virStorageSource qemu: block: Refactor node name detection code tests: Extract mock library for making hash table deterministic tests: qemumonitorjson: Simplify node name detection test qemu: block: store and test driver names for detected storage nodes tests: qemumonitorjson: Add data and fix 'same-backing' node detection case tests: qemumonitorjson: Fix 'relative' node name detection test case tests: qemumonitorjson: Fix 'gluster' node name detection test case tests: qemumonitorjson: Add test case for node name detection with blockjob tests: qemumonitorjson: Old and empty test case for node name detection tests: qemumonitorjson: Test extraction of LUKS node names tests: qemumonitorjson: Test extraction of iSCSI device node names src/libvirt_private.syms | 1 + src/qemu/qemu_block.c | 344 ++- src/qemu/qemu_block.h | 12 +- src/qemu/qemu_driver.c | 10 +- src/qemu/qemu_monitor.c | 15 + src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_monitor_json.c | 44 +- src/qemu/qemu_monitor_json.h | 2 + src/util/virbuffer.c | 27 +- src/util/virbuffer.h | 2 + src/util/virstoragefile.c | 6 +- src/util/virstoragefile.h | 2 +- tests/Makefile.am | 17 +- tests/qemuhelptest.c | 14 +- .../qemumonitorjson-nodename-1.result | 15 - .../qemumonitorjson-nodename-2.json | 2270 -------------------- .../qemumonitorjson-nodename-2.result | 60 - .../qemumonitorjson-nodename-basic-blockstats.json | 166 ++ ...emumonitorjson-nodename-basic-named-nodes.json} | 18 +- .../qemumonitorjson-nodename-basic.result | 16 + ...mumonitorjson-nodename-blockjob-blockstats.json | 301 +++ ...umonitorjson-nodename-blockjob-named-nodes.json | 682 ++++++ .../qemumonitorjson-nodename-blockjob.result | 26 + .../qemumonitorjson-nodename-empty-blockstats.json | 2 + ...qemumonitorjson-nodename-empty-named-nodes.json | 2 + .../qemumonitorjson-nodename-empty.result | 1 + ...emumonitorjson-nodename-gluster-blockstats.json | 111 + ...umonitorjson-nodename-gluster-named-nodes.json} | 90 +- .../qemumonitorjson-nodename-gluster.result | 19 +- .../qemumonitorjson-nodename-iscsi-blockstats.json | 113 + ...qemumonitorjson-nodename-iscsi-named-nodes.json | 114 + .../qemumonitorjson-nodename-iscsi.result | 13 + .../qemumonitorjson-nodename-luks-blockstats.json | 58 + .../qemumonitorjson-nodename-luks-named-nodes.json | 109 + .../qemumonitorjson-nodename-luks.result | 6 + .../qemumonitorjson-nodename-old-blockstats.json | 160 ++ .../qemumonitorjson-nodename-old-named-nodes.json | 2 + .../qemumonitorjson-nodename-old.result | 1 + ...mumonitorjson-nodename-relative-blockstats.json | 329 +++ ...monitorjson-nodename-relative-named-nodes.json} | 26 +- .../qemumonitorjson-nodename-relative.result | 56 +- ...nitorjson-nodename-same-backing-blockstats.json | 221 ++ ...torjson-nodename-same-backing-named-nodes.json} | 16 +- .../qemumonitorjson-nodename-same-backing.result | 32 +- tests/qemumonitorjsontest.c | 97 +- tests/testutils.c | 101 +- tests/testutils.h | 6 + ...{virmacmapmock.c => virdeterministichashmock.c} | 0 tests/virmacmaptest.c | 2 +- 49 files changed, 2961 insertions(+), 2778 deletions(-) delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-1.result delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-2.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-2.result create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-blockstats.json rename tests/qemumonitorjsondata/{qemumonitorjson-nodename-1.json => qemumonitorjson-nodename-basic-named-nodes.json} (96%) create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-blockstats.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-named-nodes.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob.result create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-blockstats.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-named-nodes.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty.result create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-blockstats.json rename tests/qemumonitorjsondata/{qemumonitorjson-nodename-gluster.json => qemumonitorjson-nodename-gluster-named-nodes.json} (89%) create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-blockstats.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-named-nodes.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi.result create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-blockstats.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-named-nodes.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks.result create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old-blockstats.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old-named-nodes.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old.result create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-blockstats.json rename tests/qemumonitorjsondata/{qemumonitorjson-nodename-relative.json => qemumonitorjson-nodename-relative-named-nodes.json} (97%) create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-blockstats.json rename tests/qemumonitorjsondata/{qemumonitorjson-nodename-same-backing.json => qemumonitorjson-nodename-same-backing-named-nodes.json} (96%) rename tests/{virmacmapmock.c => virdeterministichashmock.c} (100%) -- 2.13.2

4 58

[libvirt] [PATCH v3 0/2] Allow saving VM state to pipe
by Chen Hanxiao 03 Aug '17

03 Aug '17

This series introduce flag VIR_DOMAIN_SAVE_DIRECT to enable command 'save' to write to PIPE. This will write QEMU_SAVE_MAGIC directly. Base upon patches from Roy Keene <rkeene(a)knightpoint.com> with some fixes. Change from original patch: 1) Check whether the specified path is a PIPE. 2) Rebase on upstream. 3) Add doc for virsh command v3: add doc/news.xml rebase on upstream v2-resend: rebase on upstream v2: rename VIR_DOMAIN_SAVE_PIPE to VIR_DOMAIN_SAVE_DIRECT remove S_ISFIFO check Chen Hanxiao (2): qemu: Allow qemuDomainSaveMemory saving VM state to a pipe virsh: introduce flage --direct for save command docs/news.xml | 9 +++++++ include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_driver.c | 54 ++++++++++++++++++++++++++-------------- tools/virsh-domain.c | 6 +++++ tools/virsh.pod | 5 +++- 5 files changed, 56 insertions(+), 19 deletions(-) -- 2.7.4

2 6

[libvirt] [dbus PATCH 0/9] code cleanup
by Pavel Hrdina 02 Aug '17

02 Aug '17

Pavel Hrdina (9): util: move bus_path_for_domain and domain_from_bus_path util: move and rename virDomainsFreep domain: split domain code into separate file events: split event code into separate file util: rename function to follow libvirt naming rules main: rename functions to follow libvirt naming rules manager: rename functions and structures to follow libvirt naming rules domain: rename functions to follow libvirt naming rules events: rename functions to follow libvirt naming rules src/Makefile.am | 4 +- src/domain.c | 549 +++++++++++++++++++++++++++++++++ src/domain.h | 10 + src/events.c | 252 ++++++++++++++++ src/events.h | 9 + src/main.c | 44 +-- src/manager.c | 920 ++++---------------------------------------------------- src/manager.h | 18 +- src/util.c | 35 ++- src/util.h | 39 ++- 10 files changed, 970 insertions(+), 910 deletions(-) create mode 100644 src/domain.c create mode 100644 src/domain.h create mode 100644 src/events.c create mode 100644 src/events.h -- 2.13.3

2 14

[libvirt] [libvirt-php PATCH 0/7] add bindings for NWFilter APIs
by Dawid Zamirski 01 Aug '17

01 Aug '17

Hello, This series adds support for libvirt's virNWFilter* APIs. Since it introduces new resource type, I took the opportunity to cleanup the driver code a little: * in patches 1-3: added macros to take care of the differences in how PHP5 and PHP7 handle resource types. * in patch 4: libvirt_doman_get_connect was segfaulting when called multiple times because it was not bumping reference count on the resource it was returning to the calling code. * in patch 5: added a macro to take care of the differences in how PHP5 and PHP7 initialize arrays. * patches 6 and 7: implement the missing binding to NWFilter APIs. Dawid Zamirski (7): move macros to header file. add wrappers for PHP resource handling. update code to use resource handling macros fix libvirt_doman_get_connect implementation. add and use VIRT_ARRAY_INIT macro add nwfilter resource type implement NWFilter API bindings. src/libvirt-php.c | 923 +++++++++++++++++++++++++++++++----------------------- src/libvirt-php.h | 150 ++++++++- 2 files changed, 672 insertions(+), 401 deletions(-) -- 2.13.0

4 16

[libvirt] [PATCH v2] tools: virsh: Adding unix socket support to 'domdisplay' command.
by Julio Faracco 01 Aug '17

01 Aug '17

This commit adds the unix socket URL support to 'domdisplay' command. Before, even if an user was using unix socket to define a spice graphics, the command 'domdisplay' showed that the settings were not supported. Now, the command shows the proper URL: spice+unix://foo/bar.sock. Settings: <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'> <listen type='address' address='127.0.0.1'/> </graphics> <graphics type='spice'> <listen type='socket' socket='/tmp/spice.sock'/> </graphics> Before: virsh # domdisplay --all Windows7 vnc://127.0.0.1:0 After: virsh # domdisplay --all Windows7 vnc://127.0.0.1:0 spice+unix:///tmp/spice.sock Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1336720 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tools/virsh-domain.c | 52 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0684979..935ef8a 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10948,6 +10948,8 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) char *xpath = NULL; char *listen_addr = NULL; int port, tls_port = 0; + char *type_conn = NULL; + char *socket = NULL; char *passwd = NULL; char *output = NULL; const char *scheme[] = { "vnc", "spice", "rdp", NULL }; @@ -11008,9 +11010,6 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) if (tmp) tls_port = 0; - if (!port && !tls_port) - continue; - /* Create our XPATH lookup for the current display's address */ if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "@listen") < 0) goto cleanup; @@ -11021,6 +11020,29 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) listen_addr = virXPathString(xpath, ctxt); VIR_FREE(xpath); + /* Create our XPATH lookup for the current spice type. */ + if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@type") < 0) + goto cleanup; + + /* Attempt to get the type of spice connection */ + VIR_FREE(type_conn); + type_conn = virXPathString(xpath, ctxt); + VIR_FREE(xpath); + + if (STREQ_NULLABLE(type_conn, "socket")) { + if (!socket) { + if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@socket") < 0) + goto cleanup; + + socket = virXPathString(xpath, ctxt); + + VIR_FREE(xpath); + } + } + + if (!port && !tls_port && !socket) + continue; + if (!listen_addr) { /* The subelement address - <listen address='xyz'/> - * *should* have been automatically backfilled into its @@ -11035,11 +11057,9 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) listen_addr = virXPathString(xpath, ctxt); VIR_FREE(xpath); - } - - /* If listen_addr is 0.0.0.0 or [::] we should try to parse URI and set - * listen_addr based on current URI. */ - if (listen_addr) { + } else { + /* If listen_addr is 0.0.0.0 or [::] we should try to parse URI and set + * listen_addr based on current URI. */ if (virSocketAddrParse(&addr, listen_addr, AF_UNSPEC) > 0 && virSocketAddrIsWildcard(&addr)) { @@ -11078,20 +11098,28 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) VIR_FREE(xpath); /* Build up the full URI, starting with the scheme */ - virBufferAsprintf(&buf, "%s://", scheme[iter]); + if (socket) + virBufferAsprintf(&buf, "%s+unix://", scheme[iter]); + else + virBufferAsprintf(&buf, "%s://", scheme[iter]); /* There is no user, so just append password if there's any */ if (STREQ(scheme[iter], "vnc") && passwd) virBufferAsprintf(&buf, ":%s@", passwd); /* Then host name or IP */ - if (!listen_addr) + if (!listen_addr && !socket) virBufferAddLit(&buf, "localhost"); - else if (strchr(listen_addr, ':')) + else if (!socket && strchr(listen_addr, ':')) virBufferAsprintf(&buf, "[%s]", listen_addr); + else if (socket) + virBufferAsprintf(&buf, "%s", socket); else virBufferAsprintf(&buf, "%s", listen_addr); + /* Free socket to prepare the pointer for the next iteration */ + VIR_FREE(socket); + /* Add the port */ if (port) { if (STREQ(scheme[iter], "vnc")) { @@ -11148,6 +11176,8 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(xpath); + VIR_FREE(type_conn); + VIR_FREE(socket); VIR_FREE(passwd); VIR_FREE(listen_addr); VIR_FREE(output); -- 2.7.4

2 2

[libvirt] [PATCH 0/7] Misc improvements
by Michal Privoznik 31 Jul '17

31 Jul '17

As I started to turn more object into using RW locks, I've found couple of areas for improvement too. Michal Privoznik (7): virConnect: Update comment for @privateData Report error if virMutexInit fails virnetworkobj: Make virNetworkObjFindBy{UUID,Name}Locked() static again virNetworkObjList: Derive from virObjectRWLockable virNodeDeviceObjList: Derive from virObjectRWLockable virConnect: Derive from virObjectRWLockable storageDriver: Use RW locks src/bhyve/bhyve_driver.c | 1 + src/conf/virnetworkobj.c | 42 ++++++++++---------------------- src/conf/virnetworkobj.h | 8 ------- src/conf/virnodedeviceobj.c | 16 ++++++------- src/conf/virstorageobj.h | 2 +- src/datatypes.c | 6 +++-- src/datatypes.h | 6 ++--- src/libvirt_private.syms | 2 -- src/lxc/lxc_driver.c | 1 + src/lxc/lxc_fuse.c | 4 +++- src/network/bridge_driver.c | 1 + src/node_device/node_device_hal.c | 1 + src/nwfilter/nwfilter_dhcpsnoop.c | 12 +++++++--- src/nwfilter/nwfilter_driver.c | 5 +++- src/nwfilter/nwfilter_gentech_driver.c | 4 +++- src/secret/secret_driver.c | 2 ++ src/storage/storage_driver.c | 44 +++++++++++++++++++--------------- src/uml/uml_driver.c | 1 + src/util/virerror.c | 2 +- src/util/virnetlink.c | 1 + src/util/virthreadpool.c | 4 +++- src/vmware/vmware_driver.c | 5 +++- src/vz/vz_driver.c | 4 +++- tools/virsh-console.c | 4 +++- 24 files changed, 94 insertions(+), 84 deletions(-) -- 2.13.0

4 18

[libvirt] [PATCH 0/7] Some virObjectRW* adjustments
by John Ferlan 31 Jul '17

31 Jul '17

As indicated in a couple of recent reviews, the new virObjectRWLockable object and API's I believe needed a few adjustments in order to make them better. So I present those thoughts in patch format to be hopefully dicussed and dissected. Essentially this series, will modify the newly added virObjectLockRead to return a status and to have that status managed. Since there were only 9 new callers, this was straightforward. None of the callers actually needed any sort of "divert logic" in order to jump around code that shouldn't do the Unlock now. Although that could be a problem if ever changing other more deeply nested type locks. That's someone else's headache though. Next, introduce and use virObjectLockWrite to be only for the new style RWLocks. This too will return status. Only the vir*Remove caller has a code path that I'm not happy with, but since these type locks have been processing along anyway without technically ensuring they have the lock before doing so, well no harm, no foul. Next, introduce and use virObjectRWUnlock. Rather than overloading the virObjectUnlock, let's just keep each caller doing it's one thing to be sure that the calling code is doing the "right thing". In this case, returning a failure status is just not going to work. We've gone too far down the path in order for a failure to cause some failure in the caller. We'll just treat it like virObjectUnlock and if the resource remains locked, well we'll find out relatively soon as the next time someone goes to read/write the list they'll be waiting for an unlock that will never happen because of some coding mistake. But that will save us from perhaps other dire consequences involving corruption. Finally, revert the virObjectLock and virObjectUnlock code to just manage virObjectLockable locks. No worse than what happened before the RWLock was introduced. Leaving the consumers to handle things as they would before - which probably ends up in some sort of awful state leading to memory corruption and a quick death as opposed to abort()'g in the void() function which has been deemed a don't do that type operation for libvirt. The last 2 patches actually have appeared before in various common object series postings, so they could be a v2 or 3 type logic, but I see them more related to this than that, so I present them here again. John Ferlan (7): util: Alter virObjectLockRead to return status util: Introduce and use virObjectLockWrite util: Only have virObjectLock handle virObjectLockable util: Introduce virObjectGetRWLockableObj util: Introduce and use virObjectRWUnlock util: Create common error path for invalid object util: Add safety net of checks to ensure valid object src/conf/virdomainobjlist.c | 81 +++++++++++++--------- src/libvirt_private.syms | 2 + src/util/virobject.c | 160 +++++++++++++++++++++++++++++++++----------- src/util/virobject.h | 10 ++- 4 files changed, 181 insertions(+), 72 deletions(-) -- 2.9.4

4 26

[libvirt] Entering freeze for libvirt-3.6.0
by Daniel Veillard 31 Jul '17

31 Jul '17

As planned I tagged 3.6.0-rc1 in git and I made the Release Candidate 1 signed tarball and rpms available from the usual place: ftp://libvirt.org/libvirt/ seems to work in my limited testing, https://ci.centos.org/view/libvirt/ is all green (except for mingw maybe there is a portability issue) Please give it a try, check other systems, and if everything goes well I will make RC2 over the week-end and 3.6.0 may land on Tuesday the 1st ! Thanks in advance, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

4 5

[libvirt] [PATCH 0/3] libxl: Add a test suite for libxl_domain_config generator
by Jim Fehlig 31 Jul '17

31 Jul '17

Long ago danpb posted some patches to test libvirt domXML to libxl_domain_config conversion https://www.redhat.com/archives/libvir-list/2014-May/msg01102.html Some of the prerequisite patches were pushed, but we've never managed to push patches actually providing the conversion tests. I sent several follow-ups to Dan's work but never converged on a satisfactory solution for all the Xen versions supported by libvirt. The last attempt was in Sept 2014 https://www.redhat.com/archives/libvir-list/2014-September/msg00698.html I tried to revive the work in Jan 2015, but that also stalled https://www.redhat.com/archives/libvir-list/2015-January/msg00924.html Fast-forward over 2.5 years from the first attempt and libvirt no longer supports older Xen versions 4.2 and 4.3 that were proving to be problematic. Starting with Xen 4.5 libxl added support for libxl_domain_config_from_json, which provides a way to implement the conversion tests that work with all Xen versions >= 4.5 (including latest xen.git master). The previous approaches compared a static json doc with the results of domXML->libxl_domain_config conversion done in the libxl driver. As discussed in those approaches, the json doc returned from libxl_domain_config_to_json can change over Xen releases as the libxl_domain_config object gains new fields, making it difficult to compare the conversion with a static doc. I had some time last week to pick at this thorn and reworked the test to make use of libxl_domain_config_from_json introduced in Xen 4.5. Instead of comparing the conversion results directly to a static json doc, the static doc is first round-tripped through _from_json -> _to_json. Any new fields added to libxl_domain_config object are then included in both docs, allowing comparison across multiple Xen releases. Patch3 provides the conversion tests using this new approach. The tests are not run on Xen 4.4 (oldest version currently supported by libvirt) since it does not provide libxl_domain_config_from_json. Patches 1 and 2 fix some issues found while working on the tests. See their commit messages for details. Jim Fehlig (3): libxl: determine device model version from emulator name libxl: relax checks on <emulator> libxl: Add a test suite for libxl_domain_config generator m4/virt-driver-libxl.m4 | 6 +- src/libxl/libxl_capabilities.c | 37 ++--- src/libxl/libxl_conf.c | 14 -- tests/Makefile.am | 18 ++- tests/libxlxml2domconfigdata/basic-hvm.json | 89 +++++++++++ tests/libxlxml2domconfigdata/basic-hvm.xml | 36 +++++ tests/libxlxml2domconfigdata/basic-pv.json | 65 ++++++++ tests/libxlxml2domconfigdata/basic-pv.xml | 28 ++++ tests/libxlxml2domconfigdata/moredevs-hvm.json | 111 +++++++++++++ tests/libxlxml2domconfigdata/moredevs-hvm.xml | 63 ++++++++ tests/libxlxml2domconfigtest.c | 208 +++++++++++++++++++++++++ tests/virmocklibxl.c | 87 +++++++++++ 12 files changed, 723 insertions(+), 39 deletions(-) create mode 100644 tests/libxlxml2domconfigdata/basic-hvm.json create mode 100644 tests/libxlxml2domconfigdata/basic-hvm.xml create mode 100644 tests/libxlxml2domconfigdata/basic-pv.json create mode 100644 tests/libxlxml2domconfigdata/basic-pv.xml create mode 100644 tests/libxlxml2domconfigdata/moredevs-hvm.json create mode 100644 tests/libxlxml2domconfigdata/moredevs-hvm.xml create mode 100644 tests/libxlxml2domconfigtest.c create mode 100644 tests/virmocklibxl.c -- 2.11.0

2 13

[libvirt] [PATCH] news: Update for 3.6.0 release
by Michal Privoznik 30 Jul '17

30 Jul '17

I was volunteered to prepare the release notes. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Feel free to propose your stuff too if I forgot to add it. docs/news.xml | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index ea21cbc3e..03494d257 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -75,8 +75,77 @@ configurations. </description> </change> + <change> + <summary> + Require use of GCC 4.4 or CLang compilers + </summary> + <description> + We only ever test libvirt with GCC or CLang which provides a + GCC compatible compilation environment. Between them, these + compilers cover every important operating system platform, + even Windows. + </description> + </change> + <change> + <summary> + qemu: shared disks with directsync cache should be safe for migration + </summary> + <description> + At present shared disks can be migrated with either readonly or + <code>cache=none</code>. But <code>cache=directsync</code> should be + safe for migration, because both <code>cache=directsync</code> and + cache=none don't use the host page cache, and + <code>cache=direct</code> write through qemu block layer cache. + </description> + </change> + <change> + <summary> + Handle hotplug change on VLAN configuration using OVS + </summary> + <description> + Libvirt was taught to handle VLAN change for running OVS interface. + </description> + </change> </section> <section title="Bug fixes"> + <change> + <summary> + qemu: Use vcpu 'node-id' property and pass it back to qemu + </summary> + <description> + Vcpu properties gathered from query-hotpluggable cpus need to be + passed back to qemu. As qemu did not use the node-id property until + now and libvirt forgot to pass it back properly (it was parsed but + not passed around) we did not honor this. + </description> + </change> + <change> + <summary> + Misceleanous stream fixes + </summary> + <description> + After introducing sparse stream features there were still some known + bugs left. Those are fixed in this release. + </description> + </change> + <change> + <summary> + Misceleanous qemu domain NS fixes + </summary> + <description> + Libvirt starts qemu domains in separate Linux namespaces for a while + now. However, there were still some bugs lingering. For instance + libvirt did not know how to handle file based bind mounts. + </description> + </change> + <change> + <summary> + Various CPU driver improvements + </summary> + <description> + There were some minor bugs when using 'host-model' CPU. + </description> + </change> </section> </release> <release version="v3.5.0" date="2017-07-04"> -- 2.13.0

2 1

[libvirt] [PATCH V2 0/2]
by Jim Fehlig 29 Jul '17

29 Jul '17

This is V2 of a long standing series to add unit tests for libvirt domXML to libxl_domain_config conversions. There's a lot more history than a V2 would imply, which can be read in the last posting of the series https://www.redhat.com/archives/libvir-list/2017-February/msg01477.html Unlike attempts of the past, I actually feel good about this version and I hope others feel the same so we can finally get the series pushed! Patch1 changes the checks for <emulator> in the libxl driver to make them mockable. Patch2 provides mocking of the emulator checks and some libxl functions, and of course provides the tests. Jim Fehlig (2): libxl: make emulator checks mockable libxl: Add a test suite for libxl_domain_config generator m4/virt-driver-libxl.m4 | 4 + src/libxl/libxl_capabilities.c | 30 +++- src/libxl/libxl_capabilities.h | 5 +- src/libxl/libxl_conf.c | 17 +- src/libxl/libxl_domain.c | 2 +- tests/Makefile.am | 18 ++- tests/libxlxml2domconfigdata/basic-hvm.json | 89 +++++++++++ tests/libxlxml2domconfigdata/basic-hvm.xml | 36 +++++ tests/libxlxml2domconfigdata/basic-pv.json | 65 ++++++++ tests/libxlxml2domconfigdata/basic-pv.xml | 28 ++++ tests/libxlxml2domconfigdata/moredevs-hvm.json | 111 +++++++++++++ tests/libxlxml2domconfigdata/moredevs-hvm.xml | 63 ++++++++ tests/libxlxml2domconfigtest.c | 209 +++++++++++++++++++++++++ tests/virmocklibxl.c | 106 +++++++++++++ 14 files changed, 764 insertions(+), 19 deletions(-) create mode 100644 tests/libxlxml2domconfigdata/basic-hvm.json create mode 100644 tests/libxlxml2domconfigdata/basic-hvm.xml create mode 100644 tests/libxlxml2domconfigdata/basic-pv.json create mode 100644 tests/libxlxml2domconfigdata/basic-pv.xml create mode 100644 tests/libxlxml2domconfigdata/moredevs-hvm.json create mode 100644 tests/libxlxml2domconfigdata/moredevs-hvm.xml create mode 100644 tests/libxlxml2domconfigtest.c create mode 100644 tests/virmocklibxl.c -- 2.13.1

1 3

[libvirt] [PATCH v2 0/2] Add test case for node name detection
by Peter Krempa 28 Jul '17

28 Jul '17

Patch 2/2 was originallly included in the node name detection refactor. v2 does not contain an ugly hack to make virTestCompareToFile, but rather fixes the function to treat NULL as an empty string. Peter Krempa (2): tests: utils: Allow NULL strings to be equal to empty file in virTestCompareToFile tests: qemumonitorjson: Old and empty test case for node name detection .../qemumonitorjson-nodename-empty-blockstats.json | 2 + ...qemumonitorjson-nodename-empty-named-nodes.json | 2 + .../qemumonitorjson-nodename-empty.result | 0 .../qemumonitorjson-nodename-old-blockstats.json | 160 +++++++++++++++++++++ .../qemumonitorjson-nodename-old-named-nodes.json | 2 + .../qemumonitorjson-nodename-old.result | 0 tests/qemumonitorjsontest.c | 2 + tests/testutils.c | 5 + 8 files changed, 173 insertions(+) create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-blockstats.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-named-nodes.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty.result create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old-blockstats.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old-named-nodes.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old.result -- 2.13.2

3 4

[libvirt] [PATCH] qemu: Split shmem preparation as it's supposed to be
by Martin Kletzander 28 Jul '17

28 Jul '17

Since the introduction of shmem, there was a split of preparation code from the formatting code from qemuBuildCommandLine() into qemuProcessPrepareDomain(). Let's fix shmem in this regard, so that we can slowly get to a cleaner codebase. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_command.c | 30 +++++------------------------- src/qemu/qemu_process.c | 5 +++++ 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d14bb621148d..90471d89eb8c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8876,28 +8876,6 @@ qemuBuildShmemDevStr(virDomainDefPtr def, return virBufferContentAndReset(&buf); } -static char * -qemuBuildShmemBackendChrStr(virLogManagerPtr logManager, - virCommandPtr cmd, - virQEMUDriverConfigPtr cfg, - virDomainDefPtr def, - virDomainShmemDefPtr shmem, - virQEMUCapsPtr qemuCaps, - bool chardevStdioLogd) -{ - char *devstr = NULL; - - if (qemuDomainPrepareShmemChardev(shmem) < 0) - return NULL; - - devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, - &shmem->server.chr, - shmem->info.alias, qemuCaps, true, - chardevStdioLogd); - - return devstr; -} - virJSONValuePtr qemuBuildShmemBackendMemProps(virDomainShmemDefPtr shmem) @@ -9007,9 +8985,11 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager, VIR_FREE(devstr); if (shmem->server.enabled) { - if (!(devstr = qemuBuildShmemBackendChrStr(logManager, cmd, cfg, def, - shmem, qemuCaps, - chardevStdioLogd))) + devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + &shmem->server.chr, + shmem->info.alias, qemuCaps, true, + chardevStdioLogd); + if (!devstr) return -1; virCommandAddArgList(cmd, "-chardev", devstr, NULL); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 525521aaf0ca..b2e1314a3887 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5325,6 +5325,11 @@ qemuProcessPrepareDomain(virConnectPtr conn, if (qemuProcessUpdateGuestCPU(vm->def, priv->qemuCaps, caps, flags) < 0) goto cleanup; + for (i = 0; i < vm->def->nshmems; i++) { + if (qemuDomainPrepareShmemChardev(vm->def->shmems[i]) < 0) + goto cleanup; + } + ret = 0; cleanup: virObjectUnref(caps); -- 2.13.3

2 1

[libvirt] [PATCH v3 00/16] virObject adjustments for common object
by John Ferlan 28 Jul '17

28 Jul '17

v2: https://www.redhat.com/archives/libvir-list/2017-June/msg00070.html Pushed the first two patches from v2 since they were ACK'd Changes in this series... Fixed a couple of nits from former patch 3 & 4, but since they weren't ACK'd they're here again, but now as patch 1 & 2. Patch 3 & 4 are an adjusted version of the former patches 5 & 6. Instead of going with generic @primaryKey and @secondaryKey names, this patch will use @uuid and @name for the field names. Additionally instead of using PoolableHashElement as a name, go with a much shorter LookupKeys. So far the LookupKeys{UUID|Name} API's (patch 4) aren't used and could be dropped if it's felt no future API would need them. Former patches 7 & 8 dealing with the generic @def and @newDef object were tossed away and the rest of the logic I'd be changing for virObject is presented as the remaining (new to reviewers) patches 5 -> 16. The object is named using LookupHash which is a follow-on of the LookupKeys. If someone has better suggestion for names, then please provide suggestions rather than just saying I hate the name! It's not my favorite name, but it does convey what it is and IMO is better than just Element. The patches also include the Interface object changes to illustrate that the changes do work. I've run them through the various "interface" tests from the Avocado VT test suite. I also did something similar for the Secret object in my private branch, but did not include that since there are 8 patches on list waiting to be reviewed first. John Ferlan (16): util: Generate a common internal only error print util: Add safety net of checks to ensure valid object util: Introduce virObjectLookupKeys util: Introduce virObjectLookupKeysGet{UUID|Name} interface: Use virObjectLookupKeys util: Introduce virObjectLookupKeys*Active API's interface: Use virObjectLookupKeys*Active util: Introduce virObjectLookupHash util: Introduce virObjectLoookupHashGet{UUID|Name} util: Introduce virObjectLookupHash{Add|Remove} util: Introduce virObjectLookupHashFind util: Introduce virObjectLookupHashForEach util: Introduce virObjectLookupHashSearch util: Introduce virObjectLookupHashClone interface: Use virObjectLookupHash test: Clean up test driver Interface interactions src/conf/virinterfaceobj.c | 332 ++++++++++++++---------- src/libvirt_private.syms | 16 ++ src/test/test_driver.c | 55 +--- src/util/virobject.c | 613 ++++++++++++++++++++++++++++++++++++++++++++- src/util/virobject.h | 111 ++++++++ 5 files changed, 938 insertions(+), 189 deletions(-) -- 2.9.4

2 22

[libvirt] [PATCH 0/2] tests: fix build without WITH_LIBVIRTD defined
by Peter Krempa 28 Jul '17

28 Jul '17

'virdrivermoduletest' failure was caught by the centos ci. virt-aa-helper-test while testing it on my machine with specifically disabled libvirtd. Peter Krempa (2): tests: Run virt-aa-helper-test only when the helper was compiled tests: Run virdrivermoduletest only when WITH_LIBVIRTD is defined tests/Makefile.am | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 2.13.2

2 3

[libvirt] [PATCH] docs: Format comment timestamp in UTC
by Martin Kletzander 28 Jul '17

28 Jul '17

I just forgot '-u' in a54c9622860a. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index a5bff7de1c9d..34f84e526daa 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -198,9 +198,9 @@ MAINTAINERCLEANFILES = \ timestamp="$(shell if test -n "$$SOURCE_DATE_EPOCH"; \ then \ - date --date="@$$SOURCE_DATE_EPOCH"; \ + date -u --date="@$$SOURCE_DATE_EPOCH"; \ else \ - date; \ + date -u; \ fi)" all-am: web -- 2.13.3

2 1

[libvirt] [PATCH 0/2] Introduce the virDomainNetModel enumeration
by Andrea Bolognani 28 Jul '17

28 Jul '17

More information in the commit message for patch 2/2. Nobody reads cover letters anyway. Andrea Bolognani (2): tests: Prepare for stricter NIC model validation conf: Introduce the virDomainNetModel enumeration src/bhyve/bhyve_command.c | 6 +-- src/bhyve/bhyve_parse_command.c | 6 ++- src/conf/domain_conf.c | 63 ++++++++++++++++------ src/conf/domain_conf.h | 28 +++++++++- src/libvirt_private.syms | 2 + src/libxl/libxl_conf.c | 7 +-- src/qemu/qemu_command.c | 14 +++-- src/qemu/qemu_domain.c | 24 ++++----- src/qemu/qemu_domain_address.c | 47 ++++++++++------ src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_hotplug.c | 11 ++-- src/qemu/qemu_interface.c | 8 +-- src/qemu/qemu_parse_command.c | 10 +++- src/security/virt-aa-helper.c | 2 +- src/vbox/vbox_common.c | 27 +++++----- src/vmx/vmx.c | 53 +++++++++--------- src/xenconfig/xen_common.c | 21 ++++---- src/xenconfig/xen_sxpr.c | 23 ++++---- .../qemuxml2argv-tap-vhost-incorrect.xml | 2 +- .../qemuxml2xmlout-tap-vhost-incorrect.xml | 2 +- 20 files changed, 227 insertions(+), 132 deletions(-) -- 2.7.5

3 8

[libvirt] [PATCH v2 0/5] Workaround mdev uevent race affecting node device driver
by Erik Skultety 28 Jul '17

28 Jul '17

v1 here https://www.redhat.com/archives/libvir-list/2017-June/msg00826.html This series addresses [1]. It builds on top of [2], series which introduces a few small fixes and improvements. Even though that one hasn't gotten a review yet, you can fetch and build this from my github branch [3]. Changes since v1: - moved the device handling routine into a detached worker thread, so the event loop wouldn't block - adjusted virFileAccess according to the reviewer's comments Notes: Merging the nodedev obj's refactor storing the list of nodedev objects in a self-lockable object made it possible to drop the driver locks at certain spots either completely or at least rearrange them according to the needs. The worker thread therefore doesn't need to hold the driver lock while waiting on the device's attributes to appear (which would be wrong anyway, since it would still block the event loop) and only acquires the driver lock when doing sanity checks on the udev monitor. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1463285 [2] https://www.redhat.com/archives/libvir-list/2017-July/msg01077.html [3] https://github.com/eskultety/libvirt/commits/mdev-nodedev-next Erik Skultety (5): nodedev: Introduce udevCheckMonitorFD helper function udev: Split udevEventHandleCallback in two functions udev: Convert udevEventHandleThread to an actual thread routine util: Introduce virFileWaitForAccess nodedev: Work around the uevent race by hooking up virFileWaitForAccess src/libvirt_private.syms | 1 + src/node_device/node_device_udev.c | 194 +++++++++++++++++++++++++++++++------ src/util/virfile.c | 29 ++++++ src/util/virfile.h | 2 + 4 files changed, 194 insertions(+), 32 deletions(-) -- 2.13.3

1 6

[libvirt] [PATCH] nodedev: Fix double unlock of the driver on udevEnumerateDevices failure
by Erik Skultety 28 Jul '17

28 Jul '17

Commit @4cb719b2dc moved the driver locks around since these have become unnecessary at spots where the code handles now self-lockable object list, but missed the possible double unlock if udevEnumerateDevices fails, because at that point the driver lock had been already dropped. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/node_device/node_device_udev.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 4762f1969..4c35fd5c9 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1789,18 +1789,18 @@ nodeStateInitialize(bool privileged, nodeDeviceLock(); if (!(driver->devs = virNodeDeviceObjListNew())) - goto cleanup; + goto unlock; driver->nodeDeviceEventState = virObjectEventStateNew(); if (udevPCITranslateInit(privileged) < 0) - goto cleanup; + goto unlock; udev = udev_new(); if (!udev) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to create udev context")); - goto cleanup; + goto unlock; } #if HAVE_UDEV_LOGGING /* cast to get rid of missing-format-attribute warning */ @@ -1811,7 +1811,7 @@ nodeStateInitialize(bool privileged, if (priv->udev_monitor == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("udev_monitor_new_from_netlink returned NULL")); - goto cleanup; + goto unlock; } udev_monitor_enable_receiving(priv->udev_monitor); @@ -1837,11 +1837,11 @@ nodeStateInitialize(bool privileged, VIR_EVENT_HANDLE_READABLE, udevEventHandleCallback, NULL, NULL); if (priv->watch == -1) - goto cleanup; + goto unlock; /* Create a fictional 'computer' device to root the device tree. */ if (udevSetupSystemDev() != 0) - goto cleanup; + goto unlock; nodeDeviceUnlock(); @@ -1852,9 +1852,12 @@ nodeStateInitialize(bool privileged, return 0; cleanup: - nodeDeviceUnlock(); nodeStateCleanup(); return -1; + + unlock: + nodeDeviceUnlock(); + goto cleanup; } -- 2.13.3

4 5

[libvirt] [PATCH] tools: virsh: Adding unix socket support to 'domdisplay' command.
by Julio Faracco 28 Jul '17

28 Jul '17

This commit adds the unix socket URL support to 'domdisplay' command. Before, even if an user was using unix socket to define a spice graphics, the command 'domdisplay' showed that the settings were not supported. Now, the command shows the proper URL: spice+unix://foo/bar.sock. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1336720 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tools/virsh-domain.c | 49 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0684979..090714b 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10948,6 +10948,8 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) char *xpath = NULL; char *listen_addr = NULL; int port, tls_port = 0; + char *type_conn = NULL; + char *socket = NULL; char *passwd = NULL; char *output = NULL; const char *scheme[] = { "vnc", "spice", "rdp", NULL }; @@ -11008,9 +11010,6 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) if (tmp) tls_port = 0; - if (!port && !tls_port) - continue; - /* Create our XPATH lookup for the current display's address */ if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "@listen") < 0) goto cleanup; @@ -11021,6 +11020,29 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) listen_addr = virXPathString(xpath, ctxt); VIR_FREE(xpath); + /* Create our XPATH lookup for the current spice type. */ + if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@type") < 0) + goto cleanup; + + /* Attempt to get the type of spice connection */ + VIR_FREE(type_conn); + type_conn = virXPathString(xpath, ctxt); + VIR_FREE(xpath); + + if (STREQ_NULLABLE(type_conn, "socket")) { + if (!socket) { + if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@socket") < 0) + goto cleanup; + + socket = virXPathString(xpath, ctxt); + + VIR_FREE(xpath); + } + } + + if (!port && !tls_port && !socket) + continue; + if (!listen_addr) { /* The subelement address - <listen address='xyz'/> - * *should* have been automatically backfilled into its @@ -11035,11 +11057,9 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) listen_addr = virXPathString(xpath, ctxt); VIR_FREE(xpath); - } - - /* If listen_addr is 0.0.0.0 or [::] we should try to parse URI and set - * listen_addr based on current URI. */ - if (listen_addr) { + } else { + /* If listen_addr is 0.0.0.0 or [::] we should try to parse URI and set + * listen_addr based on current URI. */ if (virSocketAddrParse(&addr, listen_addr, AF_UNSPEC) > 0 && virSocketAddrIsWildcard(&addr)) { @@ -11078,17 +11098,22 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) VIR_FREE(xpath); /* Build up the full URI, starting with the scheme */ - virBufferAsprintf(&buf, "%s://", scheme[iter]); + if (socket) + virBufferAsprintf(&buf, "%s+unix://", scheme[iter]); + else + virBufferAsprintf(&buf, "%s://", scheme[iter]); /* There is no user, so just append password if there's any */ if (STREQ(scheme[iter], "vnc") && passwd) virBufferAsprintf(&buf, ":%s@", passwd); /* Then host name or IP */ - if (!listen_addr) + if (!listen_addr && !socket) virBufferAddLit(&buf, "localhost"); - else if (strchr(listen_addr, ':')) + else if (!socket && strchr(listen_addr, ':')) virBufferAsprintf(&buf, "[%s]", listen_addr); + else if (STREQ(scheme[iter], "spice")) + virBufferAsprintf(&buf, "%s", socket); else virBufferAsprintf(&buf, "%s", listen_addr); @@ -11148,6 +11173,8 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(xpath); + VIR_FREE(socket); + VIR_FREE(type_conn); VIR_FREE(passwd); VIR_FREE(listen_addr); VIR_FREE(output); -- 2.7.4

2 3

[libvirt] about support quorum and replication in xml
by wang.guang55＠zte.com.cn 28 Jul '17

28 Jul '17

aGkNCg0KDQp3ZSB3aWlsbCB1c2UgcXVvcnVtIGFuZCByZXBsaWNhdGlvbiBpbiBxZW11Lg0KDQoN CmJ1dCB3ZSBmb3VuZCB0aGF0IGxpYnZpcnQgZG9lcyBub3Qgc3VwcG9ydCBxdW9ydW0gYW5kIHJl cGxpY2F0aW9uIGluIHhtbC4NCg0KDQpzbyB3ZSB3YW50IHN1Ym1pdCBzb21lIHBhdGNoZXMgZm9y IHN1cHBvcnRpbmcgcXVvcnVtIGFuZCByZXBsaWNhdGlvbiBpbiB4bWwNCg0KDQoNCg0KDQoNCmhv dyBhYm91dCBpdD8/Lg==

2 1

[libvirt] about support quorum and replication in libvirt
by wang.guang55＠zte.com.cn 27 Jul '17

27 Jul '17

aGkNCg0KDQp3ZSB3aWlsbCB1c2UgcXVvcnVtIGFuZCByZXBsaWNhdGlvbiBpbiBxZW11Lg0KDQoN CmJ1dCB3ZSBmb3VuZCB0aGF0IGxpYnZpcnQgZG9lcyBub3Qgc3VwcG9ydCBxdW9ydW0gYW5kIHJl cGxpY2F0aW9uIGluIHhtbC4NCg0KDQpzbyB3ZSB3YW50IHN1Ym1pdCBzb21lIHBhdGNoZXMgZm9y IHN1cHBvcnRpbmcgcXVvcnVtIGFuZCByZXBsaWNhdGlvbiBpbiB4bWwuDQoNCg0KaG93IGFib3V0 IGl0Pz8u

1 0

[libvirt] status of support for cache allocation technology?
by Chris Friesen 27 Jul '17

27 Jul '17

Hi, I'm just wondering what the current status is about exposing/controlling cache banks. Looking at the code, it appears that we report the banks as part of "virsh capabilities". Is it possible to associate a particular bank with a particular domain, or has that not yet merged? Is the "[PATH V10 00/12] Support cache tune in libvirt" patch series the most recent set of patches? Thanks, Chris

2 2

[libvirt] question about support quorum and replication in libvirt
by wang.guang55＠zte.com.cn 27 Jul '17

27 Jul '17

aGwNCg0Kd2Ugd2lpbGwgdXNlIHF1b3J1bSBhbmQgcmVwbGljYXRpb24gaW4gcWVtdS4NCg0KYnV0 IHdlIGZvdW5kIHRoYXQgbGlidmlydCBkb2VzIG5vdCBzdXBwb3J0IHF1b3J1bSBhbmQgcmVwbGlj YXRpb24gLg0KDQpzbyB3ZSB3YW50IHN1Ym1pdCBzb21lIHBhdGNoZXMgZm9yIHN1cHBvcmluZyBx dW9ydW0gYW5kIHJlcGxpY2F0aW9uIA0KDQpob3cgYWJvdXQgaXQ/Py4=

1 0

[libvirt] [PATCH 00/12] Cleanup website generation & add favicons
by Daniel P. Berrange 27 Jul '17

27 Jul '17

2 15

[libvirt] [PATCH v2] Add support for virtio-net.tx_queue_size
by Michal Privoznik 27 Jul '17

27 Jul '17

https://bugzilla.redhat.com/show_bug.cgi?id=1462653 Just like I've added support for setting rx_queue_size (in c56cdf259 and friends), qemu just gained support for setting tx ring size. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - Resend after 2e7d4916967 which introduced yet another qemu capability and thus made my patch not apply cleanly. docs/formatdomain.html.in | 16 +++++++++++++++- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 16 ++++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 4 ++++ src/qemu/qemu_capabilities.h | 3 +++ src/qemu/qemu_command.c | 8 ++++++++ src/qemu/qemu_domain.c | 16 +++++++++++----- ...e.args => qemuxml2argv-net-virtio-rxtxqueuesize.args} | 4 ++-- ...ize.xml => qemuxml2argv-net-virtio-rxtxqueuesize.xml} | 2 +- tests/qemuxml2argvtest.c | 5 +++-- ...e.xml => qemuxml2xmlout-net-virtio-rxtxqueuesize.xml} | 2 +- tests/qemuxml2xmltest.c | 2 +- 13 files changed, 71 insertions(+), 13 deletions(-) rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-rxqueuesize.args => qemuxml2argv-net-virtio-rxtxqueuesize.args} (85%) rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-rxqueuesize.xml => qemuxml2argv-net-virtio-rxtxqueuesize.xml} (93%) rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-virtio-rxqueuesize.xml => qemuxml2xmlout-net-virtio-rxtxqueuesize.xml} (96%) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index c12efcf78..58662cf48 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5071,7 +5071,7 @@ qemu-kvm -net nic,model=? /dev/null <source network='default'/> <target dev='vnet1'/> <model type='virtio'/> - <b><driver name='vhost' txmode='iothread' ioeventfd='on' event_idx='off' queues='5' rx_queue_size='256'> + <b><driver name='vhost' txmode='iothread' ioeventfd='on' event_idx='off' queues='5' rx_queue_size='256' tx_queue_size='256'> <host csum='off' gso='off' tso4='off' tso6='off' ecn='off' ufo='off' mrg_rxbuf='off'/> <guest csum='off' tso4='off' tso6='off' ecn='off' ufo='off'/> </driver> @@ -5201,6 +5201,20 @@ qemu-kvm -net nic,model=? /dev/null <b>In general you should leave this option alone, unless you are very certain you know what you are doing.</b> </dd> + <dt><code>tx_queue_size</code></dt> + <dd> + The optional <code>tx_queue_size</code> attribute controls + the size of virtio ring for each queue as described above. + The default value is hypervisor dependent and may change + across its releases. Moreover, some hypervisors may pose + some restrictions on actual value. For instance, latest + QEMU (as of 2017-07-13) requires value to be a power of two + from [256, 1024] range. + <span class="since">Since 3.6.0 (QEMU and KVM only)</span><br/><br/> + + <b>In general you should leave this option alone, unless you + are very certain you know what you are doing.</b> + </dd> <dt>virtio options</dt> <dd> For virtio interfaces, diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index fc1a40f96..6558a1b2d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2709,6 +2709,11 @@ <ref name='positiveInteger'/> </attribute> </optional> + <optional> + <attribute name='tx_queue_size'> + <ref name='positiveInteger'/> + </attribute> + </optional> <optional> <attribute name="txmode"> <choice> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3feeccb9f..c525936cb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9920,6 +9920,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, char *event_idx = NULL; char *queues = NULL; char *rx_queue_size = NULL; + char *tx_queue_size = NULL; char *str = NULL; char *filter = NULL; char *internal = NULL; @@ -10093,6 +10094,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, event_idx = virXMLPropString(cur, "event_idx"); queues = virXMLPropString(cur, "queues"); rx_queue_size = virXMLPropString(cur, "rx_queue_size"); + tx_queue_size = virXMLPropString(cur, "tx_queue_size"); } else if (xmlStrEqual(cur->name, BAD_CAST "filterref")) { if (filter) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -10490,6 +10492,16 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, } def->driver.virtio.rx_queue_size = q; } + if (tx_queue_size) { + unsigned int q; + if (virStrToLong_uip(tx_queue_size, NULL, 10, &q) < 0) { + virReportError(VIR_ERR_XML_DETAIL, + _("'tx_queue_size' attribute must be positive number: %s"), + tx_queue_size); + goto error; + } + def->driver.virtio.tx_queue_size = q; + } if ((str = virXPathString("string(./driver/host/@csum)", ctxt))) { if ((val = virTristateSwitchTypeFromString(str)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -10687,6 +10699,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(event_idx); VIR_FREE(queues); VIR_FREE(rx_queue_size); + VIR_FREE(tx_queue_size); VIR_FREE(str); VIR_FREE(filter); VIR_FREE(type); @@ -22558,6 +22571,9 @@ virDomainVirtioNetDriverFormat(char **outstr, if (def->driver.virtio.rx_queue_size) virBufferAsprintf(&buf, " rx_queue_size='%u'", def->driver.virtio.rx_queue_size); + if (def->driver.virtio.tx_queue_size) + virBufferAsprintf(&buf, " tx_queue_size='%u'", + def->driver.virtio.tx_queue_size); virDomainVirtioOptionsFormat(&buf, def->virtio); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index af15ee8b5..e3c736dc7 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -969,6 +969,7 @@ struct _virDomainNetDef { virTristateSwitch event_idx; unsigned int queues; /* Multiqueue virtio-net */ unsigned int rx_queue_size; + unsigned int tx_queue_size; struct { virTristateSwitch csum; virTristateSwitch gso; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 04aa8d53c..5a060ae98 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -431,6 +431,9 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "virtio.ats", "loadparm", "spapr-pci-host-bridge", + + /* 265 */ + "virtio-net.tx_queue_size", ); @@ -1697,6 +1700,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioNet[] = { { "tx", QEMU_CAPS_VIRTIO_TX_ALG }, { "event_idx", QEMU_CAPS_VIRTIO_NET_EVENT_IDX }, { "rx_queue_size", QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE }, + { "tx_queue_size", QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE }, { "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU }, }; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 8250b57b4..6e094e92e 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -418,6 +418,9 @@ typedef enum { QEMU_CAPS_LOADPARM, /* -machine loadparm */ QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, /* -device spapr-pci-host-bridge */ + /* 265 */ + QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, /* virtio-net-*.tx_queue_size */ + QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6ac26af3e..8ff6d2176 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3733,6 +3733,14 @@ qemuBuildNicDevStr(virDomainDefPtr def, } virBufferAsprintf(&buf, ",rx_queue_size=%u", net->driver.virtio.rx_queue_size); } + if (usingVirtio && net->driver.virtio.tx_queue_size) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtio tx_queue_size option is not supported with this QEMU binary")); + goto error; + } + virBufferAsprintf(&buf, ",tx_queue_size=%u", net->driver.virtio.tx_queue_size); + } if (usingVirtio && net->mtu) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_HOST_MTU)) { diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 464d3a1f9..50095b7df 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3169,11 +3169,17 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, goto cleanup; } - if (STREQ_NULLABLE(net->model, "virtio") && - net->driver.virtio.rx_queue_size & (net->driver.virtio.rx_queue_size - 1)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("rx_queue_size has to be a power of two")); - goto cleanup; + if (STREQ_NULLABLE(net->model, "virtio")) { + if (net->driver.virtio.rx_queue_size & (net->driver.virtio.rx_queue_size - 1)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("rx_queue_size has to be a power of two")); + goto cleanup; + } + if (net->driver.virtio.tx_queue_size & (net->driver.virtio.tx_queue_size - 1)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("tx_queue_size has to be a power of two")); + goto cleanup; + } } if (net->mtu && diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.args similarity index 85% rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.args rename to tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.args index 07c358a02..c78da3d17 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.args @@ -21,7 +21,7 @@ server,nowait \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --device virtio-net-pci,rx_queue_size=512,vlan=0,id=net0,mac=00:11:22:33:44:55,\ -bus=pci.0,addr=0x3 \ +-device virtio-net-pci,rx_queue_size=512,tx_queue_size=1024,vlan=0,id=net0,\ +mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \ -net user,vlan=0,name=hostnet0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.xml similarity index 93% rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.xml rename to tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.xml index d64e31df2..b51931d52 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.xml @@ -22,7 +22,7 @@ <interface type='user'> <mac address='00:11:22:33:44:55'/> <model type='virtio'/> - <driver rx_queue_size='512'/> + <driver rx_queue_size='512' tx_queue_size='1024'/> </interface> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b95ea46be..e496ac468 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1160,8 +1160,9 @@ mymain(void) QEMU_CAPS_VIRTIO_S390); DO_TEST("net-virtio-ccw", QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("net-virtio-rxqueuesize", - QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE); + DO_TEST("net-virtio-rxtxqueuesize", + QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, + QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE); DO_TEST_PARSE_ERROR("net-virtio-rxqueuesize-invalid-size", NONE); DO_TEST("net-eth", NONE); DO_TEST("net-eth-ifname", NONE); diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxqueuesize.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxtxqueuesize.xml similarity index 96% rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxqueuesize.xml rename to tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxtxqueuesize.xml index 78433026c..5c33a58ad 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxqueuesize.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxtxqueuesize.xml @@ -29,7 +29,7 @@ <interface type='user'> <mac address='00:11:22:33:44:55'/> <model type='virtio'/> - <driver rx_queue_size='512'/> + <driver rx_queue_size='512' tx_queue_size='1024'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 5e4b1d17f..724c8efd0 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -537,7 +537,7 @@ mymain(void) DO_TEST("net-eth-ifname", NONE); DO_TEST("net-eth-hostip", NONE); DO_TEST("net-virtio-network-portgroup", NONE); - DO_TEST("net-virtio-rxqueuesize", NONE); + DO_TEST("net-virtio-rxtxqueuesize", NONE); DO_TEST("net-hostdev", NONE); DO_TEST("net-hostdev-vfio", NONE); DO_TEST("net-midonet", NONE); -- 2.13.0

3 6

[libvirt] [PATCH] Revert "build: distribute tests/virfilecachedata"
by Pavel Hrdina 27 Jul '17

27 Jul '17

This reverts commit d3d422e00c995d50c4b78066367bfbc4f872f586. Already fixed by commit 5a30b817ec93543c7a6cc93b5a6091a6666e377e. --- Sigh, Dan pushed it before me while I was waiting for "make distcheck". Well, that happens :) tests/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index c96216766c..542c4a5729 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -145,7 +145,6 @@ EXTRA_DIST = \ vircgroupdata \ virconfdata \ virfiledata \ - virfilecachedata \ virjsondata \ virmacmaptestdata \ virmock.h \ -- 2.13.3

1 0

[libvirt] [PATCH] build: distribute tests/virfilecachedata
by Pavel Hrdina 27 Jul '17

27 Jul '17

Missed by 478f0c5b8575. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build-breaker rule. tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 8349bbec41..a7aa973746 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -147,6 +147,7 @@ EXTRA_DIST = \ vircgroupdata \ virconfdata \ virfiledata \ + virfilecachedata \ virjsondata \ virmacmaptestdata \ virmock.h \ -- 2.13.3

1 0

[libvirt] [PATCH] tests: add virfilecachedata to EXTRA_DIST
by Daniel P. Berrange 27 Jul '17

27 Jul '17

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a build fix tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 8349bbec4..9a822f7d5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -164,6 +164,7 @@ EXTRA_DIST = \ xml2sexprdata \ xml2vmxdata \ virstorageutildata \ + virfilecachedata \ $(NULL) test_helpers = commandhelper ssh -- 2.13.3

1 0

[libvirt] [PATCH 0/2] Resolve linking issue of storage driver to apparmor helper
by Peter Krempa 27 Jul '17

27 Jul '17

Also drop support for building without loadable modules. Peter Krempa (2): make: Drop building without driver modules security: apparmor: load the storage driver dynamically daemon/Makefile.am | 57 --------------- daemon/libvirtd.c | 54 +------------- m4/virt-driver-modules.m4 | 24 +++---- src/Makefile.am | 160 +----------------------------------------- src/driver.c | 8 +-- src/security/virt-aa-helper.c | 10 +-- src/storage/storage_backend.c | 11 +-- src/vbox/vbox_driver.c | 2 +- src/vbox/vbox_driver.h | 6 +- tests/Makefile.am | 6 -- tests/testutils.c | 2 - tools/virsh.c | 3 - 12 files changed, 27 insertions(+), 316 deletions(-) -- 2.13.2

2 4

[libvirt] [PATCH v2 0/3] properly handle '=' in the VNC socket path
by Pavel Hrdina 27 Jul '17

27 Jul '17

Pavel Hrdina (3): qemu: capabilities: introduce QEMU_CAPS_VNC_MULTI_SERVERS qemu: properly handle '=' in the VNC socket path tests: add test case for new syntax of VNC unix path with '=' src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 ++++- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + ...muxml2argv-graphics-vnc-socket-new-cmdline.args | 22 ++++++++++++++++++++++ ...emuxml2argv-graphics-vnc-socket-new-cmdline.xml | 20 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 19 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket-new-cmdline.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket-new-cmdline.xml -- 2.13.3

2 5

[libvirt] [PATCH v4] qemu: Check for existence of provided *_tls_x509_cert_dir
by John Ferlan 27 Jul '17

27 Jul '17

https://bugzilla.redhat.com/show_bug.cgi?id=1458630 Introduce virQEMUDriverConfigTLSDirResetDefaults in order to check if the defaultTLSx509certdir was changed, then change the default for any other *TLSx509certdir that was not set to the default default. Introduce virQEMUDriverConfigValidate to validate the existence of any of the *_tls_x509_cert_dir values that were uncommented/set, incuding the default. Update the qemu.conf description for default to describe the consequences if the default directory path does not exist. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v3: https://www.redhat.com/archives/libvir-list/2017-July/msg00915.html Changes since v3 - rework even more based on code review. src/qemu/qemu.conf | 8 ++++ src/qemu/qemu_conf.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_conf.h | 4 ++ src/qemu/qemu_driver.c | 3 ++ 4 files changed, 119 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 1d81472..f977e3b 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -13,6 +13,14 @@ # # dh-params.pem - the DH params configuration file # +# If the directory does not exist or contain the necessary files, QEMU +# domains will fail to start if they are configured to use TLS. +# +# In order to overwrite the default path alter the following. This path +# definition will be used as the default path for other *_tls_x509_cert_dir +# configuration settings if their default path does not exist or is not +# specifically set. +# #default_tls_x509_cert_dir = "/etc/pki/qemu" diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c4714ed..1a4a998 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -425,6 +425,43 @@ virQEMUDriverConfigHugeTLBFSInit(virHugeTLBFSPtr hugetlbfs, } +/** + * @cfg: Just read config TLS values + * + * If the default_tls_x509_cert_dir was uncommented or changed from + * the default value assigned to the *_tls_x509_cert_dir values when + * virQEMUDriverConfigNew was executed, we need to check if we need + * to update the other defaults. + * + * Returns 0 on success, -1 on failure + */ +static int +virQEMUDriverConfigTLSDirResetDefaults(virQEMUDriverConfigPtr cfg) +{ + /* Not changed or set to the default default, nothing to do */ + if (!cfg->checkdefaultTLSx509certdir || + STREQ(cfg->defaultTLSx509certdir, SYSCONFDIR "/pki/qemu")) + return 0; + +#define CHECK_RESET_CERT_DIR_DEFAULT(val) \ + do { \ + if (STREQ(cfg->val ## TLSx509certdir, SYSCONFDIR "/pki/qemu")) { \ + VIR_FREE(cfg->val ## TLSx509certdir); \ + if (VIR_STRDUP(cfg->val ## TLSx509certdir, \ + cfg->defaultTLSx509certdir) < 0) \ + return -1; \ + } \ + } while (0) + + CHECK_RESET_CERT_DIR_DEFAULT(vnc); + CHECK_RESET_CERT_DIR_DEFAULT(spice); + CHECK_RESET_CERT_DIR_DEFAULT(chardev); + CHECK_RESET_CERT_DIR_DEFAULT(migrate); + + return 0; +} + + int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, const char *filename, bool privileged) @@ -452,8 +489,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (!(conf = virConfReadFile(filename, 0))) goto cleanup; - if (virConfGetValueString(conf, "default_tls_x509_cert_dir", &cfg->defaultTLSx509certdir) < 0) + if ((rv = virConfGetValueString(conf, "default_tls_x509_cert_dir", &cfg->defaultTLSx509certdir)) < 0) goto cleanup; + cfg->checkdefaultTLSx509certdir = (rv == 1); if (virConfGetValueBool(conf, "default_tls_x509_verify", &cfg->defaultTLSx509verify) < 0) goto cleanup; if (virConfGetValueString(conf, "default_tls_x509_secret_uuid", @@ -549,6 +587,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, #undef GET_CONFIG_TLS_CERTINFO + if (virQEMUDriverConfigTLSDirResetDefaults(cfg) < 0) + goto cleanup; + if (virConfGetValueUInt(conf, "remote_websocket_port_min", &cfg->webSocketPortMin) < 0) goto cleanup; if (cfg->webSocketPortMin < QEMU_WEBSOCKET_PORT_MIN) { @@ -873,6 +914,68 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, return ret; } + +/** + * @cfg: Recently read config values + * + * Validate the recently read configuration values. + * + * Returns 0 on success, -1 on failure + */ +int +virQEMUDriverConfigValidate(virQEMUDriverConfigPtr cfg) +{ + /* If the default entry was uncommented, then validate existence */ + if (cfg->checkdefaultTLSx509certdir) { + if (!virFileExists(cfg->defaultTLSx509certdir)) { + virReportError(VIR_ERR_CONF_SYNTAX, + _("default_tls_x509_cert_dir directory '%s' " + "does not exist"), + cfg->defaultTLSx509certdir); + return -1; + } + } + + /* For each of the others - if the value is not to the default default + * then check if the directory exists (this may duplicate the check done + * during virQEMUDriverConfigNew). + */ + if (STRNEQ(cfg->vncTLSx509certdir, SYSCONFDIR "/pki/qemu") && + !virFileExists(cfg->vncTLSx509certdir)) { + virReportError(VIR_ERR_CONF_SYNTAX, + _("vnc_tls_x509_cert_dir directory '%s' does not exist"), + cfg->vncTLSx509certdir); + return -1; + } + + if (STRNEQ(cfg->spiceTLSx509certdir, SYSCONFDIR "/pki/qemu") && + !virFileExists(cfg->spiceTLSx509certdir)) { + virReportError(VIR_ERR_CONF_SYNTAX, + _("spice_tls_x509_cert_dir directory '%s' does not exist"), + cfg->spiceTLSx509certdir); + return -1; + } + + if (STRNEQ(cfg->chardevTLSx509certdir, SYSCONFDIR "/pki/qemu") && + !virFileExists(cfg->chardevTLSx509certdir)) { + virReportError(VIR_ERR_CONF_SYNTAX, + _("chardev_tls_x509_cert_dir directory '%s' does not exist"), + cfg->chardevTLSx509certdir); + return -1; + } + + if (STRNEQ(cfg->migrateTLSx509certdir, SYSCONFDIR "/pki/qemu") && + !virFileExists(cfg->migrateTLSx509certdir)) { + virReportError(VIR_ERR_CONF_SYNTAX, + _("migrate_tls_x509_cert_dir directory '%s' does not exist"), + cfg->migrateTLSx509certdir); + return -1; + } + + return 0; +} + + virQEMUDriverConfigPtr virQEMUDriverGetConfig(virQEMUDriverPtr driver) { virQEMUDriverConfigPtr conf; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 3013f24..d469b50 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -113,6 +113,7 @@ struct _virQEMUDriverConfig { char *nvramDir; char *defaultTLSx509certdir; + bool checkdefaultTLSx509certdir; bool defaultTLSx509verify; char *defaultTLSx509secretUUID; @@ -302,6 +303,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, const char *filename, bool privileged); +int +virQEMUDriverConfigValidate(virQEMUDriverConfigPtr cfg); + virQEMUDriverConfigPtr virQEMUDriverGetConfig(virQEMUDriverPtr driver); bool virQEMUDriverIsPrivileged(virQEMUDriverPtr driver); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a423663..3ad71e6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -667,6 +667,9 @@ qemuStateInitialize(bool privileged, goto error; VIR_FREE(driverConf); + if (virQEMUDriverConfigValidate(cfg) < 0) + goto error; + if (virFileMakePath(cfg->stateDir) < 0) { virReportSystemError(errno, _("Failed to create state dir %s"), cfg->stateDir); -- 2.9.4

2 1

[libvirt] Plans for next release
by Daniel Veillard 27 Jul '17

27 Jul '17

The end of the month is next week, so if we want to release around Aug 1st, I think we should enter freeze on Thursday morning, then I could make rc2 on Saturday and we could have the release on the Tuesday or Wed. Usually this is not the busiest time of the year but if this is a problem please raise this, thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH] build: Distribute tests/{qemucpumock.c, testutilshostcpus.h}
by Martin Kletzander 26 Jul '17

26 Jul '17

Missed by 13554a9e7f4e. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed under the build-breaker rule. tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 562c1c77178e..11a380163177 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -560,7 +560,7 @@ libqemutestdriver_la_LDFLAGS = $(QEMULIB_LDFLAGS) libqemutestdriver_la_LIBADD = $(qemu_LDADDS) qemucpumock_la_SOURCES = \ - qemucpumock.c + qemucpumock.c testutilshostcpus.h qemucpumock_la_CFLAGS = $(AM_CFLAGS) qemucpumock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) qemucpumock_la_LIBADD = $(MOCKLIBS_LIBS) @@ -674,7 +674,7 @@ EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \ qemumonitorjsontest.c qemuhotplugtest.c \ qemuagenttest.c qemucapabilitiestest.c \ qemucaps2xmltest.c qemucommandutiltest.c \ - qemumemlocktest.c \ + qemumemlocktest.c qemucpumock.c testutilshostcpus.h \ $(QEMUMONITORTESTUTILS_SOURCES) endif ! WITH_QEMU -- 2.13.3

1 0

[libvirt] [PATCH 00/16] Make the virNetworkObjPtr private
by John Ferlan 26 Jul '17

26 Jul '17

All part of the effort I have to have a common object model. This series is network test, driver, and virnetworkobj related to work towards that goal. By the last patch, the object is now private to virnetworkobj.c John Ferlan (16): test: Fix up formatting in network test API's test: Use consistent variable names for network test driver APIs network: Perform some formatting cleanup in bridge_driver network: Use consistent naming in bridge_driver for virNetwork objects network: Move macmap mgmt from bridge_driver to virnetworkobj network: Add virNetworkObj Get/Set API's for @dnsmasqPid and @radvdPid network: Alter virNetworkObj @class_id to be @classIdMap network: Add virNetworkObj Get/Set API's for @floor_sum network: Add virNetworkObj Get API's for @def and @newDef network: Introduce virNetworkObj{Get|Set}Autostart network: Introduce virNetworkObj{Is|Set}Active network: Introduce virNetworkObjIsPersistent network: Consistent use of @obj for virnetworkobj network: Adjust virNetworkObjNew call and return network: Modify naming for virNetworkObjList* fetching APIs network: Privatize virNetworkObj src/conf/virnetworkobj.c | 679 +++++++++++++++------ src/conf/virnetworkobj.h | 107 +++- src/libvirt_private.syms | 20 + src/network/bridge_driver.c | 1415 +++++++++++++++++++++++-------------------- src/network/bridge_driver.h | 50 +- src/test/test_driver.c | 279 +++++---- tests/networkxml2conftest.c | 13 +- 7 files changed, 1538 insertions(+), 1025 deletions(-) -- 2.9.3

2 37

[libvirt] [PATCH] docs: Add build timestamps to generated html/php pages
by Martin Kletzander 26 Jul '17

26 Jul '17

In order not to make the build even less reproducible, honour SOURCE_DATE_EPOCH environment variable as specified: https://reproducible-builds.org/specs/source-date-epoch/ Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/Makefile.am | 13 +++++++++---- docs/newapi.xsl | 2 ++ docs/page.xsl | 4 ++++ docs/site.xsl | 1 + docs/subsite.xsl | 1 + 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index e32758f4aa36..67a945a334f3 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -196,6 +196,8 @@ MAINTAINERCLEANFILES = \ $(addprefix $(srcdir)/,$(dot_php)) \ $(srcdir)/hvsupport.html.in $(srcdir)/aclperms.htmlinc +timestamp="$(shell if test -n "$$SOURCE_DATE_EPOCH"; then date --date="@$$SOURCE_DATE_EPOCH"; else date; fi)" + all-am: web api: $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml @@ -255,7 +257,8 @@ MAINTAINERCLEANFILES += \ $(MKDIR_P) $$dir; \ style=subsite.xsl; \ fi; \ - $(XSLTPROC) --stringparam pagename $$name --nonet \ + $(XSLTPROC) --stringparam pagename $$name \ + --stringparam timestamp $(timestamp) --nonet \ $(top_srcdir)/docs/$$style $< > $@ \ || { rm $@ && exit 1; }; fi @@ -270,9 +273,10 @@ MAINTAINERCLEANFILES += \ else echo "missing XHTML1 DTD"; cat $< > $(srcdir)/$@ ; fi ; fi %.php.tmp: %.php.in site.xsl page.xsl - @if [ -x $(XSLTPROC) ] ; then \ + if [ -x $(XSLTPROC) ] ; then \ echo "Generating $@"; \ - $(XSLTPROC) --stringparam pagename $(@:.tmp=) --nonet \ + $(XSLTPROC) --stringparam pagename $(@:.tmp=) \ + --stringparam timestamp $(timestamp) --nonet \ $(top_srcdir)/docs/site.xsl $< > $@ \ || { rm $@ && exit 1; }; fi @@ -289,6 +293,7 @@ html/index.html: libvirt-api.xml newapi.xsl page.xsl $(APIBUILD_STAMP) $(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \ $(XSLTPROC) --nonet -o $(srcdir)/ \ --stringparam builddir '$(abs_top_builddir)' \ + --stringparam timestamp $(timestamp) \ $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi && \ if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0 Strict//EN" \ @@ -299,7 +304,7 @@ html/index.html: libvirt-api.xml newapi.xsl page.xsl $(APIBUILD_STAMP) $(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl) $(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \ - $(XSLTPROC) --nonet -o $(srcdir)/devhelp/ \ + $(XSLTPROC) --stringparam timestamp $(timestamp) --nonet -o $(srcdir)/devhelp/ \ $(top_srcdir)/docs/devhelp/devhelp.xsl $(srcdir)/libvirt-api.xml ; fi diff --git a/docs/newapi.xsl b/docs/newapi.xsl index 9dd961507af4..d45bfc192d63 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -818,6 +818,7 @@ doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <xsl:apply-templates select="exsl:node-set($mainpage)" mode="page"> <xsl:with-param name="pagename" select="concat($htmldir, '/index.html')"/> + <xsl:with-param name="timestamp" select="$timestamp"/> </xsl:apply-templates> </xsl:document> @@ -834,6 +835,7 @@ doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <xsl:apply-templates select="exsl:node-set($subpage)" mode="page"> <xsl:with-param name="pagename" select="concat($htmldir, '/libvirt-', @name, '.html')"/> + <xsl:with-param name="timestamp" select="$timestamp"/> </xsl:apply-templates> </xsl:document> </xsl:for-each> diff --git a/docs/page.xsl b/docs/page.xsl index 1d662c670686..5d8e6e8263c3 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -75,11 +75,15 @@  <xsl:template match="/" mode="page"> <xsl:param name="pagename"/> + <xsl:param name="timestamp"/> <html> <xsl:comment> This file is autogenerated from <xsl:value-of select="$pagename"/>.in Do not edit this file. Changes will be lost. </xsl:comment> + <xsl:comment> + This page was generated at <xsl:value-of select="$timestamp"/>. + </xsl:comment> <head> <link rel="stylesheet" type="text/css" href="{$href_base}main.css"/> <link rel="SHORTCUT ICON" href="{$href_base}32favicon.png"/> diff --git a/docs/site.xsl b/docs/site.xsl index ce354c32fb59..b84630e39029 100644 --- a/docs/site.xsl +++ b/docs/site.xsl @@ -29,6 +29,7 @@ <xsl:template match="/"> <xsl:apply-templates select="." mode="page"> <xsl:with-param name="pagename" select="$pagename"/> + <xsl:with-param name="timestamp" select="$timestamp"/> </xsl:apply-templates> </xsl:template> diff --git a/docs/subsite.xsl b/docs/subsite.xsl index 108d0d83e509..6d2453f98e9c 100644 --- a/docs/subsite.xsl +++ b/docs/subsite.xsl @@ -19,6 +19,7 @@ <xsl:template match="/"> <xsl:apply-templates select="." mode="page"> <xsl:with-param name="pagename" select="$pagename"/> + <xsl:with-param name="timestamp" select="$timestamp"/> </xsl:apply-templates> </xsl:template> -- 2.13.3

2 1

[libvirt] [PATCH] docs: Fix documentation related to memory locking
by Nitesh Konkar 26 Jul '17

26 Jul '17

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index bceddd2..91195be 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -964,7 +964,7 @@ option opens up to a potential security risk: the host will be unable to reclaim the locked memory back from the guest when it's running out of memory, which means a malicious guest allocating large amounts of - locked memory could cause a denial-of-service attach on the host. + locked memory could cause a denial-of-service attack on the host. Because of this, using this option is discouraged unless your workload demands it; even then, it's highly recommended to set an <code>hard_limit</code> (see -- 2.9.4

2 1

[libvirt] [PATCH 0/3] properly handle '=' in the VNC socket path
by Pavel Hrdina 26 Jul '17

26 Jul '17

Pavel Hrdina (3): qemu: capabilities: introduce QEMU_CAPS_VNC_MULTI_SERVERS qemu: properly handle '=' in the VNC socket path tests: add test case for VNC unix path with '=' src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 3 ++ src/qemu/qemu_command.c | 5 ++- src/qemu/qemu_process.c | 51 ++++++++++++++++++++-- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + ...muxml2argv-graphics-vnc-socket-new-cmdline.args | 22 ++++++++++ ...emuxml2argv-graphics-vnc-socket-new-cmdline.xml | 20 +++++++++ ...argv-graphics-vnc-socket-path-not-supported.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-name-escape.args | 2 +- tests/qemuxml2argvtest.c | 5 +++ 22 files changed, 121 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket-new-cmdline.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket-new-cmdline.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket-path-not-supported.xml -- 2.13.3

2 5

[libvirt] [PATCH] qemu_cgroup: Remove unnecessary virQEMUDriverPtr arguments
by Martin Kletzander 26 Jul '17

26 Jul '17

Since commit 2e6ecba1bcac, the pointer to the qemu driver is saved in domain object's private data and hence does not have to be passed as yet another parameter if domain object is already one of them. This is a first (example) patch of this kind of clean up, others will hopefully follow. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_cgroup.c | 33 ++++++++++++++------------------- src/qemu/qemu_cgroup.h | 6 ++---- src/qemu/qemu_process.c | 4 ++-- 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 7355527c1cc5..6fc413098ae8 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -604,8 +604,7 @@ qemuTeardownChardevCgroup(virDomainObjPtr vm, static int -qemuSetupDevicesCgroup(virQEMUDriverPtr driver, - virDomainObjPtr vm) +qemuSetupDevicesCgroup(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; virQEMUDriverConfigPtr cfg = NULL; @@ -644,7 +643,7 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver, if (rv < 0) goto cleanup; - cfg = virQEMUDriverGetConfig(driver); + cfg = virQEMUDriverGetConfig(priv->driver); deviceACL = cfg->cgroupDeviceACL ? (const char *const *)cfg->cgroupDeviceACL : defaultDeviceACL; @@ -769,8 +768,7 @@ qemuSetupCpusetCgroup(virDomainObjPtr vm) static int -qemuSetupCpuCgroup(virQEMUDriverPtr driver, - virDomainObjPtr vm) +qemuSetupCpuCgroup(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; virObjectEventPtr event = NULL; @@ -806,7 +804,7 @@ qemuSetupCpuCgroup(virQEMUDriverPtr driver, event = virDomainEventTunableNewFromObj(vm, eventParams, eventNparams); } - qemuDomainEventQueue(driver, event); + qemuDomainEventQueue(priv->driver, event); } return 0; @@ -814,16 +812,15 @@ qemuSetupCpuCgroup(virQEMUDriverPtr driver, static int -qemuInitCgroup(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuInitCgroup(virDomainObjPtr vm, size_t nnicindexes, int *nicindexes) { int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; - virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(priv->driver); - if (!virQEMUDriverIsPrivileged(driver)) + if (!virQEMUDriverIsPrivileged(priv->driver)) goto done; if (!virCgroupAvailable()) @@ -954,14 +951,13 @@ qemuRestoreCgroupState(virDomainObjPtr vm) } int -qemuConnectCgroup(virQEMUDriverPtr driver, - virDomainObjPtr vm) +qemuConnectCgroup(virDomainObjPtr vm) { - virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv = vm->privateData; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(priv->driver); int ret = -1; - if (!virQEMUDriverIsPrivileged(driver)) + if (!virQEMUDriverIsPrivileged(priv->driver)) goto done; if (!virCgroupAvailable()) @@ -991,8 +987,7 @@ qemuConnectCgroup(virQEMUDriverPtr driver, } int -qemuSetupCgroup(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuSetupCgroup(virDomainObjPtr vm, size_t nnicindexes, int *nicindexes) { @@ -1005,13 +1000,13 @@ qemuSetupCgroup(virQEMUDriverPtr driver, return -1; } - if (qemuInitCgroup(driver, vm, nnicindexes, nicindexes) < 0) + if (qemuInitCgroup(vm, nnicindexes, nicindexes) < 0) return -1; if (!priv->cgroup) return 0; - if (qemuSetupDevicesCgroup(driver, vm) < 0) + if (qemuSetupDevicesCgroup(vm) < 0) goto cleanup; if (qemuSetupBlkioCgroup(vm) < 0) @@ -1020,7 +1015,7 @@ qemuSetupCgroup(virQEMUDriverPtr driver, if (qemuSetupMemoryCgroup(vm) < 0) goto cleanup; - if (qemuSetupCpuCgroup(driver, vm) < 0) + if (qemuSetupCpuCgroup(vm) < 0) goto cleanup; if (qemuSetupCpusetCgroup(vm) < 0) diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h index d016ce29d87e..3fc1583612e1 100644 --- a/src/qemu/qemu_cgroup.h +++ b/src/qemu/qemu_cgroup.h @@ -55,10 +55,8 @@ int qemuSetupChardevCgroup(virDomainObjPtr vm, virDomainChrDefPtr dev); int qemuTeardownChardevCgroup(virDomainObjPtr vm, virDomainChrDefPtr dev); -int qemuConnectCgroup(virQEMUDriverPtr driver, - virDomainObjPtr vm); -int qemuSetupCgroup(virQEMUDriverPtr driver, - virDomainObjPtr vm, +int qemuConnectCgroup(virDomainObjPtr vm); +int qemuSetupCgroup(virDomainObjPtr vm, size_t nnicindexes, int *nicindexes); int qemuSetupCpusetMems(virDomainObjPtr vm); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 87ab85fdb476..535c16b03705 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5595,7 +5595,7 @@ qemuProcessLaunch(virConnectPtr conn, } VIR_DEBUG("Setting up domain cgroup (if required)"); - if (qemuSetupCgroup(driver, vm, nnicindexes, nicindexes) < 0) + if (qemuSetupCgroup(vm, nnicindexes, nicindexes) < 0) goto cleanup; if (!(priv->perf = virPerfNew())) @@ -6821,7 +6821,7 @@ qemuProcessReconnect(void *opaque) if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0) goto error; - if (qemuConnectCgroup(driver, obj) < 0) + if (qemuConnectCgroup(obj) < 0) goto error; if (qemuDomainPerfRestart(obj) < 0) -- 2.13.3

2 1

[libvirt] [PATCH v3] qemu: Check for existence of provided *_tls_x509_cert_dir
by John Ferlan 26 Jul '17

26 Jul '17

https://bugzilla.redhat.com/show_bug.cgi?id=1458630 Introduce virQEMUDriverConfigTLSDirValidateResetDefault to validate that if any of the *_tls_x509_cert_dir values were set properly and reset the default value if the default_tls_x509_cert_dir changed. Update the qemu.conf description for default to describe the consequences if the default directory path does not exist. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v2: https://www.redhat.com/archives/libvir-list/2017-June/msg01341.html Follow-ups in July though. Changes since v2 - reduced verbosity in qemu.conf and adjusted the logic to create/call virQEMUDriverConfigTLSDirValidateResetDefault after all the values are read in order to validate the values and adjust the default if necessary. Tested by 1. Having everything commented out, w/ no /etc/pki/qemu: Works as expected 2. Uncomment the default_tls_x509_cert_dir, w/ no /etc/pki/qemu: Fails as expected 3. Uncomment each of the other *_tls_x509_cert_dir's when directory not exist: Fails as expected 4. Use a directory that exists for other _*tls_x509_cert_dirs: Works as expected 5. Change the default_tls_x509_cert_dir to an existing directory: Works as expected, each of the other uncommented *_tls_x509_cert_dirs will get the new value (tested via debug code) while one that used an existing default didn't change from it's default /etc/pki/libvirt-* src/qemu/qemu.conf | 8 +++++++ src/qemu/qemu_conf.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_conf.h | 4 ++++ src/qemu/qemu_driver.c | 3 +++ 4 files changed, 79 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index e6c0832..9526aed 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -13,6 +13,14 @@ # # dh-params.pem - the DH params configuration file # +# If the directory does not exist or contain the necessary files, QEMU +# domains will fail to start if they are configured to use TLS. +# +# In order to overwrite the default path alter the following. This path +# definition will be used as the default path for other *_tls_x509_cert_dir +# configuration settings if their default path does not exist or is not +# specifically set. +# #default_tls_x509_cert_dir = "/etc/pki/qemu" diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 6f44cbf..87d2c2d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -451,8 +451,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (!(conf = virConfReadFile(filename, 0))) goto cleanup; - if (virConfGetValueString(conf, "default_tls_x509_cert_dir", &cfg->defaultTLSx509certdir) < 0) + if ((rv = virConfGetValueString(conf, "default_tls_x509_cert_dir", &cfg->defaultTLSx509certdir)) < 0) goto cleanup; + cfg->checkdefaultTLSx509certdir = (rv == 1); if (virConfGetValueBool(conf, "default_tls_x509_verify", &cfg->defaultTLSx509verify) < 0) goto cleanup; if (virConfGetValueString(conf, "default_tls_x509_secret_uuid", @@ -872,6 +873,68 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, return ret; } + +/** + * @cfg: Recently config values + * + * Validate the recently read *_tls_x509_cert_dir values and if necessary + * update the default value to match the default_tls_x509_cert_dir + * + * Returns 0 on success, -1 on failure + */ +int +virQEMUDriverConfigTLSDirValidateResetDefault(virQEMUDriverConfigPtr cfg) +{ + bool newDefault = false; + + /* If the default entry was uncommented, then validate existence */ + if (cfg->checkdefaultTLSx509certdir) { + if (!virFileExists(cfg->defaultTLSx509certdir)) { + virReportError(VIR_ERR_CONF_SYNTAX, + _("default_tls_x509_cert_dir directory '%s' " + "does not exist"), + cfg->defaultTLSx509certdir); + return -1; + } + if (STRNEQ(cfg->defaultTLSx509certdir, SYSCONFDIR "/pki/qemu")) + newDefault = true; + } + + /* We know virQEMUDriverConfigNew set the particular value to either + * it's default or default_tls_x509_cert_dir's default. So, if not the + * default default and the directory doesn't exist, then the entry was + * set in the config file to something that doesn't exist, so error. + * + * Also, if the defaultTLSx509certdir value was changed from the default, + * then we need to update the default for each setting as well to match + * the default_tls_x509_cert_dir. + */ +#define VALIDATE_TLS_X509_CERT_DIR(val) \ + do { \ + if (STRNEQ(cfg->val ## TLSx509certdir, SYSCONFDIR "/pki/qemu") && \ + !virFileExists(cfg->val ## TLSx509certdir)) { \ + virReportError(VIR_ERR_CONF_SYNTAX, \ + _(#val"_tls_x509_cert_dir directory '%s' " \ + "does not exist"), \ + cfg->val ## TLSx509certdir); \ + return -1; \ + } else if (newDefault) { \ + VIR_FREE(cfg->val ## TLSx509certdir); \ + if (VIR_STRDUP(cfg->val ## TLSx509certdir, \ + cfg->defaultTLSx509certdir) < 0) \ + return -1; \ + } \ + } while (0) + + VALIDATE_TLS_X509_CERT_DIR(vnc); + VALIDATE_TLS_X509_CERT_DIR(spice); + VALIDATE_TLS_X509_CERT_DIR(chardev); + VALIDATE_TLS_X509_CERT_DIR(migrate); + + return 0; +} + + virQEMUDriverConfigPtr virQEMUDriverGetConfig(virQEMUDriverPtr driver) { virQEMUDriverConfigPtr conf; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 1407eef..fffa871 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -112,6 +112,7 @@ struct _virQEMUDriverConfig { char *nvramDir; char *defaultTLSx509certdir; + bool checkdefaultTLSx509certdir; bool defaultTLSx509verify; char *defaultTLSx509secretUUID; @@ -301,6 +302,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, const char *filename, bool privileged); +int +virQEMUDriverConfigTLSDirValidateResetDefault(virQEMUDriverConfigPtr cfg); + virQEMUDriverConfigPtr virQEMUDriverGetConfig(virQEMUDriverPtr driver); bool virQEMUDriverIsPrivileged(virQEMUDriverPtr driver); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6568def..2731f8e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -667,6 +667,9 @@ qemuStateInitialize(bool privileged, goto error; VIR_FREE(driverConf); + if (virQEMUDriverConfigTLSDirValidateResetDefault(cfg) < 0) + goto error; + if (virFileMakePath(cfg->stateDir) < 0) { virReportSystemError(errno, _("Failed to create state dir %s"), cfg->stateDir); -- 2.9.4

2 1

[libvirt] [PATCH v2 0/7] introduce virFileCache and use it for qemu capabilities
by Pavel Hrdina 26 Jul '17

26 Jul '17

Pavel Hrdina (7): util: introduce virFileCache tests: add virfilecachetest qemu: introduce struct _virQEMUCapsCachePriv tests: rewrite host CPU mocking qemu: pass only host arch instead of the whole virCaps qemu: switch QEMU capabilities to use virFileCache qemu: privatize _virQEMUCapsCachePriv struct po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libvirt_private.syms | 9 + src/qemu/qemu_capabilities.c | 372 ++++++----------- src/qemu/qemu_capabilities.h | 20 +- src/qemu/qemu_capspriv.h | 17 +- src/qemu/qemu_conf.h | 3 +- src/qemu/qemu_domain.c | 17 +- src/qemu/qemu_driver.c | 10 +- src/qemu/qemu_process.c | 9 +- src/util/virfilecache.c | 439 +++++++++++++++++++++ src/util/virfilecache.h | 137 +++++++ tests/Makefile.am | 12 + tests/domaincapstest.c | 55 +-- tests/qemucapsprobe.c | 3 +- tests/qemucpumock.c | 14 +- tests/qemuxml2argvtest.c | 9 +- tests/testutilshostcpus.h | 148 +++++++ tests/testutilsqemu.c | 107 +---- tests/testutilsqemu.h | 3 +- tests/testutilsxen.c | 29 +- ...a15b1658aa16923e46497dd8deeb6be287ddb0ca0.cache | 1 + ...ae4bc3a28e75bc3e262757001e8b953580f5e75ef.cache | 1 + tests/virfilecachemock.c | 31 ++ tests/virfilecachetest.c | 238 +++++++++++ 25 files changed, 1200 insertions(+), 486 deletions(-) create mode 100644 src/util/virfilecache.c create mode 100644 src/util/virfilecache.h create mode 100644 tests/testutilshostcpus.h create mode 100644 tests/virfilecachedata/5f3154560c130108b282a2aa15b1658aa16923e46497dd8deeb6be287ddb0ca0.cache create mode 120000 tests/virfilecachedata/9ca150bf3119b75dcac8e8bae4bc3a28e75bc3e262757001e8b953580f5e75ef.cache create mode 100644 tests/virfilecachemock.c create mode 100644 tests/virfilecachetest.c -- 2.13.3

2 14

[libvirt] [PATCH glib] Don't set LC_ALL=C during build as that breaks python apps
by Daniel P. Berrange 26 Jul '17

26 Jul '17

Setting LC_ALL=C breaks python apps doing I/O on UTF-8 source files. In particular this broke glib-mkenums GEN libvirt-gconfig-enum-types.h Traceback (most recent call last): File "/usr/bin/glib-mkenums", line 669, in <module> process_file(fname) File "/usr/bin/glib-mkenums", line 406, in process_file line = curfile.readline() File "/usr/lib64/python3.6/encodings/ascii.py", line 26, in decode return codecs.ascii_decode(input, self.errors)[0] UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 849: ordinal not in range(128) Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed to fix rawhide build maint.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maint.mk b/maint.mk index 405c6d0..ef72b4f 100644 --- a/maint.mk +++ b/maint.mk @@ -117,8 +117,8 @@ news-check-lines-spec ?= 1,10 news-check-regexp ?= '^\*.* $(VERSION_REGEXP) $$(today)$' # Prevent programs like 'sort' from considering distinct strings to be equal. -# Doing it here saves us from having to set LC_ALL elsewhere in this file. -export LC_ALL = C +# Doing it here saves us from having to set LC_COLLATE elsewhere in this file. +export LC_COLLATE = C ## --------------- ## ## Sanity checks. ## -- 2.13.3

2 2

[libvirt] [PATCH 0/3] Introduce RW locks to virDomainObjList
by Michal Privoznik 26 Jul '17

26 Jul '17

While this is not that critical (hash tables have O(1) time complexity for lookups), it lays down path towards making virDomainObj using RW locks instead of mutexes. Still, in my limited testing this showed slight improvement. Michal Privoznik (3): virthread: Introduce virRWLockInitPreferWriter virobject: Introduce virObjectRWLockable virdomainobjlist: Use virObjectRWLockable src/conf/virdomainobjlist.c | 24 ++++---- src/libvirt_private.syms | 4 ++ src/util/virobject.c | 144 ++++++++++++++++++++++++++++++++++---------- src/util/virobject.h | 16 +++++ src/util/virthread.c | 35 +++++++++++ src/util/virthread.h | 1 + 6 files changed, 180 insertions(+), 44 deletions(-) -- 2.13.0

4 28

[libvirt] [PATCH] qemu: we prefer C89 comment styles over C99
by Pavel Hrdina 26 Jul '17

26 Jul '17

Introduced by commit 'a7bc2c8cfd6f'. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. src/qemu/qemu_domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index dcdbfc9701..5c073027db 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7264,7 +7264,8 @@ qemuDomainPrepareChannel(virDomainChrDefPtr channel, "%s/%s", domainChannelTargetDir, channel->target.name) < 0) return -1; - } else { // Generate a unique name + } else { + /* Generate a unique name */ if (virAsprintf(&channel->source->data.nix.path, "%s/vioser-%02d-%02d-%02d.sock", domainChannelTargetDir, -- 2.13.3

2 1

[libvirt] [PATCH v2] Generate unique socket file
by Scott Garfinkle 25 Jul '17

25 Jul '17

It's possible to have more than one unnamed virtio-serial unix channel. We need to generate a unique name for each channel. Currently, we use ".../unknown.sock" for all of them. Better practice would be to specify an explicit target path name; however, in the absence of that, we need uniqueness in the names we generate internally. Before the changes we'd get /var/lib/libvirt/qemu/channel/target/unknown.sock for each instance of <channel type='unix'> <source mode='bind'/> <target type='virtio'/> </channel> Now, we get vioser-00-00-01.sock, vioser-00-00-02.sock, etc. Changes from v1: new socket name Signed-off-by: Scott Garfinkle <seg(a)us.ibm.com> --- src/qemu/qemu_domain.c | 24 +++++++++++++++------- .../qemuxml2argv-channel-virtio-unix.args | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 78e75f1..7a9958d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7178,18 +7178,28 @@ int qemuDomainPrepareChannel(virDomainChrDefPtr channel, const char *domainChannelTargetDir) { - if (channel->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && - channel->source->type == VIR_DOMAIN_CHR_TYPE_UNIX && - !channel->source->data.nix.path) { + if (channel->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO || + channel->source->type != VIR_DOMAIN_CHR_TYPE_UNIX || + channel->source->data.nix.path) + return 0; + + if (channel->target.name) { if (virAsprintf(&channel->source->data.nix.path, "%s/%s", domainChannelTargetDir, - channel->target.name ? channel->target.name - : "unknown.sock") < 0) + channel->target.name) < 0) + return -1; + } else { // Generate a unique name + if (virAsprintf(&channel->source->data.nix.path, + "%s/vioser-%02d-%02d-%02d.sock", + domainChannelTargetDir, + channel->info.addr.vioserial.controller, + channel->info.addr.vioserial.bus, + channel->info.addr.vioserial.port) < 0) return -1; - - channel->source->data.nix.listen = true; } + channel->source->data.nix.listen = true; + return 0; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args index 2b72965..8e0452a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args @@ -29,7 +29,7 @@ path=/tmp/channel/domain--1-QEMUGuest1/org.qemu.guest_agent.0,server,nowait \ -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ id=channel0,name=org.qemu.guest_agent.0 \ -chardev socket,id=charchannel1,\ -path=/tmp/channel/domain--1-QEMUGuest1/unknown.sock,server,nowait \ +path=/tmp/channel/domain--1-QEMUGuest1/vioser-00-00-02.sock,server,nowait \ -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,\ id=channel1 \ -chardev socket,id=charchannel2,path=/tmp/channel/domain--1-QEMUGuest1/ble,\ -- 1.8.3.1

3 2

[libvirt] [PATCH v3] storage: Disallow usage of the HBA for a fc_host backing
by John Ferlan 25 Jul '17

25 Jul '17

Disallow providing the wwnn/wwpn of the HBA in the adapter XML: <adapter type='fc_host' [parent='scsi_hostN'] wwnn='HBA_wwnn' wwpn='HBA_wwpn'/> This should be considered a configuration error since a vHBA would not be created. In order to use the HBA as the backing the following XML should be used: <adapter type='scsi_host' name='scsi_hostN'/> So add a check prior to the checkParent call to validate that the provided wwnn/wwpn resolves to a vHBA and not an HBA. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v2: https://www.redhat.com/archives/libvir-list/2017-July/msg01019.html Changes since v2, from review, simplify logic even more. docs/formatstorage.html.in | 27 +++++++++++++++------------ src/storage/storage_backend_scsi.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index 4946ddf..27578e8 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -207,18 +207,21 @@ </dl> <dl> <dt><code>wwnn</code> and <code>wwpn</code></dt> - <dd>The "World Wide Node Name" (<code>wwnn</code>) and "World Wide - Port Name" (<code>wwpn</code>) are used by the "fc_host" adapter - to uniquely identify the device in the Fibre Channel storage fabric - (the device can be either a HBA or vHBA). Both wwnn and wwpn should - be specified. Use the command 'virsh nodedev-dumpxml' to determine - how to set the values for the wwnn/wwpn of a (v)HBA. The wwnn and - wwpn have very specific numerical format requirements based on the - hypervisor being used, thus care should be taken if you decide to - generate your own to follow the standards; otherwise, the pool - will fail to start with an opaque error message indicating failure - to write to the vport_create file during vport create/delete due - to "No such file or directory". + <dd>The required "World Wide Node Name" (<code>wwnn</code>) and + "World Wide Port Name" (<code>wwpn</code>) are used by the + "fc_host" adapter to uniquely identify the vHBA device in the + Fibre Channel storage fabric. If the vHBA device already exists + as a Node Device, then libvirt will use it; otherwise, the vHBA + will be created using the provided values. It is considered a + configuration error use the values from the HBA as those would + be for a "scsi_host" <code>type</code> pool instead. The + <code>wwnn</code> and <code>wwpn</code> have very specific + format requirements based on the hypervisor being used, thus + care should be taken if you decide to generate your own to + follow the standards; otherwise, the pool will fail to start + with an opaque error message indicating failure to write to + the vport_create file during vport create/delete due to + "No such file or directory". <span class="since">Since 1.0.4</span> </dd> </dl> diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index af12889..575e6a6 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -211,6 +211,33 @@ getAdapterName(virStorageAdapterPtr adapter) } +/** + * @name: Name from a wwnn/wwpn lookup + * + * Validate that the @name fetched from the wwnn/wwpn is a vHBA + * and not an HBA as that should be a configuration error. It's only + * possible to use an existing wwnn/wwpn of a vHBA because that's + * what someone would have created using the node device create via XML + * functionality. Using the HBA "just because" it has a wwnn/wwpn and + * the characteristics of a vHBA is just not valid + * + * Returns true if the @name is OK, false on error + */ +static bool +checkName(const char *name) +{ + unsigned int host_num; + + if (virSCSIHostGetNumber(name, &host_num) && + virVHBAIsVportCapable(NULL, host_num)) + return true; + + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("the wwnn/wwpn for '%s' are assigned to an HBA"), name); + return false; +} + + /* * Using the host# name found via wwnn/wwpn lookup in the fc_host * sysfs tree to get the parent 'scsi_host#' to ensure it matches. @@ -288,6 +315,9 @@ createVport(virConnectPtr conn, * this pool and we don't have to create the vHBA */ if ((name = virVHBAGetHostByWWN(NULL, fchost->wwnn, fchost->wwpn))) { + if (!(checkName(name))) + goto cleanup; + /* If a parent was provided, let's make sure the 'name' we've * retrieved has the same parent. If not this will cause failure. */ if (!fchost->parent || checkParent(conn, name, fchost->parent)) -- 2.9.4

2 1

[libvirt] [PATCH v2] storage: Disallow usage of the HBA for a fc_host backing
by John Ferlan 25 Jul '17

25 Jul '17

Disallow providing the wwnn/wwpn of the HBA in the adapter XML: <adapter type='fc_host' [parent='scsi_hostN'] wwnn='HBA_wwnn' wwpn='HBA_wwpn'/> This should be considered a configuration error since a vHBA would not be created. In order to use the HBA as the backing the following XML should be used: <adapter type='scsi_host' name='scsi_hostN'/> So add a check prior to the checkParent call to validate that the provided wwnn/wwpn resolves to a vHBA and not an HBA. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- This used to be patch 4 of the series: https://www.redhat.com/archives/libvir-list/2017-July/msg00837.html which while the series was in it's 3rd review cycle, this particular patch was new to the series and thus becomes a v2 since the three other patches from the series were pushed. docs/formatstorage.html.in | 27 +++++++++-------- src/storage/storage_backend_scsi.c | 62 +++++++++++++++++++++++++++++++++----- 2 files changed, 69 insertions(+), 20 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index 4946ddf..27578e8 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -207,18 +207,21 @@ </dl> <dl> <dt><code>wwnn</code> and <code>wwpn</code></dt> - <dd>The "World Wide Node Name" (<code>wwnn</code>) and "World Wide - Port Name" (<code>wwpn</code>) are used by the "fc_host" adapter - to uniquely identify the device in the Fibre Channel storage fabric - (the device can be either a HBA or vHBA). Both wwnn and wwpn should - be specified. Use the command 'virsh nodedev-dumpxml' to determine - how to set the values for the wwnn/wwpn of a (v)HBA. The wwnn and - wwpn have very specific numerical format requirements based on the - hypervisor being used, thus care should be taken if you decide to - generate your own to follow the standards; otherwise, the pool - will fail to start with an opaque error message indicating failure - to write to the vport_create file during vport create/delete due - to "No such file or directory". + <dd>The required "World Wide Node Name" (<code>wwnn</code>) and + "World Wide Port Name" (<code>wwpn</code>) are used by the + "fc_host" adapter to uniquely identify the vHBA device in the + Fibre Channel storage fabric. If the vHBA device already exists + as a Node Device, then libvirt will use it; otherwise, the vHBA + will be created using the provided values. It is considered a + configuration error use the values from the HBA as those would + be for a "scsi_host" <code>type</code> pool instead. The + <code>wwnn</code> and <code>wwpn</code> have very specific + format requirements based on the hypervisor being used, thus + care should be taken if you decide to generate your own to + follow the standards; otherwise, the pool will fail to start + with an opaque error message indicating failure to write to + the vport_create file during vport create/delete due to + "No such file or directory". <span class="since">Since 1.0.4</span> </dd> </dl> diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index af12889..8892822 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -211,21 +211,66 @@ getAdapterName(virStorageAdapterPtr adapter) } +/** + * @name: Name from a wwnn/wwpn lookup + * + * Validate that the @name fetched from the wwnn/wwpn is a vHBA and not + * an HBA as that should be a configuration error. It's only possible to + * use an existing wwnn/wwpn of a vHBA because that's what someone would + * have created using the node device create functionality. Using the + * HBA "just because" it has a wwnn/wwpn and the characteristics of a + * vHBA is just not valid + * + * Returns the @scsi_host_name to be used or NULL on errror + */ +static char * +checkName(const char *name) +{ + char *scsi_host_name = NULL; + unsigned int host_num; + + if (virAsprintf(&scsi_host_name, "scsi_%s", name) < 0) + return NULL; + + if (virSCSIHostGetNumber(scsi_host_name, &host_num) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("host name '%s' is not properly formatted"), + name); + goto error; + } + + /* If scsi_host_name is vport capable, then it's an HBA. This is + * a configuration error as the wwnn/wwpn should only be for a vHBA */ + if (virVHBAIsVportCapable(NULL, host_num)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("the wwnn/wwpn for '%s' are assigned to an HBA"), + scsi_host_name); + goto error; + } + + return scsi_host_name; + + error: + VIR_FREE(scsi_host_name); + return NULL; +} + + /* * Using the host# name found via wwnn/wwpn lookup in the fc_host * sysfs tree to get the parent 'scsi_host#' to ensure it matches. */ static bool checkParent(virConnectPtr conn, - const char *name, + const char *scsi_host_name, const char *parent_name) { unsigned int host_num; - char *scsi_host_name = NULL; char *vhba_parent = NULL; bool retval = false; - VIR_DEBUG("conn=%p, name=%s, parent_name=%s", conn, name, parent_name); + VIR_DEBUG("conn=%p, scsi_host_name=%s, parent_name=%s", + conn, scsi_host_name, parent_name); /* autostarted pool - assume we're OK */ if (!conn) @@ -245,9 +290,6 @@ checkParent(virConnectPtr conn, goto cleanup; } - if (virAsprintf(&scsi_host_name, "scsi_%s", name) < 0) - goto cleanup; - if (!(vhba_parent = virNodeDeviceGetParentName(conn, scsi_host_name))) goto cleanup; @@ -255,7 +297,7 @@ checkParent(virConnectPtr conn, virReportError(VIR_ERR_XML_ERROR, _("Parent attribute '%s' does not match parent '%s' " "determined for the '%s' wwnn/wwpn lookup."), - parent_name, vhba_parent, name); + parent_name, vhba_parent, scsi_host_name); goto cleanup; } @@ -263,7 +305,6 @@ checkParent(virConnectPtr conn, cleanup: VIR_FREE(vhba_parent); - VIR_FREE(scsi_host_name); return retval; } @@ -275,6 +316,7 @@ createVport(virConnectPtr conn, virStorageAdapterFCHostPtr fchost) { char *name = NULL; + char *scsi_host_name = NULL; virStoragePoolFCRefreshInfoPtr cbdata = NULL; virThread thread; int ret = -1; @@ -288,6 +330,9 @@ createVport(virConnectPtr conn, * this pool and we don't have to create the vHBA */ if ((name = virVHBAGetHostByWWN(NULL, fchost->wwnn, fchost->wwpn))) { + if (!(scsi_host_name = checkName(name))) + goto cleanup; + /* If a parent was provided, let's make sure the 'name' we've * retrieved has the same parent. If not this will cause failure. */ if (!fchost->parent || checkParent(conn, name, fchost->parent)) @@ -333,6 +378,7 @@ createVport(virConnectPtr conn, cleanup: VIR_FREE(name); + VIR_FREE(scsi_host_name); return ret; } -- 2.9.4

2 5

[libvirt] [PATCH 0/4] Clean up machineName-related code
by Martin Kletzander 25 Jul '17

25 Jul '17

Just in case we'll want to use the "cleaned-up" machineName for anything else in the future, I decided to modify the code so that it is always generated, saved and cleaned-up. While doing that I identified some code duplication, leak and a TODO/XXX comment that are all fixed with this series. And it only adds four lines overall! Martin Kletzander (4): conf: Pass config.priv to xmlopt->privateData.alloc qemu: Save qemu driver in qemuDomainObjPrivateData lxc: Make lxcProcessStop callable even without PID being available Move machineName generation from virsystemd into domain_conf src/bhyve/bhyve_domain.c | 2 +- src/conf/domain_conf.c | 65 +++++++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 7 ++++- src/libvirt_private.syms | 2 +- src/libxl/libxl_domain.c | 2 +- src/lxc/lxc_cgroup.c | 5 +--- src/lxc/lxc_domain.c | 21 ++++++++++++++- src/lxc/lxc_domain.h | 3 +++ src/lxc/lxc_process.c | 57 +++++++++++----------------------------- src/qemu/qemu_cgroup.c | 24 ++++------------- src/qemu/qemu_domain.c | 24 ++++++++++++++++- src/qemu/qemu_domain.h | 5 ++++ src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 11 +++++--- src/uml/uml_driver.c | 2 +- src/util/vircgroup.c | 15 ++++------- src/util/vircgroup.h | 14 +++++----- src/util/virsystemd.c | 62 ------------------------------------------- src/util/virsystemd.h | 5 ---- src/vmware/vmware_driver.c | 2 +- src/vz/vz_utils.c | 2 +- tests/virsystemdtest.c | 4 +-- 22 files changed, 170 insertions(+), 166 deletions(-) -- 2.13.3

2 9

[libvirt] [PATCH v3 0/3] More virsecretobj changes to prepare for common object
by John Ferlan 25 Jul '17

25 Jul '17

v2: https://www.redhat.com/archives/libvir-list/2017-July/msg00520.html Changes in v3: Former patch 1, dropped Former patch 2, pushed Former patch 3, adjusted: -> Use @objDef instead of @objdef -> Handle the if (backup) leak shown during review Former patch 4, split -> Patch 3 handles the virsecretobj call to virSecretObjListRemove -> Patch 4 handles the secret_driver calls to virSecretObjListRemove John Ferlan (3): secret: Properly handle @def after virSecretObjAdd in driver secret: Fix memory leak in virSecretLoad secret: Handle object list removal and deletion properly src/conf/virsecretobj.c | 14 ++++++-------- src/secret/secret_driver.c | 31 ++++++++++++++++++------------- 2 files changed, 24 insertions(+), 21 deletions(-) -- 2.9.4

2 4

[libvirt] [PATCH v2 0/4] More virsecretobj changes to prepare for common object
by John Ferlan 25 Jul '17

25 Jul '17

v1: https://www.redhat.com/archives/libvir-list/2017-June/msg00168.html but review was done more recently in 2017-July... Changes since v1... ... Pushed v1 patches 1-3 since they were ACK'd ... Altered old patch 4, new patch 1 to use if/else processing ... Altered old patch 5, new patch 2 to account for merge conflict (old patch 5 was ACK'd) ... Dropped old patch 6 ... Altered old patch 7, new patch 3 to use VIR_STEAL_PTR and updated the commit message to also describe the @def usage problem ... Altered old patch 8, new patch 4 to change the commit message to have more details John Ferlan (4): secret: Clean up virSecretObjListAdd processing secret: Remove need for local configFile and base64File in ObjectAdd secret: Properly handle @def after virSecretObjAdd in driver secret: Handle object list removal and deletion properly src/conf/virsecretobj.c | 53 ++++++++++++++++++++-------------------------- src/secret/secret_driver.c | 28 ++++++++++++++---------- 2 files changed, 40 insertions(+), 41 deletions(-) -- 2.9.4

2 15

[libvirt] [PATCH] Revert "virthread: Introduce virRWLockInitPreferWriter"
by Michal Privoznik 25 Jul '17

25 Jul '17

This reverts commit 328bd24443d2a345a5832ee48ebba0208f8036ea. As it turns out, this is not portable and very Linux & glibc specific. Worse, this may lead to not starving writers on Linux but everywhere else. Revert this and if the starvation occurs resolve it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt_private.syms | 1 - src/util/virobject.c | 2 +- src/util/virthread.c | 35 ----------------------------------- src/util/virthread.h | 1 - 4 files changed, 1 insertion(+), 38 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3cc6f4c6e..d98417678 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2733,7 +2733,6 @@ virMutexUnlock; virOnce; virRWLockDestroy; virRWLockInit; -virRWLockInitPreferWriter; virRWLockRead; virRWLockUnlock; virRWLockWrite; diff --git a/src/util/virobject.c b/src/util/virobject.c index 4236abfef..b1bb378b4 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -275,7 +275,7 @@ virObjectRWLockableNew(virClassPtr klass) if (!(obj = virObjectNew(klass))) return NULL; - if (virRWLockInitPreferWriter(&obj->lock) < 0) { + if (virRWLockInit(&obj->lock) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to initialize RW lock")); virObjectUnref(obj); diff --git a/src/util/virthread.c b/src/util/virthread.c index a8dd72f8b..6c495158f 100644 --- a/src/util/virthread.c +++ b/src/util/virthread.c @@ -95,15 +95,6 @@ void virMutexUnlock(virMutexPtr m) } -/** - * virRWLockInit: - * @m: rwlock to init - * - * Initializes RW lock using pthread default attributes (which - * is PTHREAD_RWLOCK_PREFER_READER_NP). - * - * Returns 0 on success, -1 otherwise. - */ int virRWLockInit(virRWLockPtr m) { int ret; @@ -115,32 +106,6 @@ int virRWLockInit(virRWLockPtr m) return 0; } - -/** - * virRWLockInitPreferWriter: - * @m: rwlock to init - * - * Initializes RW lock which prefers writers over readers. - * - * Returns 0 on success, -1 otherwise. - */ -int virRWLockInitPreferWriter(virRWLockPtr m) -{ - int ret; - pthread_rwlockattr_t attr; - - pthread_rwlockattr_init(&attr); - pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP); - ret = pthread_rwlock_init(&m->lock, &attr); - pthread_rwlockattr_destroy(&attr); - if (ret != 0) { - errno = ret; - return -1; - } - return 0; -} - - void virRWLockDestroy(virRWLockPtr m) { pthread_rwlock_destroy(&m->lock); diff --git a/src/util/virthread.h b/src/util/virthread.h index 18b785af2..e466d9bf0 100644 --- a/src/util/virthread.h +++ b/src/util/virthread.h @@ -136,7 +136,6 @@ void virMutexUnlock(virMutexPtr m); int virRWLockInit(virRWLockPtr m) ATTRIBUTE_RETURN_CHECK; -int virRWLockInitPreferWriter(virRWLockPtr m) ATTRIBUTE_RETURN_CHECK; void virRWLockDestroy(virRWLockPtr m); void virRWLockRead(virRWLockPtr m); -- 2.13.0

2 1

[libvirt] [PATCH] Generate unique virtio-serial socket file names
by seg＠us.ibm.com 25 Jul '17

25 Jul '17

It's possible to have more than one unix channel with type=virtio-serial. We need to generate a unique name for each channel. Currently, we use "unknown.sock" for all of them. Signed-off-by: Scott Garfinkle <seg(a)us.ibm.com>

2 2

[libvirt] [PATCH] qemu: fix migration fail of an auto-placement vm after attached memory to it
by Yi Wang 24 Jul '17

24 Jul '17

This patch fix this condition: -vm has the "auto" placement in vcpu -hot-plug memory with source node "1-3" through attach-device command -migrate the vm to a host with only 2 numa node And the migration will fail with error: "error: unsupported configuration: NUMA node 2 is unavailable" Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Signed-off-by: Xi Xu <xu.xi8(a)zte.com.cn> --- src/qemu/qemu_process.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7b708be..dcc564c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5259,6 +5259,16 @@ qemuProcessPrepareDomain(virConnectPtr conn, goto cleanup; } + VIR_DEBUG("Updating memory source nodes"); + for (i = 0; i < vm->def->nmems; i++) { + virDomainMemoryDefPtr mem = vm->def->mems[i]; + if (priv->autoNodeset && mem && mem->sourceNodes) { + virBitmapFree(mem->sourceNodes); + if (!(mem->sourceNodes = virBitmapNewCopy(priv->autoNodeset))) + goto cleanup; + } + } + /* Whether we should use virtlogd as stdio handler for character * devices source backend. */ if (cfg->stdioLogD && -- 1.8.3.1

4 4

[libvirt] [PATCH v3 0/4] Fix a couple issues found w/ vHBA logic
by John Ferlan 24 Jul '17

24 Jul '17

v2: https://www.redhat.com/archives/libvir-list/2017-July/msg00661.html Changes since v2: * Patch 1 - make the requested logic adjustment * Patch 2 - no change * Patch 3 - make this *just* the check that the provided @parent_name is a valid fc_host (whether it's vHBA or HBA). * Patch 4 - Alter the checkParent logic to cause a failure if the passed @name (from the wwnn/wwpn's provided) are for an HBA instead of a vHBA. Make this an invalid configuration. Modify the docs to describe that the provided wwnn/wwpn must be for an existing vHBA, are to be used to create a vHBA, but cannot be from an existing HBA. NB: No change to the Destroy code since it's possible one of these exists and there needs to be a way to shut it down. The failure could turn into a "conversion" of sorts as well by changing the type to 'scsi_host', saving the generated scsi_host name, removing the parent and wwnn & wwpn fields. Tested using my vHBA system with various valid and invalid configurations. John Ferlan (4): storage: Fix existing parent check for vHBA creation storage: Remove @conn from virNodeDeviceCreateVport storage: Check if provided parent is vHBA capable storage: Disallow usage of the HBA for a fc_host backing docs/formatstorage.html.in | 27 ++++++----- src/conf/node_device_conf.c | 63 ++----------------------- src/conf/node_device_conf.h | 3 +- src/storage/storage_backend_scsi.c | 94 +++++++++++++++++++++++++++++++++++++- 4 files changed, 112 insertions(+), 75 deletions(-) -- 2.9.4

2 7

[libvirt] [PATCH v2 0/2] Fix backwards migration of pSeries guests
by Andrea Bolognani 24 Jul '17

24 Jul '17

Changes from [v1]: * don't hide the controller model check inside a function and propely explain the reason not to format it; * rename a confusingly named function. [v1] https://www.redhat.com/archives/libvir-list/2017-July/msg00705.html Andrea Bolognani (2): conf: Fix backwards migration of pSeries guests conf: Rename virDomainControllerIsPCIHostBridge() to IsPSeriesPHB() src/conf/domain_conf.c | 29 ++++++++++++++++++++++++++--- src/conf/domain_conf.h | 2 +- src/libvirt_private.syms | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain_address.c | 2 +- 6 files changed, 31 insertions(+), 8 deletions(-) -- 2.7.5

2 4

[libvirt] [PATCH v2 0/3] implement migrate-getmaxdowntime command
by seg＠us.ibm.com 24 Jul '17

24 Jul '17

Currently, the maximum tolerable downtime for a domain being migrated is write-only. This patch implements a way to query that value nondestructively. Changes from [v1]: * Fixed formatting and style problems * Add additional JSON error check * Better patch submission mail, I hope [v1} https://www.redhat.com/archives/libvir-list/2017-July/msg00908.html Scott Garfinkle (3): migrate-getmaxdowntime command qemu side migrate-getmaxdowntime public symbols and table indices migrate-getmaxdowntime local/libvirt enablement src/qemu/qemu_driver.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 3 +++ src/qemu/qemu_monitor_json.c | 40 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 3 +++ src/libvirt_public.syms | 4 ++++ src/remote/remote_protocol.x | 16 +++++++++++++++- src/remote_protocol-structs | 8 ++++++++ include/libvirt/libvirt-domain.h | 4 ++++ src/driver-hypervisor.h | 6 ++++++ src/libvirt-domain.c | 45 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 12 +++++++++++ src/remote/remote_driver.c | 1 + tools/virsh-domain.c | 46 ++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 18 ++++++++++++++++ 14 files changed, 240 insertions(+), 1 deletion(-)

2 4

[libvirt] [PATCH v6 0/4] Make virNodeDeviceObj and virNodeDeviceObjList private
by John Ferlan 24 Jul '17

24 Jul '17

NB: Like v5, keeping same title for consistency v5: https://www.redhat.com/archives/libvir-list/2017-July/msg00610.html Changes since v5: * Replace patch 1 w/ the aha moment from review. The deletion API's don't need to use virNodeDeviceObjListGetParentHost. Instead they can just use virNodeDeviceObjListFindByName as the parent_wwnn/wwpn and parent_fabric_wwn are not stored in the vHBA. They're merely for the purpose of creation. The vHBA *does* store the def->parent by name and we can use that instead * Add patch 2 in order to remove the CREATE_DEVICE boolean from virNodeDeviceObjListGetParentHost as it won't be necessary since the only consumers are now CreateXML callers * Modify patch 3 calls to virHashSearch to add a NULL parameter since commit '38e516a52' added this (a real buzzkill for other changes too) * Modify patch 4 to include removing the locks in Nodedev calls for test_driver as well. John Ferlan (4): nodedev: Alter node device deletion logic nodedev: Remove @create from virNodeDeviceObjListGetParentHost nodedev: Convert virNodeDeviceObjListPtr to use hash tables nodedev: Remove driver locks around object list mgmt code src/conf/virnodedeviceobj.c | 580 ++++++++++++++++++++++++----------- src/conf/virnodedeviceobj.h | 3 +- src/node_device/node_device_driver.c | 90 ++---- src/node_device/node_device_hal.c | 16 +- src/node_device/node_device_udev.c | 13 +- src/test/test_driver.c | 53 ++-- 6 files changed, 459 insertions(+), 296 deletions(-) -- 2.9.4

2 10

[libvirt] [PATCH RESEND] qemu: Remove inactive vm when failed to start it
by Yi Wang 24 Jul '17

24 Jul '17

Libvirt forgets to remove inactive vm when failed to start a defined vm. That may result in residual domain in driver->domains on such condition: during the process of starting a vm, undefine it, and qemu exit because of some exception. As we undefined the vm successfully, the vm->persistent was set to 0, we will always fail to undefine it until restart libvirtd. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/qemu/qemu_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cdb727b..af8afab 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7185,6 +7185,8 @@ qemuDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) endjob: qemuProcessEndJob(driver, vm); + if (ret < 0) + qemuDomainRemoveInactive(driver, vm); cleanup: virDomainObjEndAPI(&vm); -- 1.8.3.1

3 6

[libvirt] [PATCH] testutils: Remove unneeded variable
by Martin Kletzander 24 Jul '17

24 Jul '17

virDomainXMLOptionNew() gladly accepts NULL and it is used in some drivers. There is no need for additional variable with no members set Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial. tests/testutils.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index f45596997d6d..ed01136a07c1 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -1130,13 +1130,11 @@ virCapsPtr virTestGenericCapsInit(void) static virDomainDefParserConfig virTestGenericDomainDefParserConfig = { .features = VIR_DOMAIN_DEF_FEATURE_INDIVIDUAL_VCPUS, }; -static virDomainXMLPrivateDataCallbacks virTestGenericPrivateDataCallbacks; virDomainXMLOptionPtr virTestGenericDomainXMLConfInit(void) { return virDomainXMLOptionNew(&virTestGenericDomainDefParserConfig, - &virTestGenericPrivateDataCallbacks, - NULL, NULL, NULL); + NULL, NULL, NULL, NULL); } -- 2.13.3

1 0

[libvirt] [PATCH] qemu_capabilities: Fix the formatting with a space
by Shivaprasad G Bhat 24 Jul '17

24 Jul '17

It was observed while adding new property that there should be a space before closing a curly brace in intel-iommu object property definition. Fixing it as a separate patch. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5fb6fd4..3f2c089 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1908,7 +1908,7 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { -1 }, { "intel-iommu", virQEMUCapsObjectPropsIntelIOMMU, ARRAY_CARDINALITY(virQEMUCapsObjectPropsIntelIOMMU), - QEMU_CAPS_DEVICE_INTEL_IOMMU}, + QEMU_CAPS_DEVICE_INTEL_IOMMU }, { "spapr-pci-host-bridge", virQEMUCapsObjectPropsSpaprPCIHostBridge, ARRAY_CARDINALITY(virQEMUCapsObjectPropsSpaprPCIHostBridge), QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE },

2 1

[libvirt] [PATCH] storage: Fix editing mistake in storagePoolSetAutostart
by John Ferlan 24 Jul '17

24 Jul '17

Commit id '905f1024b' had a rogue editing mistake that inadvertently dropped a goto cleanup in storagePoolSetAutostart, but Coverity noted it. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- NB: Pushed as trivial the other day, but forgot to send the email to the list on it. src/storage/storage_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index df563f1..e616ae0 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1280,6 +1280,7 @@ storagePoolSetAutostart(virStoragePoolPtr pool, if (!obj->configFile) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("pool has no config file")); + goto cleanup; } autostart = (autostart != 0); -- 2.9.4

1 0

[libvirt] [PATCH] rpc : fix a access for null pointer
by Peng Hao 24 Jul '17

24 Jul '17

virNetSocketRemoveIOCallback get sock's ObjectLock and will call virNetSocketEventFree. virNetSocketEventFree may be free sock object and virNetSocketRemoveIOCallback will access a null pointer in release sock's ObjectLock. Signed-off-by: Liu Yun <liu.yunh(a)zte.com.cn> Signed-off-by: Peng Hao <peng.hao2(a)zte.com.cn> --- src/rpc/virnetsocket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index d228c8a..8b550e8 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -2140,14 +2140,12 @@ static void virNetSocketEventFree(void *opaque) virFreeCallback ff; void *eopaque; - virObjectLock(sock); ff = sock->ff; eopaque = sock->opaque; sock->func = NULL; sock->ff = NULL; sock->opaque = NULL; - virObjectUnlock(sock); - + if (ff) ff(eopaque); @@ -2207,6 +2205,7 @@ void virNetSocketUpdateIOCallback(virNetSocketPtr sock, void virNetSocketRemoveIOCallback(virNetSocketPtr sock) { + virObjectRef(sock); virObjectLock(sock); if (sock->watch < 0) { @@ -2220,6 +2219,7 @@ void virNetSocketRemoveIOCallback(virNetSocketPtr sock) sock->watch = -1; virObjectUnlock(sock); + virObjectRef(sock); } void virNetSocketClose(virNetSocketPtr sock) -- 1.8.3.1

3 5

[libvirt] [PATCH] conf: Fix backwards migration of pSeries guests
by Andrea Bolognani 24 Jul '17

24 Jul '17

Recent commits made it so that pci-root controllers for pSeries guests are automatically assigned the spapr-pci-host-bridge model name; however, that prevents guests to migrate to older versions of libvirt which don't know about that model name at all, which at the moment is all of them :) To avoid the issue, just strip the model name from PHBs when formatting the migratable XML; guests that use more than one PHB are not going to be migratable anyway. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/conf/domain_conf.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9320794..21bd7c7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21919,7 +21919,20 @@ virDomainControllerDefFormat(virBufferPtr buf, } if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) { - if (def->opts.pciopts.modelName != VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_NONE) { + bool formatModelName = true; + + if (def->opts.pciopts.modelName == VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_NONE) + formatModelName = false; + + /* Don't format the model name for PHBs when migrating so that + * guests that only use the default one can be migrated to older + * libvirt version which don't know about PHBs at all */ + if (virDomainControllerIsPCIHostBridge(def) && + flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE) { + formatModelName = false; + } + + if (formatModelName) { modelName = virDomainControllerPCIModelNameTypeToString(def->opts.pciopts.modelName); if (!modelName) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 2.7.5

2 7

[libvirt] [PATCH 0/2] docs: Fix enum documentation
by Michal Privoznik 24 Jul '17

24 Jul '17

So this patch sent to the list got me roll up my sleeves and get working: https://www.redhat.com/archives/libvir-list/2017-July/msg00835.html It wasn't that bad after all. Michal Privoznik (2): apibuild.py: Handle enum comments properly docs: Span cells if there's not doc text for enum val docs/apibuild.py | 8 +++++++- docs/newapi.xsl | 25 +++++++++++++++---------- 2 files changed, 22 insertions(+), 11 deletions(-) -- 2.13.0

3 6

[libvirt] An API to copy files.
by Julio Faracco 24 Jul '17

24 Jul '17

Hi guys, Unfortunately, my company does not allow access to IRC. I need to ask question by email. Why doesn't libvirt have any method to copy files? A kind of virFileCopy(src, dst) for example. Libvirt has a lots of helper functions but it does not have a specific method to copy a file. There is a similar method inside openvz_conf.c. But I don't see any method inside virfile.c -- Julio Cesar Faracco

3 2