- Devel - libvirt List Archives

[libvirt] [PATCH] tests: utils: Fix out-of-bounds access to memory in virTestCompareToFile
by Peter Krempa 04 Apr '18

04 Apr '18

Similarly to 3506f1ecfde, the contents of 'cmpcontent' may be an empty string so the following code would access memory out of the array. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/testutils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/testutils.c b/tests/testutils.c index 4bd1b63755..7c095caac9 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -797,10 +797,11 @@ virTestCompareToFile(const char *strcontent, if (filecontent) { size_t filecontentLen = strlen(filecontent); + size_t cmpcontentLen = strlen(cmpcontent); if (filecontentLen > 0 && filecontent[filecontentLen - 1] == '\n' && - cmpcontent[strlen(cmpcontent) - 1] != '\n') { + (cmpcontentLen == 0 || cmpcontent[cmpcontentLen - 1] != '\n')) { if (virAsprintf(&fixedcontent, "%s\n", cmpcontent) < 0) goto failure; cmpcontent = fixedcontent; -- 2.16.2

2 1

[libvirt] [libvirt PATCH] qemu: Add support for specifying SPICE TLS ciphers
by Ján Tomko 04 Apr '18

04 Apr '18

From: Christophe Fergeau <cfergeau(a)redhat.com> This commit adds a 'spice_tls_ciphers' parameter in qemu.conf which allows to configure which TLS ciphers SPICE will be using for its TLS connections. https://bugzilla.redhat.com/show_bug.cgi?id=1562032 Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com> Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- This is mostly useful as a workaround for missing crypto policies, so I'm not sure if it's upstream material. Changes from the patch attached to the BZ: ciphers(2) -> ciphers(1) Added augeas changes and tests escape the string before passing it to QEMU src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 5 ++++ src/qemu/qemu_command.c | 8 +++++- src/qemu/qemu_conf.c | 3 +++ src/qemu/qemu_conf.h | 1 + src/qemu/test_libvirtd_qemu.aug.in | 1 + .../graphics-spice-sasl-ciphers.args | 29 ++++++++++++++++++++++ .../graphics-spice-sasl-ciphers.xml | 1 + tests/qemuxml2argvtest.c | 5 ++++ 9 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.args create mode 120000 tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.xml diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index c19bf3a43..15222d7e3 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -44,6 +44,7 @@ module Libvirtd_qemu = let spice_entry = str_entry "spice_listen" | bool_entry "spice_tls" | str_entry "spice_tls_x509_cert_dir" + | str_entry "spice_tls_ciphers" | bool_entry "spice_auto_unix_socket" | str_entry "spice_password" | bool_entry "spice_sasl" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 07eab7eff..1d7b6c555 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -181,6 +181,11 @@ #spice_tls_x509_cert_dir = "/etc/pki/libvirt-spice" +# The ciphers used by spice can be overridden here. This is an OpenSSL cipher +# list as documented in ciphers(1) +#spice_tls_ciphers = "DEFAULT" + + # Enable this option to have SPICE served over an automatically created # unix socket. This prevents unprivileged access from users on the # host machine. diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 682d71441..adf0b2cb9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8028,8 +8028,14 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, !cfg->spicePassword) virBufferAddLit(&opt, "disable-ticketing,"); - if (hasSecure) + if (hasSecure) { virBufferAsprintf(&opt, "x509-dir=%s,", cfg->spiceTLSx509certdir); + if (cfg->spiceTLSCiphers) { + virBufferAddLit(&opt, "tls-ciphers="); + virQEMUBuildBufferEscapeComma(&opt, cfg->spiceTLSCiphers); + virBufferAddLit(&opt, ","); + } + } switch (graphics->data.spice.defaultMode) { case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 36cf3a281..92afd252d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -374,6 +374,7 @@ static void virQEMUDriverConfigDispose(void *obj) VIR_FREE(cfg->vncSASLdir); VIR_FREE(cfg->spiceTLSx509certdir); + VIR_FREE(cfg->spiceTLSCiphers); VIR_FREE(cfg->spiceListen); VIR_FREE(cfg->spicePassword); VIR_FREE(cfg->spiceSASLdir); @@ -550,6 +551,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, goto cleanup; if (virConfGetValueString(conf, "spice_tls_x509_cert_dir", &cfg->spiceTLSx509certdir) < 0) goto cleanup; + if (virConfGetValueString(conf, "spice_tls_ciphers", &cfg->spiceTLSCiphers) < 0) + goto cleanup; if (virConfGetValueBool(conf, "spice_sasl", &cfg->spiceSASL) < 0) goto cleanup; if (virConfGetValueString(conf, "spice_sasl_dir", &cfg->spiceSASLdir) < 0) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index e1ad5463f..9ab9f4e37 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -128,6 +128,7 @@ struct _virQEMUDriverConfig { bool spiceTLS; char *spiceTLSx509certdir; + char *spiceTLSCiphers; bool spiceSASL; char *spiceSASLdir; char *spiceListen; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 688e5b9fd..2f62b383e 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -17,6 +17,7 @@ module Test_libvirtd_qemu = { "spice_listen" = "0.0.0.0" } { "spice_tls" = "1" } { "spice_tls_x509_cert_dir" = "/etc/pki/libvirt-spice" } +{ "spice_tls_ciphers" = "DEFAULT" } { "spice_auto_unix_socket" = "1" } { "spice_password" = "XYZ12345" } { "spice_sasl" = "1" } diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.args b/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.args new file mode 100644 index 000000000..2f608ad7c --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.args @@ -0,0 +1,29 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +SASL_CONF_PATH=/root/.sasl2 \ +QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-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 \ +-spice port=5903,tls-port=5904,addr=127.0.0.1,sasl,\ +x509-dir=/etc/pki/libvirt-spice,tls-ciphers=DEFAULT,tls-channel=default \ +-vga qxl \ +-global qxl-vga.ram_size=67108864 \ +-global qxl-vga.vram_size=33554432 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.xml b/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.xml new file mode 120000 index 000000000..1bfac9efa --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.xml @@ -0,0 +1 @@ +graphics-spice-sasl.xml \ No newline at end of file diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 308d71f72..29f702c5c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1126,6 +1126,11 @@ mymain(void) DO_TEST("graphics-spice-sasl", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_QXL); + ignore_value(VIR_STRDUP(driver.config->spiceTLSCiphers, "DEFAULT")); + DO_TEST("graphics-spice-sasl-ciphers", + QEMU_CAPS_SPICE, + QEMU_CAPS_DEVICE_QXL); + VIR_FREE(driver.config->spiceTLSCiphers); VIR_FREE(driver.config->spiceSASLdir); driver.config->spiceSASL = 0; DO_TEST("graphics-spice-agentmouse", -- 2.13.6

4 3

[libvirt] [PATCH 00/44] Require QEMU 1.3.0 or newer
by Ján Tomko 03 Apr '18

03 Apr '18

It's been a while since we last bumped the minimum QEMU version. Let's get rid of -help parsing and bring our test suite closer to real world usage by implying lots of capabilities. Ján Tomko (44): qemuxml2argvtest: Fix q35-virt-manager capabilities Delete bogus cpu-host-passthrough test Force QMP capability probing Require QEMU 1.3.0 Deprecate QEMU_CAPS_PCI_MULTIFUNCTION Deprecate QEMU_CAPS_NETDEV Clean up qemuDomainAttachNetDevice Remove unused qemuDomainNetVLAN Remove qemuDomainSupportsNetdev Deprecate QEMU_CAPS_MONITOR_JSON Deprecate QEMU_CAPS_NO_USER_CONFIG Deprecate QEMU_CAPS_MEM_PATH Deprecate QEMU_CAPS_DRIVE_SERIAL Deprecate QEMU_CAPS_SDL Deprecate QEMU_CAPS_RTC Deprecate QEMU_CAPS_RTC_TD_HACK Deprecate QEMU_CAPS_VHOST_NET Deprecate QEMU_CAPS_NODEFCONFIG Deprecate QEMU_CAPS_BOOT_MENU Deprecate QEMU_CAPS_FSDEV Deprecate QEMU_CAPS_NAME_PROCESS Deprecate QEMU_CAPS_SMBIOS_TYPE Deprecate QEMU_CAPS_VGA_NONE Deprecate QEMU_CAPS_DRIVE_AIO Deprecate QEMU_CAPS_CHARDEV_SPICEVMC Deprecate QEMU_CAPS_DEVICE_SPICEVMC Deprecate QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC Deprecate QEMU_CAPS_NO_SHUTDOWN Deprecate QEMU_CAPS_DRIVE_CACHE_UNSAFE Deprecate QEMU_CAPS_FSDEV_READONLY Deprecate QEMU_CAPS_DRIVE_COPY_ON_READ Deprecate QEMU_CAPS_FSDEV_WRITEOUT Deprecate QEMU_CAPS_DRIVE_IOTUNE Deprecate QEMU_CAPS_WAKEUP Deprecate QEMU_CAPS_NETDEV_BRIDGE Deprecate QEMU_CAPS_SECCOMP_SANDBOX Deprecate QEMU_CAPS_DTB Deprecate QEMU_CAPS_IPV6_MIGRATION Deprecate QEMU_CAPS_MACHINE_OPT Deprecate QEMU_CAPS_DUMP_GUEST_CORE Deprecate QEMU_CAPS_VNC_SHARE_POLICY Deprecate QEMU_CAPS_HOST_PCI_MULTIDOMAIN Deprecate QEMU_CAPS_DISPLAY Deprecate QEMU_CAPS_MACHINE_USB_OPT cfg.mk | 2 +- src/qemu/qemu_capabilities.c | 931 +--------- src/qemu/qemu_capabilities.h | 74 +- src/qemu/qemu_capspriv.h | 17 +- src/qemu/qemu_command.c | 690 +++---- src/qemu/qemu_domain.c | 16 - src/qemu/qemu_domain.h | 6 - src/qemu/qemu_driver.c | 48 +- src/qemu/qemu_hotplug.c | 147 +- src/qemu/qemu_interface.c | 4 +- src/qemu/qemu_interface.h | 1 - src/qemu/qemu_migration.c | 10 +- src/qemu/qemu_process.c | 23 +- tests/Makefile.am | 8 +- .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 1886 -------------------- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 172 -- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 35 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 35 - tests/qemucapabilitiestest.c | 1 - tests/qemucapsprobe.c | 2 +- tests/qemuhelpdata/qemu-0.12.1 | 198 -- tests/qemuhelpdata/qemu-0.12.1-device | 62 - tests/qemuhelpdata/qemu-1.0 | 253 --- tests/qemuhelpdata/qemu-1.0-device | 148 -- tests/qemuhelpdata/qemu-1.1.0 | 269 --- tests/qemuhelpdata/qemu-1.1.0-device | 170 -- tests/qemuhelpdata/qemu-1.2.0 | 272 --- tests/qemuhelpdata/qemu-kvm-0.12.3 | 215 --- tests/qemuhelpdata/qemu-kvm-0.12.3-device | 63 - tests/qemuhelpdata/qemu-kvm-0.13.0 | 242 --- tests/qemuhelpdata/qemu-kvm-0.13.0-device | 90 - tests/qemuhelpdata/qemu-kvm-1.2.0 | 277 --- tests/qemuhelptest.c | 437 ----- .../aarch64-aavmf-virtio-mmio.args | 14 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 9 +- .../qemuxml2argvdata/aarch64-cpu-passthrough.args | 10 +- tests/qemuxml2argvdata/aarch64-gic-host.args | 9 +- tests/qemuxml2argvdata/aarch64-gic-none-tcg.args | 9 +- tests/qemuxml2argvdata/aarch64-gic-v2.args | 9 +- tests/qemuxml2argvdata/aarch64-gic-v3.args | 9 +- tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args | 14 +- tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args | 9 +- tests/qemuxml2argvdata/aarch64-noacpi-uefi.args | 9 +- tests/qemuxml2argvdata/aarch64-pci-serial.args | 10 +- .../aarch64-usb-controller-nec-xhci.args | 9 +- .../aarch64-usb-controller-qemu-xhci.args | 9 +- tests/qemuxml2argvdata/aarch64-video-default.args | 8 +- .../aarch64-video-virtio-gpu-pci.args | 16 +- .../aarch64-virt-2.6-virtio-pci-default.args | 15 +- .../qemuxml2argvdata/aarch64-virt-default-nic.args | 14 +- tests/qemuxml2argvdata/aarch64-virt-virtio.args | 14 +- .../aarch64-virtio-pci-default.args | 15 +- .../aarch64-virtio-pci-manual-addresses.args | 20 +- tests/qemuxml2argvdata/acpi-table.args | 9 +- tests/qemuxml2argvdata/arm-vexpressa9-basic.args | 10 +- tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args | 10 +- tests/qemuxml2argvdata/arm-vexpressa9-virtio.args | 14 +- tests/qemuxml2argvdata/arm-virt-virtio.args | 14 +- tests/qemuxml2argvdata/autoindex.args | 9 +- tests/qemuxml2argvdata/balloon-ccw-deflate.args | 10 +- tests/qemuxml2argvdata/balloon-device-auto.args | 10 +- .../balloon-device-deflate-off.args | 10 +- tests/qemuxml2argvdata/balloon-device-deflate.args | 10 +- tests/qemuxml2argvdata/balloon-device-period.args | 10 +- tests/qemuxml2argvdata/balloon-device.args | 10 +- tests/qemuxml2argvdata/balloon-mmio-deflate.args | 10 +- tests/qemuxml2argvdata/bios-nvram-secure.args | 11 +- tests/qemuxml2argvdata/bios-nvram.args | 11 +- tests/qemuxml2argvdata/bios.args | 11 +- tests/qemuxml2argvdata/blkdeviotune-group-num.args | 9 +- .../qemuxml2argvdata/blkdeviotune-max-length.args | 9 +- tests/qemuxml2argvdata/blkdeviotune-max.args | 9 +- tests/qemuxml2argvdata/blkdeviotune.args | 9 +- tests/qemuxml2argvdata/blkiotune-device.args | 9 +- tests/qemuxml2argvdata/blkiotune.args | 9 +- tests/qemuxml2argvdata/boot-cdrom.args | 9 +- tests/qemuxml2argvdata/boot-complex-bootindex.args | 20 +- tests/qemuxml2argvdata/boot-complex.args | 19 +- tests/qemuxml2argvdata/boot-floppy-q35.args | 9 +- tests/qemuxml2argvdata/boot-floppy.args | 9 +- .../boot-menu-disable-drive-bootindex.args | 9 +- .../qemuxml2argvdata/boot-menu-disable-drive.args | 9 +- tests/qemuxml2argvdata/boot-menu-disable.args | 9 +- .../boot-menu-enable-bootindex.args | 9 +- .../boot-menu-enable-with-timeout.args | 9 +- tests/qemuxml2argvdata/boot-menu-enable.args | 9 +- tests/qemuxml2argvdata/boot-multi.args | 9 +- tests/qemuxml2argvdata/boot-network.args | 9 +- tests/qemuxml2argvdata/boot-order.args | 15 +- tests/qemuxml2argvdata/boot-strict.args | 20 +- tests/qemuxml2argvdata/bootindex-floppy-q35.args | 9 +- tests/qemuxml2argvdata/channel-guestfwd.args | 10 +- tests/qemuxml2argvdata/channel-spicevmc-old.args | 29 - tests/qemuxml2argvdata/channel-spicevmc-old.xml | 35 - tests/qemuxml2argvdata/channel-spicevmc.args | 8 +- tests/qemuxml2argvdata/channel-virtio-auto.args | 10 +- tests/qemuxml2argvdata/channel-virtio-autoadd.args | 10 +- .../channel-virtio-autoassign.args | 10 +- tests/qemuxml2argvdata/channel-virtio-default.args | 10 +- tests/qemuxml2argvdata/channel-virtio-state.args | 10 +- tests/qemuxml2argvdata/channel-virtio-unix.args | 10 +- tests/qemuxml2argvdata/channel-virtio.args | 10 +- tests/qemuxml2argvdata/chardev-reconnect.args | 10 +- tests/qemuxml2argvdata/clock-catchup.args | 8 +- tests/qemuxml2argvdata/clock-france.args | 8 +- tests/qemuxml2argvdata/clock-hpet-off.args | 8 +- .../clock-localtime-basis-localtime.args | 8 +- tests/qemuxml2argvdata/clock-localtime.args | 10 +- tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 9 +- tests/qemuxml2argvdata/clock-utc.args | 10 +- tests/qemuxml2argvdata/clock-variable.args | 8 +- tests/qemuxml2argvdata/console-compat-auto.args | 9 +- tests/qemuxml2argvdata/console-compat-chardev.args | 10 +- tests/qemuxml2argvdata/console-compat.args | 9 +- tests/qemuxml2argvdata/console-sclp.args | 10 +- tests/qemuxml2argvdata/console-virtio-ccw.args | 10 +- tests/qemuxml2argvdata/console-virtio-many.args | 10 +- tests/qemuxml2argvdata/console-virtio-s390.args | 10 +- tests/qemuxml2argvdata/console-virtio.args | 10 +- tests/qemuxml2argvdata/controller-order.args | 13 +- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 9 +- tests/qemuxml2argvdata/cpu-Haswell.args | 9 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 9 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 9 +- tests/qemuxml2argvdata/cpu-cache-disable.args | 9 +- tests/qemuxml2argvdata/cpu-cache-disable2.args | 9 +- tests/qemuxml2argvdata/cpu-cache-disable3.args | 9 +- tests/qemuxml2argvdata/cpu-cache-emulate-l3.args | 9 +- tests/qemuxml2argvdata/cpu-cache-passthrough.args | 9 +- tests/qemuxml2argvdata/cpu-cache-passthrough2.args | 9 +- tests/qemuxml2argvdata/cpu-check-default-none.args | 9 +- .../qemuxml2argvdata/cpu-check-default-none2.args | 9 +- .../cpu-check-default-partial.args | 9 +- .../cpu-check-default-partial2.args | 9 +- tests/qemuxml2argvdata/cpu-check-none.args | 9 +- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 9 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 9 +- tests/qemuxml2argvdata/cpu-exact1.args | 9 +- tests/qemuxml2argvdata/cpu-exact2-nofallback.args | 9 +- tests/qemuxml2argvdata/cpu-exact2.args | 9 +- tests/qemuxml2argvdata/cpu-fallback.args | 9 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 10 +- tests/qemuxml2argvdata/cpu-host-model-cmt.args | 9 +- .../qemuxml2argvdata/cpu-host-model-fallback.args | 9 +- tests/qemuxml2argvdata/cpu-host-model-vendor.args | 9 +- tests/qemuxml2argvdata/cpu-host-model.args | 9 +- .../cpu-host-passthrough-features.args | 9 +- tests/qemuxml2argvdata/cpu-host-passthrough.args | 9 +- tests/qemuxml2argvdata/cpu-hotplug-startup.args | 9 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 10 +- tests/qemuxml2argvdata/cpu-minimum1.args | 9 +- tests/qemuxml2argvdata/cpu-minimum2.args | 9 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 9 +- tests/qemuxml2argvdata/cpu-numa-memshared.args | 9 +- .../cpu-numa-no-memory-element.args | 9 +- tests/qemuxml2argvdata/cpu-numa1.args | 9 +- tests/qemuxml2argvdata/cpu-numa2.args | 9 +- tests/qemuxml2argvdata/cpu-s390-features.args | 9 +- tests/qemuxml2argvdata/cpu-s390-zEC12.args | 9 +- tests/qemuxml2argvdata/cpu-strict1.args | 9 +- tests/qemuxml2argvdata/cpu-topology1.args | 9 +- tests/qemuxml2argvdata/cpu-topology2.args | 9 +- tests/qemuxml2argvdata/cpu-topology3.args | 9 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 9 +- tests/qemuxml2argvdata/cputune-numatune.args | 9 +- tests/qemuxml2argvdata/cputune-zero-shares.args | 9 +- tests/qemuxml2argvdata/cputune.args | 9 +- tests/qemuxml2argvdata/debug-threads.args | 9 +- tests/qemuxml2argvdata/default-kvm-host-arch.args | 9 +- tests/qemuxml2argvdata/default-qemu-host-arch.args | 9 +- tests/qemuxml2argvdata/disk-aio.args | 9 +- tests/qemuxml2argvdata/disk-blockio.args | 10 +- tests/qemuxml2argvdata/disk-cdrom-empty.args | 9 +- tests/qemuxml2argvdata/disk-cdrom-network-ftp.args | 9 +- .../qemuxml2argvdata/disk-cdrom-network-ftps.args | 9 +- .../qemuxml2argvdata/disk-cdrom-network-http.args | 9 +- .../qemuxml2argvdata/disk-cdrom-network-https.args | 9 +- .../qemuxml2argvdata/disk-cdrom-network-tftp.args | 9 +- .../disk-cdrom-tray-no-device-cap.args | 9 +- tests/qemuxml2argvdata/disk-cdrom-tray.args | 11 +- tests/qemuxml2argvdata/disk-cdrom.args | 9 +- tests/qemuxml2argvdata/disk-copy_on_read.args | 17 +- tests/qemuxml2argvdata/disk-drive-boot-cdrom.args | 9 +- tests/qemuxml2argvdata/disk-drive-boot-disk.args | 9 +- .../disk-drive-cache-directsync.args | 9 +- .../qemuxml2argvdata/disk-drive-cache-unsafe.args | 9 +- .../qemuxml2argvdata/disk-drive-cache-v2-none.args | 9 +- tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args | 9 +- tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args | 9 +- .../qemuxml2argvdata/disk-drive-copy-on-read.args | 9 +- .../qemuxml2argvdata/disk-drive-detect-zeroes.args | 11 +- tests/qemuxml2argvdata/disk-drive-discard.args | 11 +- .../disk-drive-error-policy-enospace.args | 7 +- .../disk-drive-error-policy-stop.args | 7 +- .../disk-drive-error-policy-wreport-rignore.args | 7 +- tests/qemuxml2argvdata/disk-drive-fmt-qcow.args | 9 +- .../disk-drive-network-gluster.args | 9 +- .../disk-drive-network-iscsi-auth.args | 9 +- .../disk-drive-network-iscsi-lun.args | 10 +- .../qemuxml2argvdata/disk-drive-network-iscsi.args | 9 +- .../disk-drive-network-nbd-export.args | 9 +- .../disk-drive-network-nbd-ipv6-export.args | 9 +- .../disk-drive-network-nbd-ipv6.args | 9 +- .../disk-drive-network-nbd-unix.args | 9 +- tests/qemuxml2argvdata/disk-drive-network-nbd.args | 9 +- .../disk-drive-network-rbd-auth-AES.args | 9 +- .../disk-drive-network-rbd-auth.args | 9 +- .../disk-drive-network-rbd-ipv6.args | 9 +- tests/qemuxml2argvdata/disk-drive-network-rbd.args | 9 +- .../disk-drive-network-sheepdog.args | 9 +- .../disk-drive-network-source-auth.args | 9 +- .../disk-drive-network-tlsx509-vxhs.args | 15 +- .../qemuxml2argvdata/disk-drive-network-vxhs.args | 11 +- tests/qemuxml2argvdata/disk-drive-no-boot.args | 9 +- .../qemuxml2argvdata/disk-drive-readonly-disk.args | 10 +- .../disk-drive-readonly-no-device.args | 10 +- .../disk-drive-shared-locking.args | 9 +- tests/qemuxml2argvdata/disk-drive-shared.args | 9 +- .../disk-floppy-tray-no-device-cap.args | 9 +- tests/qemuxml2argvdata/disk-floppy-tray.args | 9 +- tests/qemuxml2argvdata/disk-floppy.args | 9 +- tests/qemuxml2argvdata/disk-geometry.args | 9 +- .../disk-hostdev-scsi-virtio-iscsi-auth-AES.args | 9 +- tests/qemuxml2argvdata/disk-ide-drive-split.args | 10 +- tests/qemuxml2argvdata/disk-ide-wwn.args | 9 +- tests/qemuxml2argvdata/disk-ioeventfd.args | 15 +- tests/qemuxml2argvdata/disk-iscsi.args | 9 +- .../qemuxml2argvdata/disk-many-format-probing.args | 9 +- tests/qemuxml2argvdata/disk-many.args | 9 +- tests/qemuxml2argvdata/disk-order.args | 9 +- tests/qemuxml2argvdata/disk-sata-device.args | 10 +- tests/qemuxml2argvdata/disk-scsi-device-auto.args | 10 +- tests/qemuxml2argvdata/disk-scsi-device.args | 10 +- tests/qemuxml2argvdata/disk-scsi-disk-split.args | 10 +- tests/qemuxml2argvdata/disk-scsi-disk-vpd.args | 10 +- tests/qemuxml2argvdata/disk-scsi-disk-wwn.args | 12 +- .../disk-scsi-lun-passthrough.args | 9 +- tests/qemuxml2argvdata/disk-scsi-megasas.args | 10 +- tests/qemuxml2argvdata/disk-scsi-mptsas1068.args | 10 +- tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args | 10 +- tests/qemuxml2argvdata/disk-scsi-vscsi.args | 10 +- tests/qemuxml2argvdata/disk-serial.args | 9 +- tests/qemuxml2argvdata/disk-snapshot.args | 9 +- tests/qemuxml2argvdata/disk-source-pool-mode.args | 10 +- tests/qemuxml2argvdata/disk-source-pool.args | 10 +- .../disk-usb-device-removable.args | 10 +- tests/qemuxml2argvdata/disk-usb-device.args | 10 +- tests/qemuxml2argvdata/disk-virtio-ccw-many.args | 9 +- tests/qemuxml2argvdata/disk-virtio-ccw.args | 9 +- .../qemuxml2argvdata/disk-virtio-drive-queues.args | 9 +- tests/qemuxml2argvdata/disk-virtio-s390.args | 9 +- tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args | 9 +- .../disk-virtio-scsi-cmd_per_lun.args | 10 +- .../disk-virtio-scsi-ioeventfd.args | 10 +- .../disk-virtio-scsi-max_sectors.args | 10 +- .../disk-virtio-scsi-num_queues.args | 10 +- tests/qemuxml2argvdata/disk-virtio.args | 9 +- tests/qemuxml2argvdata/encrypted-disk-usage.args | 9 +- tests/qemuxml2argvdata/encrypted-disk.args | 9 +- tests/qemuxml2argvdata/eoi-disabled.args | 9 +- tests/qemuxml2argvdata/eoi-enabled.args | 9 +- tests/qemuxml2argvdata/event_idx.args | 17 +- .../fd-memory-no-numa-topology.args | 9 +- .../qemuxml2argvdata/fd-memory-numa-topology.args | 9 +- .../qemuxml2argvdata/fd-memory-numa-topology2.args | 9 +- .../qemuxml2argvdata/fd-memory-numa-topology3.args | 9 +- tests/qemuxml2argvdata/fips-enabled.args | 9 +- tests/qemuxml2argvdata/floppy-drive-fat.args | 9 +- tests/qemuxml2argvdata/fs9p-ccw.args | 10 +- tests/qemuxml2argvdata/fs9p.args | 10 +- .../qemuxml2argvdata/graphics-sdl-fullscreen.args | 7 +- tests/qemuxml2argvdata/graphics-sdl.args | 7 +- .../graphics-spice-agent-file-xfer.args | 7 +- .../graphics-spice-agentmouse.args | 8 +- .../graphics-spice-auto-socket-cfg.args | 7 +- .../graphics-spice-auto-socket.args | 7 +- .../graphics-spice-compression.args | 7 +- tests/qemuxml2argvdata/graphics-spice-no-args.args | 7 +- tests/qemuxml2argvdata/graphics-spice-qxl-vga.args | 7 +- tests/qemuxml2argvdata/graphics-spice-sasl.args | 7 +- tests/qemuxml2argvdata/graphics-spice-socket.args | 7 +- tests/qemuxml2argvdata/graphics-spice-timeout.args | 14 +- .../qemuxml2argvdata/graphics-spice-usb-redir.args | 8 +- tests/qemuxml2argvdata/graphics-spice.args | 7 +- .../graphics-vnc-auto-socket-cfg.args | 7 +- .../qemuxml2argvdata/graphics-vnc-auto-socket.args | 7 +- .../graphics-vnc-no-listen-attr.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-none.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-policy.args | 7 +- .../graphics-vnc-remove-generated-socket.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-sasl.args | 7 +- .../graphics-vnc-socket-new-cmdline.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-socket.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-tls.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-websocket.args | 7 +- tests/qemuxml2argvdata/graphics-vnc.args | 7 +- .../qemuxml2argvdata/hostdev-mdev-precreated.args | 10 +- .../hostdev-pci-address-device.args | 10 +- tests/qemuxml2argvdata/hostdev-pci-address.args | 9 +- .../hostdev-scsi-lsi-iscsi-auth.args | 9 +- tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args | 9 +- tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 9 +- tests/qemuxml2argvdata/hostdev-scsi-readonly.args | 9 +- .../hostdev-scsi-vhost-scsi-ccw.args | 9 +- .../hostdev-scsi-vhost-scsi-pci.args | 9 +- .../hostdev-scsi-vhost-scsi-pcie.args | 9 +- .../hostdev-scsi-virtio-iscsi-auth.args | 9 +- .../hostdev-scsi-virtio-iscsi.args | 9 +- .../qemuxml2argvdata/hostdev-scsi-virtio-scsi.args | 9 +- .../hostdev-usb-address-device-boot.args | 10 +- .../hostdev-usb-address-device.args | 10 +- tests/qemuxml2argvdata/hostdev-usb-address.args | 9 +- .../qemuxml2argvdata/hostdev-vfio-multidomain.args | 10 +- tests/qemuxml2argvdata/hostdev-vfio.args | 10 +- tests/qemuxml2argvdata/hotplug-base.args | 9 +- tests/qemuxml2argvdata/hugepages-memaccess.args | 9 +- tests/qemuxml2argvdata/hugepages-memaccess2.args | 9 +- tests/qemuxml2argvdata/hugepages-numa.args | 6 +- tests/qemuxml2argvdata/hugepages-pages.args | 9 +- tests/qemuxml2argvdata/hugepages-pages2.args | 9 +- tests/qemuxml2argvdata/hugepages-pages3.args | 9 +- tests/qemuxml2argvdata/hugepages-pages5.args | 9 +- tests/qemuxml2argvdata/hugepages-pages6.args | 9 +- tests/qemuxml2argvdata/hugepages-pages7.args | 9 +- tests/qemuxml2argvdata/hugepages-shared.args | 9 +- tests/qemuxml2argvdata/hugepages.args | 9 +- tests/qemuxml2argvdata/hyperv-off.args | 9 +- tests/qemuxml2argvdata/hyperv-panic.args | 9 +- tests/qemuxml2argvdata/hyperv.args | 9 +- tests/qemuxml2argvdata/input-usbmouse-addr.args | 10 +- tests/qemuxml2argvdata/input-usbmouse.args | 9 +- tests/qemuxml2argvdata/input-usbtablet.args | 9 +- tests/qemuxml2argvdata/input-virtio-ccw.args | 9 +- .../qemuxml2argvdata/intel-iommu-caching-mode.args | 14 +- .../qemuxml2argvdata/intel-iommu-device-iotlb.args | 9 +- tests/qemuxml2argvdata/intel-iommu-eim.args | 9 +- tests/qemuxml2argvdata/intel-iommu-machine.args | 9 +- tests/qemuxml2argvdata/intel-iommu.args | 9 +- .../iothreads-disk-virtio-ccw.args | 9 +- tests/qemuxml2argvdata/iothreads-disk.args | 9 +- tests/qemuxml2argvdata/iothreads-ids-partial.args | 9 +- tests/qemuxml2argvdata/iothreads-ids.args | 9 +- .../iothreads-virtio-scsi-ccw.args | 9 +- .../iothreads-virtio-scsi-pci.args | 9 +- tests/qemuxml2argvdata/iothreads.args | 9 +- tests/qemuxml2argvdata/kvm-features-off.args | 9 +- tests/qemuxml2argvdata/kvm-features.args | 9 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 9 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 9 +- tests/qemuxml2argvdata/kvm.args | 9 +- tests/qemuxml2argvdata/kvmclock+eoi-disabled.args | 9 +- tests/qemuxml2argvdata/kvmclock.args | 9 +- tests/qemuxml2argvdata/luks-disks-source.args | 9 +- tests/qemuxml2argvdata/luks-disks.args | 9 +- .../qemuxml2argvdata/mach-virt-console-virtio.args | 10 +- .../qemuxml2argvdata/mach-virt-serial-native.args | 10 +- tests/qemuxml2argvdata/mach-virt-serial-pci.args | 10 +- tests/qemuxml2argvdata/mach-virt-serial-usb.args | 10 +- .../machine-aeskeywrap-off-cap.args | 10 +- .../machine-aeskeywrap-off-caps.args | 10 +- .../machine-aeskeywrap-on-cap.args | 9 +- .../machine-aeskeywrap-on-caps.args | 9 +- tests/qemuxml2argvdata/machine-aliases1.args | 9 +- tests/qemuxml2argvdata/machine-aliases2.args | 9 +- tests/qemuxml2argvdata/machine-core-cfg-off.args | 9 +- tests/qemuxml2argvdata/machine-core-off.args | 9 +- tests/qemuxml2argvdata/machine-core-on.args | 9 +- .../machine-deakeywrap-off-cap.args | 10 +- .../machine-deakeywrap-off-caps.args | 10 +- .../machine-deakeywrap-on-cap.args | 9 +- .../machine-deakeywrap-on-caps.args | 9 +- .../machine-keywrap-none-caps.args | 9 +- tests/qemuxml2argvdata/machine-keywrap-none.args | 9 +- .../machine-loadparm-multiple-disks-nets-s390.args | 21 +- .../machine-loadparm-net-s390.args | 15 +- tests/qemuxml2argvdata/machine-loadparm-s390.args | 9 +- tests/qemuxml2argvdata/machine-smm-opt.args | 9 +- tests/qemuxml2argvdata/machine-usb-opt.args | 9 +- tests/qemuxml2argvdata/machine-vmport-opt.args | 9 +- tests/qemuxml2argvdata/master-key.args | 9 +- .../qemuxml2argvdata/memory-hotplug-dimm-addr.args | 9 +- tests/qemuxml2argvdata/memory-hotplug-dimm.args | 9 +- .../memory-hotplug-nvdimm-access.args | 9 +- .../memory-hotplug-nvdimm-label.args | 9 +- tests/qemuxml2argvdata/memory-hotplug-nvdimm.args | 9 +- .../memory-hotplug-ppc64-nonuma.args | 9 +- tests/qemuxml2argvdata/memory-hotplug.args | 9 +- tests/qemuxml2argvdata/memtune-unlimited.args | 9 +- tests/qemuxml2argvdata/memtune.args | 9 +- tests/qemuxml2argvdata/migrate-numa-unaligned.args | 9 +- tests/qemuxml2argvdata/migrate.args | 9 +- tests/qemuxml2argvdata/minimal-msg-timestamp.args | 9 +- tests/qemuxml2argvdata/minimal.args | 9 +- tests/qemuxml2argvdata/misc-acpi.args | 9 +- tests/qemuxml2argvdata/misc-disable-s3.args | 9 +- tests/qemuxml2argvdata/misc-disable-suspends.args | 9 +- tests/qemuxml2argvdata/misc-enable-s4.args | 9 +- tests/qemuxml2argvdata/misc-no-reboot.args | 8 +- tests/qemuxml2argvdata/misc-uuid.args | 9 +- tests/qemuxml2argvdata/mlock-off.args | 9 +- tests/qemuxml2argvdata/mlock-on.args | 9 +- tests/qemuxml2argvdata/mlock-unsupported.args | 9 +- tests/qemuxml2argvdata/monitor-json.args | 8 +- .../qemuxml2argvdata/multifunction-pci-device.args | 10 +- tests/qemuxml2argvdata/name-escape.args | 7 +- tests/qemuxml2argvdata/net-client.args | 14 +- tests/qemuxml2argvdata/net-eth-hostip.args | 14 +- tests/qemuxml2argvdata/net-eth-ifname.args | 14 +- tests/qemuxml2argvdata/net-eth-names.args | 18 +- tests/qemuxml2argvdata/net-eth.args | 14 +- .../qemuxml2argvdata/net-hostdev-multidomain.args | 10 +- .../net-hostdev-vfio-multidomain.args | 10 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 10 +- tests/qemuxml2argvdata/net-hostdev.args | 10 +- tests/qemuxml2argvdata/net-mcast.args | 14 +- tests/qemuxml2argvdata/net-server.args | 14 +- tests/qemuxml2argvdata/net-udp.args | 15 +- tests/qemuxml2argvdata/net-user-addr.args | 9 +- tests/qemuxml2argvdata/net-user.args | 14 +- tests/qemuxml2argvdata/net-vhostuser-multiq.args | 9 +- tests/qemuxml2argvdata/net-vhostuser.args | 9 +- tests/qemuxml2argvdata/net-virtio-ccw.args | 19 +- tests/qemuxml2argvdata/net-virtio-device.args | 16 +- .../net-virtio-disable-offloads.args | 14 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 10 +- .../qemuxml2argvdata/net-virtio-rxtxqueuesize.args | 15 +- tests/qemuxml2argvdata/net-virtio-s390.args | 13 +- tests/qemuxml2argvdata/net-virtio.args | 14 +- tests/qemuxml2argvdata/no-kvm-pit-device.args | 9 +- tests/qemuxml2argvdata/no-shutdown.args | 7 +- tests/qemuxml2argvdata/nographics-display.args | 7 +- tests/qemuxml2argvdata/nographics-vga.args | 9 +- tests/qemuxml2argvdata/nographics.args | 9 +- tests/qemuxml2argvdata/nosharepages.args | 9 +- .../numad-auto-memory-vcpu-cpuset.args | 9 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 9 +- .../numad-auto-vcpu-static-numatune.args | 9 +- .../numad-static-memory-auto-vcpu.args | 9 +- tests/qemuxml2argvdata/numad.args | 9 +- .../numatune-auto-nodeset-invalid.args | 9 +- tests/qemuxml2argvdata/numatune-auto-prefer.args | 9 +- tests/qemuxml2argvdata/numatune-distances.args | 9 +- .../numatune-memnode-no-memory.args | 9 +- tests/qemuxml2argvdata/numatune-memnode.args | 9 +- tests/qemuxml2argvdata/numatune-memory.args | 9 +- tests/qemuxml2argvdata/panic-double.args | 10 +- tests/qemuxml2argvdata/panic-no-address.args | 10 +- tests/qemuxml2argvdata/panic.args | 10 +- .../qemuxml2argvdata/parallel-parport-chardev.args | 10 +- tests/qemuxml2argvdata/parallel-tcp-chardev.args | 10 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 9 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 9 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 9 +- tests/qemuxml2argvdata/pci-bridge-many-disks.args | 9 +- tests/qemuxml2argvdata/pci-bridge.args | 158 +- tests/qemuxml2argvdata/pci-expander-bus.args | 160 +- tests/qemuxml2argvdata/pci-many.args | 9 +- tests/qemuxml2argvdata/pci-rom.args | 22 +- tests/qemuxml2argvdata/pci-serial-dev-chardev.args | 10 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 164 +- .../pcie-root-port-model-generic.args | 9 +- .../pcie-root-port-model-ioh3420.args | 9 +- tests/qemuxml2argvdata/pcie-root-port.args | 9 +- tests/qemuxml2argvdata/pcie-root.args | 9 +- .../pcie-switch-downstream-port.args | 9 +- .../pcie-switch-upstream-port.args | 9 +- tests/qemuxml2argvdata/pcihole64-q35.args | 9 +- tests/qemuxml2argvdata/pcihole64.args | 9 +- tests/qemuxml2argvdata/pmu-feature-off.args | 9 +- tests/qemuxml2argvdata/pmu-feature.args | 9 +- tests/qemuxml2argvdata/ppc-dtb.args | 9 +- .../ppc64-usb-controller-legacy.args | 9 +- .../ppc64-usb-controller-qemu-xhci.args | 9 +- tests/qemuxml2argvdata/ppc64-usb-controller.args | 9 +- tests/qemuxml2argvdata/ppce500-serial.args | 9 +- tests/qemuxml2argvdata/pseries-basic.args | 10 +- tests/qemuxml2argvdata/pseries-console-virtio.args | 10 +- .../pseries-cpu-compat-power9.args | 10 +- tests/qemuxml2argvdata/pseries-cpu-compat.args | 10 +- tests/qemuxml2argvdata/pseries-cpu-exact.args | 10 +- tests/qemuxml2argvdata/pseries-cpu-le.args | 10 +- tests/qemuxml2argvdata/pseries-features.args | 9 +- tests/qemuxml2argvdata/pseries-hostdevs-1.args | 10 +- tests/qemuxml2argvdata/pseries-hostdevs-2.args | 10 +- tests/qemuxml2argvdata/pseries-hostdevs-3.args | 10 +- .../pseries-machine-max-cpu-compat.args | 10 +- tests/qemuxml2argvdata/pseries-many-buses-1.args | 10 +- tests/qemuxml2argvdata/pseries-many-buses-2.args | 10 +- tests/qemuxml2argvdata/pseries-many-devices.args | 10 +- tests/qemuxml2argvdata/pseries-nvram.args | 9 +- tests/qemuxml2argvdata/pseries-panic-missing.args | 10 +- .../qemuxml2argvdata/pseries-panic-no-address.args | 10 +- .../pseries-phb-default-missing.args | 10 +- tests/qemuxml2argvdata/pseries-phb-numa-node.args | 9 +- tests/qemuxml2argvdata/pseries-phb-simple.args | 10 +- tests/qemuxml2argvdata/pseries-serial-native.args | 10 +- tests/qemuxml2argvdata/pseries-serial-pci.args | 10 +- tests/qemuxml2argvdata/pseries-serial-usb.args | 10 +- tests/qemuxml2argvdata/pseries-usb-default.args | 10 +- tests/qemuxml2argvdata/pseries-usb-kbd.args | 10 +- tests/qemuxml2argvdata/pseries-usb-multi.args | 10 +- .../pseries-vio-user-assigned.args | 10 +- tests/qemuxml2argvdata/pseries-vio.args | 10 +- tests/qemuxml2argvdata/pv-spinlock-disabled.args | 9 +- tests/qemuxml2argvdata/pv-spinlock-enabled.args | 9 +- tests/qemuxml2argvdata/q35-acpi-nouefi.args | 9 +- tests/qemuxml2argvdata/q35-acpi-uefi.args | 9 +- .../qemuxml2argvdata/q35-default-devices-only.args | 9 +- tests/qemuxml2argvdata/q35-multifunction.args | 9 +- tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 9 +- tests/qemuxml2argvdata/q35-pci-force-address.args | 14 +- tests/qemuxml2argvdata/q35-pcie-autoadd.args | 9 +- tests/qemuxml2argvdata/q35-pcie.args | 9 +- .../qemuxml2argvdata/q35-pm-disable-fallback.args | 9 +- tests/qemuxml2argvdata/q35-pm-disable.args | 9 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 9 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 9 +- tests/qemuxml2argvdata/q35-usb2.args | 9 +- tests/qemuxml2argvdata/q35-virt-manager-basic.args | 6 +- tests/qemuxml2argvdata/q35-virtio-pci.args | 9 +- tests/qemuxml2argvdata/q35.args | 9 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 9 +- .../qemuxml2argvdata/qemu-ns-commandline-ns0.args | 9 +- .../qemuxml2argvdata/qemu-ns-commandline-ns1.args | 9 +- tests/qemuxml2argvdata/qemu-ns-commandline.args | 9 +- .../qemu-ns-domain-commandline-ns0.args | 9 +- .../qemu-ns-domain-commandline.args | 9 +- tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 9 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 9 +- tests/qemuxml2argvdata/qemu-ns.args | 9 +- .../qemuxml2argvdata/reboot-timeout-disabled.args | 9 +- tests/qemuxml2argvdata/reboot-timeout-enabled.args | 9 +- tests/qemuxml2argvdata/restore-v2-fd.args | 9 +- tests/qemuxml2argvdata/restore-v2.args | 9 +- .../s390-allow-bogus-usb-controller.args | 10 +- .../s390-allow-bogus-usb-none.args | 10 +- tests/qemuxml2argvdata/s390-panic-missing.args | 10 +- tests/qemuxml2argvdata/s390-panic-no-address.args | 10 +- tests/qemuxml2argvdata/s390-serial-2.args | 10 +- tests/qemuxml2argvdata/s390-serial-console.args | 10 +- tests/qemuxml2argvdata/s390-serial.args | 10 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 9 +- .../seclabel-dynamic-baselabel.args | 9 +- .../seclabel-dynamic-labelskip.args | 9 +- .../seclabel-dynamic-override.args | 9 +- .../qemuxml2argvdata/seclabel-dynamic-relabel.args | 9 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 9 +- tests/qemuxml2argvdata/seclabel-none.args | 9 +- .../seclabel-static-labelskip.args | 9 +- .../qemuxml2argvdata/seclabel-static-relabel.args | 9 +- tests/qemuxml2argvdata/seclabel-static.args | 9 +- .../serial-dev-chardev-iobase.args | 10 +- tests/qemuxml2argvdata/serial-dev-chardev.args | 10 +- tests/qemuxml2argvdata/serial-file-chardev.args | 10 +- tests/qemuxml2argvdata/serial-file-log.args | 9 +- tests/qemuxml2argvdata/serial-many-chardev.args | 10 +- tests/qemuxml2argvdata/serial-pty-chardev.args | 10 +- .../qemuxml2argvdata/serial-spiceport-nospice.args | 9 +- tests/qemuxml2argvdata/serial-spiceport.args | 8 +- tests/qemuxml2argvdata/serial-tcp-chardev.args | 10 +- .../serial-tcp-telnet-chardev.args | 10 +- .../serial-tcp-tlsx509-chardev-notls.args | 10 +- .../serial-tcp-tlsx509-chardev-verify.args | 10 +- .../serial-tcp-tlsx509-chardev.args | 10 +- .../serial-tcp-tlsx509-secret-chardev.args | 10 +- tests/qemuxml2argvdata/serial-udp-chardev.args | 10 +- tests/qemuxml2argvdata/serial-unix-chardev.args | 10 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 10 +- tests/qemuxml2argvdata/shmem-plain-doorbell.args | 9 +- tests/qemuxml2argvdata/shmem.args | 9 +- tests/qemuxml2argvdata/smartcard-controller.args | 10 +- .../smartcard-host-certificates.args | 10 +- tests/qemuxml2argvdata/smartcard-host.args | 10 +- .../smartcard-passthrough-spicevmc.args | 10 +- .../smartcard-passthrough-tcp.args | 10 +- tests/qemuxml2argvdata/smbios.args | 9 +- tests/qemuxml2argvdata/smp.args | 9 +- tests/qemuxml2argvdata/sound-device.args | 10 +- tests/qemuxml2argvdata/sound.args | 9 +- tests/qemuxml2argvdata/tpm-passthrough.args | 11 +- .../usb-controller-default-q35.args | 9 +- .../usb-controller-explicit-q35.args | 9 +- .../qemuxml2argvdata/usb-controller-qemu-xhci.args | 9 +- tests/qemuxml2argvdata/usb-controller-xhci.args | 10 +- tests/qemuxml2argvdata/usb-controller.args | 10 +- tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 10 +- tests/qemuxml2argvdata/usb-hub-autoadd.args | 10 +- tests/qemuxml2argvdata/usb-hub.args | 10 +- tests/qemuxml2argvdata/usb-ich9-autoassign.args | 10 +- tests/qemuxml2argvdata/usb-ich9-companion.args | 10 +- tests/qemuxml2argvdata/usb-ich9-ehci-addr.args | 10 +- tests/qemuxml2argvdata/usb-long-port-path.args | 10 +- tests/qemuxml2argvdata/usb-none.args | 10 +- tests/qemuxml2argvdata/usb-piix3-controller.args | 10 +- tests/qemuxml2argvdata/usb-port-autoassign.args | 10 +- tests/qemuxml2argvdata/usb-port-missing.args | 10 +- tests/qemuxml2argvdata/usb-ports.args | 10 +- tests/qemuxml2argvdata/usb-redir-boot.args | 10 +- .../qemuxml2argvdata/usb-redir-filter-version.args | 10 +- tests/qemuxml2argvdata/usb-redir-filter.args | 10 +- tests/qemuxml2argvdata/usb-redir.args | 10 +- tests/qemuxml2argvdata/usb-xhci-autoassign.args | 10 +- tests/qemuxml2argvdata/usb1-usb2.args | 10 +- tests/qemuxml2argvdata/user-aliases-usb.args | 9 +- tests/qemuxml2argvdata/user-aliases.args | 25 +- tests/qemuxml2argvdata/vcpu-placement-static.args | 9 +- .../video-device-pciaddr-default.args | 7 +- .../qemuxml2argvdata/video-qxl-device-vgamem.args | 9 +- tests/qemuxml2argvdata/video-qxl-device.args | 9 +- tests/qemuxml2argvdata/video-qxl-heads.args | 9 +- tests/qemuxml2argvdata/video-qxl-nodevice.args | 9 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 9 +- .../video-qxl-sec-device-vgamem.args | 9 +- tests/qemuxml2argvdata/video-qxl-sec-device.args | 9 +- .../qemuxml2argvdata/video-vga-device-vgamem.args | 9 +- tests/qemuxml2argvdata/video-vga-device.args | 9 +- tests/qemuxml2argvdata/video-vga-nodevice.args | 9 +- tests/qemuxml2argvdata/video-vga-qxl-heads.args | 9 +- tests/qemuxml2argvdata/video-virtio-gpu-ccw.args | 7 +- .../qemuxml2argvdata/video-virtio-gpu-device.args | 9 +- .../video-virtio-gpu-secondary.args | 9 +- .../video-virtio-gpu-spice-gl.args | 7 +- tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 9 +- tests/qemuxml2argvdata/video-virtio-vga.args | 9 +- .../qemuxml2argvdata/virtio-input-passthrough.args | 9 +- tests/qemuxml2argvdata/virtio-input.args | 9 +- tests/qemuxml2argvdata/virtio-lun.args | 16 +- tests/qemuxml2argvdata/virtio-options.args | 15 +- tests/qemuxml2argvdata/virtio-rng-ccw.args | 10 +- tests/qemuxml2argvdata/virtio-rng-default.args | 9 +- tests/qemuxml2argvdata/virtio-rng-egd.args | 9 +- tests/qemuxml2argvdata/virtio-rng-multiple.args | 9 +- tests/qemuxml2argvdata/virtio-rng-random.args | 9 +- tests/qemuxml2argvdata/vmcoreinfo.args | 9 +- tests/qemuxml2argvdata/watchdog-device.args | 10 +- tests/qemuxml2argvdata/watchdog-diag288.args | 10 +- tests/qemuxml2argvdata/watchdog-dump.args | 9 +- tests/qemuxml2argvdata/watchdog-injectnmi.args | 9 +- tests/qemuxml2argvdata/watchdog.args | 9 +- tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 9 +- tests/qemuxml2argvtest.c | 744 +++----- tests/qemuxml2xmltest.c | 119 +- 667 files changed, 4571 insertions(+), 10320 deletions(-) delete mode 100644 tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml delete mode 100644 tests/qemuhelpdata/qemu-0.12.1 delete mode 100644 tests/qemuhelpdata/qemu-0.12.1-device delete mode 100644 tests/qemuhelpdata/qemu-1.0 delete mode 100644 tests/qemuhelpdata/qemu-1.0-device delete mode 100644 tests/qemuhelpdata/qemu-1.1.0 delete mode 100644 tests/qemuhelpdata/qemu-1.1.0-device delete mode 100644 tests/qemuhelpdata/qemu-1.2.0 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.3 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.3-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.13.0 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.13.0-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-1.2.0 delete mode 100644 tests/qemuhelptest.c delete mode 100644 tests/qemuxml2argvdata/channel-spicevmc-old.args delete mode 100644 tests/qemuxml2argvdata/channel-spicevmc-old.xml -- 2.16.1

6 61

[libvirt] [RFC PATCH 0/2] qemu: deny privilege elevation and spawn in seccomp
by Ján Tomko 03 Apr '18

03 Apr '18

QEMU changed the behavior of -sandbox on since 2.11 and it no longer whitelists all the possible calls. Override the meaning of seccomp_sandbox = 1 in qemu.conf to block the privilege elevation set and spawn set on top of the default. Do the same by default even if no option is specified, hoping that this should be enough for everybody (TM) Sending as RFC to ask whether: * this is a sensible default * a coarse setting like this is enough or it makes sense to expose the individual sets in qemu.conf (in that case - can I reasonably promote an int setting to a list of strings?) Ján Tomko (2): Introduce QEMU_CAPS_SECCOMP_BLACKLIST qemu: deny privilege elevation and spawn in seccomp src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 10 +++++-- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemuxml2argvdata/minimal-sandbox.args | 25 ++++++++++++++++ tests/qemuxml2argvdata/minimal-sandbox.xml | 34 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 11 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/minimal-sandbox.args create mode 100644 tests/qemuxml2argvdata/minimal-sandbox.xml -- 2.13.6

2 3

[libvirt] [PATCH 00/20] Fix virConnect(Un)RegisterCloseCallback and get rid of global variables
by Marc Hartmayer 03 Apr '18

03 Apr '18

The first part of this patch series fixes the behavior of virConnectSupportsFeatures, virConnect(Un)RegisterCloseCallback, and implements these features in the test driver. This results in a better code coverage of our test suite. The subsequent patches remove the need to have the global variables 'qemuProgram', 'adminProgram', 'lxcProgram, and 'remoteProgram' in remote_daemon.[ch]. They only work in combination with the fixed behavior of virConnectSupportsFeatures and virConnect(Un)RegisterCloseCallback. Marc Hartmayer (20): driver: Add typedef for the anonymous enum used for driver features remote: Don't hard code the feature VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK as available virConnect(Un)RegisterCloseCallback: Throw an error in case the API is not supported test: Implement virConnectSupportsFeature test: Implement virConnect(Un)RegisterCloseCallback test: testOpenDefault: introduce cleanup path test: testOpenFromFile: return VIR_DRV_OPEN_SUCCESS in case of success test: testConnectAuthenticate: Take the lock when accessing mutable values test: testConnectClose: Set privateData to NULL in all cases test: rename defaultConn to defaultPrivconn test: introduce testDriverCloseInternal test: fix error path in testConnectOpen test: Convert testDriver to virObjectLockable remote: remove unneeded global variables stream: Access stream->prog instead of a hard-coded global variable remote: Set eventID explicitly to an invalid value remote: Add the information which program has to be used to daemonClientEventCallback remote: Use domainClientEventCallbacks for remoteReplayConnectionClosedEvent rpc: Introduce virNetServerGetProgramLocked helper function remote/rpc: Use virNetServerGetProgram() to determine the program src/esx/esx_driver.c | 18 +- src/libvirt-host.c | 24 +-- src/libvirt_internal.h | 4 +- src/libvirt_remote.syms | 1 + src/libxl/libxl_driver.c | 13 +- src/lxc/lxc_driver.c | 24 ++- src/openvz/openvz_driver.c | 15 +- src/qemu/qemu_driver.c | 8 +- src/remote/remote_daemon.c | 8 +- src/remote/remote_daemon.h | 3 - src/remote/remote_daemon_dispatch.c | 182 +++++++++++-------- src/remote/remote_daemon_stream.c | 14 +- src/rpc/gendispatch.pl | 2 + src/rpc/virnetserver.c | 54 +++++- src/rpc/virnetserver.h | 2 + src/test/test_driver.c | 339 ++++++++++++++++++++++-------------- src/vz/vz_driver.c | 15 +- src/xen/xen_driver.c | 15 +- tools/virsh.c | 11 +- 19 files changed, 504 insertions(+), 248 deletions(-) -- 2.13.4

4 62

[libvirt] [PATCH python] Post-release version bump to 4.3.0
by Daniel P. Berrangé 03 Apr '18

03 Apr '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as trivial change. setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c40908b..eff9d54 100755 --- a/setup.py +++ b/setup.py @@ -334,7 +334,7 @@ class my_clean(clean): _c_modules, _py_modules = get_module_lists() setup(name = 'libvirt-python', - version = '4.2.0', + version = '4.3.0', url = 'http://www.libvirt.org', maintainer = 'Libvirt Maintainers', maintainer_email = 'libvir-list(a)redhat.com', -- 2.14.3

1 0

[libvirt] [PATCH] rpm: add deps on rpcgen/libtirpc-devel
by Daniel P. Berrangé 03 Apr '18

03 Apr '18

Since RPC support moved out of glibc we need to have explicit deps on the new packages providing this functionality Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index b55a947ec9..97143c68ae 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -464,6 +464,11 @@ BuildRequires: wireshark-devel >= 2.1.0 BuildRequires: libssh-devel >= 0.7.0 %endif +%if 0%{?fedora} > 27 || 0%{?rhel} > 7 +BuildRequires: rpcgen +BuildRequires: libtirpc-devel +%endif + Provides: bundled(gnulib) %description -- 2.14.3

2 1

[libvirt] [PATCH 0/2] libxl: drop support for Xen 4.4 and 4.5
by Jim Fehlig 03 Apr '18

03 Apr '18

Bla bla bla... Jim Fehlig (2): libxl: drop support for Xen < 4.6 news: announce dropping support for Xen 4.4 and 4.5 docs/drvxen.html.in | 11 +++++------ docs/news.xml | 9 +++++++++ m4/virt-driver-libxl.m4 | 23 ++--------------------- 3 files changed, 16 insertions(+), 27 deletions(-) -- 2.16.2

3 7

[libvirt] [PATCH] util: json: Remove yajl bits from virJSONValueToStr
by Peter Krempa 03 Apr '18

03 Apr '18

Rather than depending on yajl bits for creating the JSON structure replace it by few virBuffer bits. This will make the JSON formatter libary agnostic. Additionally remove the debug statement from the worker function since it was not very useful. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virjson.c | 188 ++++++++++++++++++++++++++++------------------------- 1 file changed, 101 insertions(+), 87 deletions(-) diff --git a/src/util/virjson.c b/src/util/virjson.c index 6a02ddf0cc..772a205e9e 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -1834,144 +1834,158 @@ virJSONValueFromString(const char *jsonstring) return ret; } +#else +virJSONValuePtr +virJSONValueFromString(const char *jsonstring ATTRIBUTE_UNUSED) +{ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("No JSON parser implementation is available")); + return NULL; +} +#endif + + +static void +virJSONValueToStringAddString(virBufferPtr buf, + virJSONValuePtr string) +{ + const char *t; + + virBufferAddLit(buf, "\""); + + for (t = string->data.string; *t; t++) { + switch (*t) { + case '"': + virBufferAddLit(buf, "\\\""); + break; + case '\\': + virBufferAddLit(buf, "\\\\"); + break; + case '\n': + virBufferAddLit(buf, "\\n"); + break; + case '\t': + virBufferAddLit(buf, "\\t"); + break; + default: + virBufferAdd(buf, t, 1); + break; + } + } + + virBufferAddLit(buf, "\""); +} + + +#define VIR_JSON_PRETTY_NEWLINE \ + if (pretty) \ + virBufferAddLit(buf, "\n") static int virJSONValueToStringOne(virJSONValuePtr object, - yajl_gen g) + virBufferPtr buf, + bool pretty) { size_t i; - VIR_DEBUG("object=%p type=%d gen=%p", object, object->type, g); - - switch (object->type) { + switch ((virJSONType) object->type) { case VIR_JSON_TYPE_OBJECT: - if (yajl_gen_map_open(g) != yajl_gen_status_ok) - return -1; + virBufferAddLit(buf, "{"); + VIR_JSON_PRETTY_NEWLINE; + virBufferAdjustIndent(buf, 2); + for (i = 0; i < object->data.object.npairs; i++) { - if (yajl_gen_string(g, - (unsigned char *)object->data.object.pairs[i].key, - strlen(object->data.object.pairs[i].key)) - != yajl_gen_status_ok) - return -1; - if (virJSONValueToStringOne(object->data.object.pairs[i].value, g) < 0) + virBufferStrcat(buf, "\"", object->data.object.pairs[i].key, "\":", NULL); + + if (pretty) + virBufferAddLit(buf, " "); + + if (virJSONValueToStringOne(object->data.object.pairs[i].value, + buf, pretty) < 0) return -1; + + if (i != object->data.object.npairs - 1) { + virBufferAddLit(buf, ","); + VIR_JSON_PRETTY_NEWLINE; + } } - if (yajl_gen_map_close(g) != yajl_gen_status_ok) - return -1; + + virBufferAdjustIndent(buf, -2); + VIR_JSON_PRETTY_NEWLINE; + virBufferAddLit(buf, "}"); break; + case VIR_JSON_TYPE_ARRAY: - if (yajl_gen_array_open(g) != yajl_gen_status_ok) - return -1; + virBufferAddLit(buf, "["); + VIR_JSON_PRETTY_NEWLINE; + virBufferAdjustIndent(buf, 2); + for (i = 0; i < object->data.array.nvalues; i++) { - if (virJSONValueToStringOne(object->data.array.values[i], g) < 0) + if (virJSONValueToStringOne(object->data.array.values[i], buf, pretty) < 0) return -1; + + if (i != object->data.array.nvalues - 1) { + virBufferAddLit(buf, ","); + VIR_JSON_PRETTY_NEWLINE; + } } - if (yajl_gen_array_close(g) != yajl_gen_status_ok) - return -1; + + virBufferAdjustIndent(buf, -2); + VIR_JSON_PRETTY_NEWLINE; + virBufferAddLit(buf, "]"); break; case VIR_JSON_TYPE_STRING: - if (yajl_gen_string(g, (unsigned char *)object->data.string, - strlen(object->data.string)) != yajl_gen_status_ok) - return -1; + virJSONValueToStringAddString(buf, object); break; case VIR_JSON_TYPE_NUMBER: - if (yajl_gen_number(g, object->data.number, - strlen(object->data.number)) != yajl_gen_status_ok) - return -1; + virBufferAdd(buf, object->data.number, -1); break; case VIR_JSON_TYPE_BOOLEAN: - if (yajl_gen_bool(g, object->data.boolean) != yajl_gen_status_ok) - return -1; + if (object->data.boolean) + virBufferAddLit(buf, "true"); + else + virBufferAddLit(buf, "false"); break; case VIR_JSON_TYPE_NULL: - if (yajl_gen_null(g) != yajl_gen_status_ok) - return -1; + virBufferAddLit(buf, "null"); break; default: + virReportEnumRangeError(virJSONType, object->type); return -1; } return 0; } +#undef VIR_JSON_PRETTY_NEWLINE + char * virJSONValueToString(virJSONValuePtr object, bool pretty) { - yajl_gen g; - const unsigned char *str; + virBuffer buf = VIR_BUFFER_INITIALIZER; char *ret = NULL; - yajl_size_t len; -# ifndef WITH_YAJL2 - yajl_gen_config conf = { pretty ? 1 : 0, pretty ? " " : " "}; -# endif VIR_DEBUG("object=%p", object); -# ifdef WITH_YAJL2 - g = yajl_gen_alloc(NULL); - if (g) { - yajl_gen_config(g, yajl_gen_beautify, pretty ? 1 : 0); - yajl_gen_config(g, yajl_gen_indent_string, pretty ? " " : " "); - yajl_gen_config(g, yajl_gen_validate_utf8, 1); - } -# else - g = yajl_gen_alloc(&conf, NULL); -# endif - if (!g) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to create JSON formatter")); - goto cleanup; - } - - if (virJSONValueToStringOne(object, g) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (yajl_gen_get_buf(g, &str, &len) != yajl_gen_status_ok) { - virReportOOMError(); - goto cleanup; + if (virJSONValueToStringOne(object, &buf, pretty) < 0 || + virBufferCheckError(&buf) < 0) { + virBufferFreeAndReset(&buf); + return NULL; } - ignore_value(VIR_STRDUP(ret, (const char *)str)); - - cleanup: - yajl_gen_free(g); - - VIR_DEBUG("result=%s", NULLSTR(ret)); - + ret = virBufferContentAndReset(&buf); + VIR_DEBUG("result=%s", ret); return ret; } -#else -virJSONValuePtr -virJSONValueFromString(const char *jsonstring ATTRIBUTE_UNUSED) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("No JSON parser implementation is available")); - return NULL; -} - - -char * -virJSONValueToString(virJSONValuePtr object ATTRIBUTE_UNUSED, - bool pretty ATTRIBUTE_UNUSED) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("No JSON parser implementation is available")); - return NULL; -} -#endif - - /** * virJSONStringReformat: * @jsonstr: string to reformat -- 2.14.3

2 2

[libvirt] [PATCH 0/9] json: Fix leak/double-free, clean up code and privatize virJSONValue
by Peter Krempa 03 Apr '18

03 Apr '18

Coverity was not wrong about the usage of 'a'/'A' modifiers for virJSONValueObjectAddVArgs as noted in [1]. Fix the possible leak/double-free, and add test to make sure it works as expected. This series also cleans up direct access to attributes of virJSONValue and in the end privatizes the implementation so that all users are forced to use accessors. Peter Krempa (9): util: json: Fix freeing of objects appended to virJSONValue tests: json: Validate that attribute values are properly stolen qemu: monitor: Use virJSONValueObjectKeysNumber in qemuMonitorJSONGetCPUModelExpansion qemu: agent: Avoid unnecessary JSON object type check json: Replace access to virJSONValue->type by virJSONValueGetType util: json: Add accessor for geting a VIR_JSON_TYPE_NUMBER as string util: qemu: Don't access virJSONValue members directly in virQEMUBuildCommandLineJSONRecurse qemu: monitor: Don't resist stealing 'actions' in qemuMonitorJSONTransaction util: json: Privatize struct _virJSONValue and sub-structs src/libvirt_private.syms | 1 + src/qemu/qemu_agent.c | 21 +++++----------- src/qemu/qemu_block.c | 22 +++++------------ src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 4 +-- src/qemu/qemu_monitor.c | 4 +-- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_monitor_json.c | 59 ++++++++++++++------------------------------ src/qemu/qemu_monitor_json.h | 2 +- src/util/virjson.c | 59 +++++++++++++++++++++++++++++++++++++++++--- src/util/virjson.h | 39 +---------------------------- src/util/virqemu.c | 13 ++++++---- tests/qemublocktest.c | 4 +-- tests/virjsontest.c | 47 +++++++++++++++++++++++++++++++++++ 14 files changed, 152 insertions(+), 127 deletions(-) -- 2.16.2

3 24