A v2 of this series: https://www.redhat.com/archives/libvir-list/2015-November/msg00165.html The patches for introducing virtlogd will be significantly simplified if we don't need to worry about parsing stderr during startup. This is required prior to QEMU 0.11 so that we can get the dyanamically allocated /dev/pty/NNN paths. The QEMU 0.12.1 release was shipped in RHEL-6 vintage distros and is already quite old, so seems like a fair target version to aim for as the minimum required. By dropping support for anything older than QEMU 0.12.0 we can remove the code for parsing stderr. The QEMU 0.12.0 release was quite special because it was the release where QEMU switched what I call its "modern" approach to configuration via -device. A major part of the complexity of the QEMU command line generator is due to need to support non-device syntax, so by mandating QEMU 0.12.0 we'll be able to kill off alot of conditional code. This series makes a start by assuming existance of 5 features, -vnc, 'info chardev', -no-reboot, -drive and -name, but there are a tonne more we can assume. This series drops 20 QEMU_CAPS_* flags, but there are still another ~15-20 that can be dropped, now we assume 0.12.0 or better. Changed in v2: - Fixed misc coverity reports from John - Rebased to use test .args files with new line wrapping for clarity - Split out some fixes into separate patches - Dropped a bunch more capabilities Daniel P. Berrange (17): qemu: mandate QEMU version 0.12.0 or newer qemu: remove all support for kQEMU qemu: assume -vnc arg always takes a ':' qemu: assume 'info chardev' is always available qemu: assume -no-reboot is always available qemu: handle USB bus in qemuAssignDeviceDiskAliasFixed() qemu: handle floppy disk bus when parsing command line argv qemu: assume -drive argument is always available qemu: assume -name is always available qemu: assume -uuid is always available qemu: really remove last traces of Xenner support qemu: assume vnet-hdr feature is always available qemu: assume support for all migration protocols except rdma qemu: assume -drive cache always uses v2 option names qemu: assume -drive format is always available qemu: assume -vga is always available qemu: assume various QEMU 0.10 features are always available src/qemu/qemu_capabilities.c | 145 +--- src/qemu/qemu_capabilities.h | 57 +- src/qemu/qemu_command.c | 748 +++++++-------------- src/qemu/qemu_command.h | 2 - src/qemu/qemu_hotplug.c | 15 +- src/qemu/qemu_migration.c | 77 +-- src/qemu/qemu_process.c | 204 +----- tests/qemuargv2xmltest.c | 7 - tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 14 - tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 14 - tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 14 - tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 14 - tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 14 - tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 14 - tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 14 - tests/qemucaps2xmldata/all_1.6.0-1.caps | 14 - tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps | 14 - tests/qemuhelpdata/kvm-74 | 111 --- tests/qemuhelpdata/kvm-83-rhel56 | 141 ---- tests/qemuhelpdata/kvm-86 | 170 ----- tests/qemuhelpdata/qemu-0.10.5 | 141 ---- tests/qemuhelpdata/qemu-0.9.1 | 102 --- tests/qemuhelpdata/qemu-kvm-0.10.5 | 155 ----- tests/qemuhelpdata/qemu-kvm-0.11.0-rc2 | 177 ----- tests/qemuhelptest.c | 276 -------- tests/qemuhotplugtest.c | 2 - .../qemuxml2argv-aarch64-aavmf-virtio-mmio.args | 4 +- .../qemuxml2argv-aarch64-cpu-passthrough.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-aarch64-gic.args | 2 + .../qemuxml2argv-aarch64-gicv3.args | 2 + .../qemuxml2argv-aarch64-kvm-32-on-64.args | 4 +- .../qemuxml2argv-aarch64-mmio-default-pci.args | 4 +- .../qemuxml2argv-aarch64-virt-default-nic.args | 2 + .../qemuxml2argv-aarch64-virt-virtio.args | 4 +- .../qemuxml2argv-aarch64-virtio-pci.args | 4 +- .../qemuxml2argv-arm-vexpressa9-basic.args | 4 +- .../qemuxml2argv-arm-vexpressa9-nodevs.args | 2 + .../qemuxml2argv-arm-vexpressa9-virtio.args | 4 +- .../qemuxml2argv-arm-virt-virtio.args | 4 +- .../qemuxml2argv-balloon-device-auto.args | 5 +- .../qemuxml2argv-balloon-device-period.args | 5 +- .../qemuxml2argv-balloon-device.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-bios.args | 5 +- .../qemuxml2argv-blkdeviotune-max.args | 9 +- .../qemuxml2argv-blkdeviotune.args | 9 +- .../qemuxml2argv-blkiotune-device.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 4 +- .../qemuxml2argv-boot-complex-bootindex.args | 16 +- .../qemuxml2argv-boot-complex.args | 16 +- .../qemuxml2argv-boot-floppy-q35.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 6 +- ...xml2argv-boot-menu-disable-drive-bootindex.args | 4 +- .../qemuxml2argv-boot-menu-disable-drive.args | 4 +- .../qemuxml2argv-boot-menu-disable.args | 4 +- ...qemuxml2argv-boot-menu-enable-with-timeout.args | 4 +- .../qemuxml2argv-boot-menu-enable.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 4 +- .../qemuxml2argv-boot-network.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-boot-order.args | 11 +- .../qemuxml2argvdata/qemuxml2argv-boot-strict.args | 16 +- .../qemuxml2argv-bootindex-floppy-q35.args | 4 +- .../qemuxml2argv-channel-guestfwd.args | 5 +- .../qemuxml2argv-channel-spicevmc-old.args | 6 +- .../qemuxml2argv-channel-spicevmc.args | 6 +- .../qemuxml2argv-channel-virtio-auto.args | 5 +- .../qemuxml2argv-channel-virtio-autoadd.args | 5 +- .../qemuxml2argv-channel-virtio-autoassign.args | 5 +- .../qemuxml2argv-channel-virtio-default.args | 5 +- .../qemuxml2argv-channel-virtio-state.args | 5 +- .../qemuxml2argv-channel-virtio-unix.args | 5 +- .../qemuxml2argv-channel-virtio.args | 5 +- .../qemuxml2argv-clock-catchup.args | 4 +- .../qemuxml2argv-clock-france.args | 4 +- .../qemuxml2argv-clock-hpet-off.args | 4 +- ...muxml2argv-clock-localtime-basis-localtime.args | 4 +- .../qemuxml2argv-clock-localtime.args | 4 +- .../qemuxml2argv-clock-timer-hyperv-rtc.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 10 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml | 2 +- .../qemuxml2argv-clock-variable.args | 4 +- .../qemuxml2argv-console-compat-auto.args | 4 +- .../qemuxml2argv-console-compat-chardev.args | 5 +- .../qemuxml2argv-console-compat.args | 4 +- .../qemuxml2argv-console-sclp.args | 4 +- .../qemuxml2argv-console-virtio-ccw.args | 4 +- .../qemuxml2argv-console-virtio-many.args | 5 +- .../qemuxml2argv-console-virtio-s390.args | 4 +- .../qemuxml2argv-console-virtio.args | 5 +- .../qemuxml2argv-controller-order.args | 8 +- .../qemuxml2argv-cpu-Haswell-noTSX.args | 2 + .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args | 2 + .../qemuxml2argv-cpu-Haswell2.args | 2 + .../qemuxml2argv-cpu-Haswell3.args | 2 + .../qemuxml2argv-cpu-eoi-disabled.args | 2 + .../qemuxml2argv-cpu-eoi-enabled.args | 2 + .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 2 + .../qemuxml2argv-cpu-exact2-nofallback.args | 2 + .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 2 + .../qemuxml2argv-cpu-fallback.args | 2 + .../qemuxml2argv-cpu-host-kvmclock.args | 2 + .../qemuxml2argv-cpu-host-model-fallback.args | 2 + .../qemuxml2argv-cpu-host-model-vendor.args | 2 + .../qemuxml2argv-cpu-host-model.args | 2 + ...qemuxml2argv-cpu-host-passthrough-features.args | 4 +- .../qemuxml2argv-cpu-host-passthrough.args | 2 + .../qemuxml2argv-cpu-kvmclock.args | 2 + .../qemuxml2argv-cpu-minimum1.args | 2 + .../qemuxml2argv-cpu-minimum2.args | 2 + .../qemuxml2argv-cpu-numa-disjoint.args | 2 + .../qemuxml2argv-cpu-numa-no-memory-element.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args | 2 + .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 2 + .../qemuxml2argv-cpu-topology1.args | 2 + .../qemuxml2argv-cpu-topology2.args | 2 + .../qemuxml2argv-cpu-topology3.args | 2 + .../qemuxml2argv-cputune-numatune.args | 2 + .../qemuxml2argv-cputune-zero-shares.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.args | 3 +- .../qemuxml2argv-default-kvm-host-arch.args | 2 + .../qemuxml2argv-default-qemu-host-arch.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 2 + .../qemuxml2argv-disk-blockio.args | 6 +- .../qemuxml2argv-disk-cdrom-empty.args | 6 +- .../qemuxml2argv-disk-cdrom-network-ftp.args | 4 +- .../qemuxml2argv-disk-cdrom-network-ftps.args | 4 +- .../qemuxml2argv-disk-cdrom-network-http.args | 4 +- .../qemuxml2argv-disk-cdrom-network-https.args | 4 +- .../qemuxml2argv-disk-cdrom-network-tftp.args | 4 +- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 5 +- .../qemuxml2argv-disk-cdrom-tray.args | 9 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 6 +- .../qemuxml2argv-disk-copy_on_read.args | 6 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 6 +- .../qemuxml2argv-disk-drive-boot-disk.args | 6 +- .../qemuxml2argv-disk-drive-cache-directsync.args | 2 + .../qemuxml2argv-disk-drive-cache-unsafe.args | 2 + .../qemuxml2argv-disk-drive-cache-v1-none.args | 21 - .../qemuxml2argv-disk-drive-cache-v1-none.xml | 35 - .../qemuxml2argv-disk-drive-cache-v1-wb.args | 21 - .../qemuxml2argv-disk-drive-cache-v1-wb.xml | 35 - .../qemuxml2argv-disk-drive-cache-v1-wt.args | 21 - .../qemuxml2argv-disk-drive-cache-v1-wt.xml | 35 - .../qemuxml2argv-disk-drive-cache-v2-none.args | 2 + .../qemuxml2argv-disk-drive-cache-v2-wb.args | 2 + .../qemuxml2argv-disk-drive-cache-v2-wt.args | 2 + .../qemuxml2argv-disk-drive-copy-on-read.args | 2 + .../qemuxml2argv-disk-drive-discard.args | 6 +- ...uxml2argv-disk-drive-error-policy-enospace.args | 4 +- .../qemuxml2argv-disk-drive-error-policy-stop.args | 4 +- ...gv-disk-drive-error-policy-wreport-rignore.args | 4 +- .../qemuxml2argv-disk-drive-fat.args | 2 + .../qemuxml2argv-disk-drive-fmt-qcow.args | 2 + .../qemuxml2argv-disk-drive-network-gluster.args | 2 + ...qemuxml2argv-disk-drive-network-iscsi-auth.args | 2 + .../qemuxml2argv-disk-drive-network-iscsi-lun.args | 2 + .../qemuxml2argv-disk-drive-network-iscsi.args | 2 + ...qemuxml2argv-disk-drive-network-nbd-export.args | 2 + ...ml2argv-disk-drive-network-nbd-ipv6-export.args | 2 + .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 2 + .../qemuxml2argv-disk-drive-network-nbd-unix.args | 2 + .../qemuxml2argv-disk-drive-network-nbd.args | 2 + .../qemuxml2argv-disk-drive-network-rbd-auth.args | 2 + ...muxml2argv-disk-drive-network-rbd-ceph-env.args | 4 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 2 + .../qemuxml2argv-disk-drive-network-rbd.args | 2 + .../qemuxml2argv-disk-drive-network-sheepdog.args | 2 + .../qemuxml2argv-disk-drive-no-boot.args | 9 +- .../qemuxml2argv-disk-drive-readonly-disk.args | 7 +- ...qemuxml2argv-disk-drive-readonly-no-device.args | 6 +- .../qemuxml2argv-disk-drive-shared.args | 4 +- .../qemuxml2argv-disk-floppy-pseries.args | 8 +- ...emuxml2argv-disk-floppy-tray-no-device-cap.args | 7 +- .../qemuxml2argv-disk-floppy-tray.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 8 +- .../qemuxml2argv-disk-geometry.args | 6 +- .../qemuxml2argv-disk-ide-drive-split.args | 6 +- .../qemuxml2argv-disk-ide-wwn.args | 4 +- .../qemuxml2argv-disk-ioeventfd.args | 7 +- .../qemuxml2argv-disk-ioeventfd.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-iscsi.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 10 +- .../qemuxml2argvdata/qemuxml2argv-disk-order.args | 11 +- .../qemuxml2argv-disk-sata-device.args | 4 +- .../qemuxml2argv-disk-scsi-device-auto.args | 6 +- .../qemuxml2argv-disk-scsi-device.args | 6 +- .../qemuxml2argv-disk-scsi-disk-split.args | 10 +- .../qemuxml2argv-disk-scsi-disk-vpd.args | 6 +- .../qemuxml2argv-disk-scsi-disk-wwn.args | 6 +- .../qemuxml2argv-disk-scsi-lun-passthrough.args | 6 +- .../qemuxml2argv-disk-scsi-megasas.args | 6 +- .../qemuxml2argv-disk-scsi-virtio-scsi.args | 6 +- .../qemuxml2argv-disk-scsi-vscsi.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-disk-serial.args | 4 +- .../qemuxml2argv-disk-snapshot.args | 2 + .../qemuxml2argv-disk-source-pool-mode.args | 4 +- .../qemuxml2argv-disk-source-pool.args | 6 +- .../qemuxml2argv-disk-usb-device-removable.args | 6 +- .../qemuxml2argv-disk-usb-device.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args | 4 +- .../qemuxml2argv-disk-virtio-ccw-many.args | 10 +- .../qemuxml2argv-disk-virtio-ccw.args | 6 +- .../qemuxml2argv-disk-virtio-s390.args | 4 +- .../qemuxml2argv-disk-virtio-scsi-ccw.args | 6 +- .../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args | 4 +- .../qemuxml2argv-disk-virtio-scsi-ioeventfd.args | 4 +- .../qemuxml2argv-disk-virtio-scsi-max_sectors.args | 4 +- .../qemuxml2argv-disk-virtio-scsi-num_queues.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 10 +- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 10 +- .../qemuxml2argv-encrypted-disk.args | 3 +- .../qemuxml2argv-eoi-disabled.args | 2 + .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 7 +- .../qemuxml2argv-fips-enabled.args | 4 +- .../qemuxml2argv-floppy-drive-fat.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 5 +- .../qemuxml2argv-graphics-sdl-fullscreen.args | 8 +- .../qemuxml2argv-graphics-sdl.args | 7 +- ...emuxml2argv-graphics-spice-agent-file-xfer.args | 5 +- .../qemuxml2argv-graphics-spice-agentmouse.args | 5 +- .../qemuxml2argv-graphics-spice-compression.args | 5 +- .../qemuxml2argv-graphics-spice-qxl-vga.args | 5 +- .../qemuxml2argv-graphics-spice-sasl.args | 5 +- .../qemuxml2argv-graphics-spice-timeout.args | 7 +- .../qemuxml2argv-graphics-spice-usb-redir.args | 2 + .../qemuxml2argv-graphics-spice.args | 5 +- .../qemuxml2argv-graphics-vnc-policy.args | 7 +- .../qemuxml2argv-graphics-vnc-sasl.args | 4 +- .../qemuxml2argv-graphics-vnc-socket.args | 7 +- .../qemuxml2argv-graphics-vnc-tls.args | 7 +- .../qemuxml2argv-graphics-vnc-websocket.args | 5 +- .../qemuxml2argv-graphics-vnc.args | 7 +- .../qemuxml2argv-hostdev-pci-address-device.args | 5 +- .../qemuxml2argv-hostdev-pci-address.args | 4 +- .../qemuxml2argv-hostdev-scsi-boot.args | 4 +- .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args | 4 +- .../qemuxml2argv-hostdev-scsi-lsi-iscsi.args | 4 +- .../qemuxml2argv-hostdev-scsi-lsi.args | 4 +- .../qemuxml2argv-hostdev-scsi-readonly.args | 4 +- ...emuxml2argv-hostdev-scsi-virtio-iscsi-auth.args | 4 +- .../qemuxml2argv-hostdev-scsi-virtio-iscsi.args | 4 +- .../qemuxml2argv-hostdev-scsi-virtio-scsi.args | 4 +- ...muxml2argv-hostdev-usb-address-device-boot.args | 5 +- .../qemuxml2argv-hostdev-usb-address-device.args | 5 +- .../qemuxml2argv-hostdev-usb-address.args | 4 +- .../qemuxml2argv-hostdev-vfio-multidomain.args | 5 +- .../qemuxml2argv-hostdev-vfio.args | 5 +- .../qemuxml2argv-hotplug-base.args | 2 + .../qemuxml2argv-hugepages-numa.args | 7 +- .../qemuxml2argv-hugepages-pages.args | 4 +- .../qemuxml2argv-hugepages-pages2.args | 4 +- .../qemuxml2argv-hugepages-pages3.args | 4 +- .../qemuxml2argv-hugepages-pages5.args | 4 +- .../qemuxml2argv-hugepages-pages6.args | 4 +- .../qemuxml2argv-hugepages-shared.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 2 + .../qemuxml2argv-input-usbmouse-addr.args | 5 +- .../qemuxml2argv-input-usbmouse.args | 4 +- .../qemuxml2argv-input-usbtablet.args | 4 +- .../qemuxml2argv-iothreads-disk-virtio-ccw.args | 6 +- .../qemuxml2argv-iothreads-disk.args | 10 +- .../qemuxml2argv-iothreads-ids-partial.args | 4 +- .../qemuxml2argv-iothreads-ids.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-iothreads.args | 4 +- .../qemuxml2argv-kvm-features-off.args | 2 + .../qemuxml2argv-kvm-features.args | 2 + .../qemuxml2argv-kvm-pit-delay.args | 4 +- .../qemuxml2argv-kvm-pit-device.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 2 + .../qemuxml2argv-kvmclock+eoi-disabled.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-lease.args | 4 +- .../qemuxml2argv-machine-aeskeywrap-off-argv.args | 5 +- .../qemuxml2argv-machine-aeskeywrap-off-cap.args | 4 +- .../qemuxml2argv-machine-aeskeywrap-off-caps.args | 4 +- .../qemuxml2argv-machine-aeskeywrap-on-argv.args | 5 +- .../qemuxml2argv-machine-aeskeywrap-on-cap.args | 4 +- .../qemuxml2argv-machine-aeskeywrap-on-caps.args | 4 +- .../qemuxml2argv-machine-aliases1.args | 4 +- .../qemuxml2argv-machine-aliases2.args | 4 +- .../qemuxml2argv-machine-core-off.args | 4 +- .../qemuxml2argv-machine-core-on.args | 4 +- .../qemuxml2argv-machine-deakeywrap-off-argv.args | 5 +- .../qemuxml2argv-machine-deakeywrap-off-cap.args | 4 +- .../qemuxml2argv-machine-deakeywrap-off-caps.args | 4 +- .../qemuxml2argv-machine-deakeywrap-on-argv.args | 5 +- .../qemuxml2argv-machine-deakeywrap-on-cap.args | 4 +- .../qemuxml2argv-machine-deakeywrap-on-caps.args | 4 +- .../qemuxml2argv-machine-keywrap-none-argv.args | 5 +- .../qemuxml2argv-machine-keywrap-none-caps.args | 4 +- .../qemuxml2argv-machine-keywrap-none.args | 4 +- .../qemuxml2argv-machine-usb-opt.args | 4 +- .../qemuxml2argv-machine-vmport-opt.args | 4 +- .../qemuxml2argv-memory-hotplug-dimm-addr.args | 5 +- .../qemuxml2argv-memory-hotplug-dimm.args | 5 +- .../qemuxml2argv-memory-hotplug.args | 4 +- .../qemuxml2argv-memtune-unlimited.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-memtune.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-metadata.args | 3 +- .../qemuxml2argv-migrate-numa-unaligned.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 4 +- .../qemuxml2argv-minimal-msg-timestamp.args | 3 +- .../qemuxml2argv-minimal-s390.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-minimal.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 4 +- .../qemuxml2argv-misc-disable-s3.args | 4 +- .../qemuxml2argv-misc-disable-suspends.args | 4 +- .../qemuxml2argv-misc-enable-s4.args | 4 +- .../qemuxml2argv-misc-no-reboot.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 2 + .../qemuxml2argv-mlock-unsupported.args | 2 + .../qemuxml2argv-monitor-json.args | 5 +- .../qemuxml2argv-multifunction-pci-device.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-net-client.args | 8 +- .../qemuxml2argv-net-eth-ifname.args | 8 +- .../qemuxml2argv-net-eth-names.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 8 +- .../qemuxml2argv-net-hostdev-multidomain.args | 5 +- .../qemuxml2argv-net-hostdev-vfio-multidomain.args | 5 +- .../qemuxml2argv-net-hostdev-vfio.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-net-hostdev.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-net-server.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-net-udp.args | 9 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 8 +- .../qemuxml2argv-net-vhostuser-multiq.args | 5 +- .../qemuxml2argv-net-vhostuser.args | 5 +- .../qemuxml2argv-net-virtio-ccw.args | 2 + .../qemuxml2argv-net-virtio-device.args | 5 +- .../qemuxml2argv-net-virtio-disable-offloads.args | 5 +- .../qemuxml2argv-net-virtio-netdev.args | 5 +- .../qemuxml2argv-net-virtio-s390.args | 2 + .../qemuxml2argvdata/qemuxml2argv-net-virtio.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-no-shutdown.args | 5 +- .../qemuxml2argv-nographics-vga.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-nographics.args | 4 +- .../qemuxml2argv-nosharepages.args | 4 +- ...qemuxml2argv-numad-auto-memory-vcpu-cpuset.args | 4 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 4 +- ...muxml2argv-numad-auto-vcpu-static-numatune.args | 4 +- ...qemuxml2argv-numad-static-memory-auto-vcpu.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-numad.args | 4 +- ...qemuxml2argv-numatune-auto-nodeset-invalid.args | 4 +- .../qemuxml2argv-numatune-auto-prefer.args | 2 + .../qemuxml2argv-numatune-memnode-no-memory.args | 2 + .../qemuxml2argv-numatune-memnode.args | 2 + .../qemuxml2argv-numatune-memory.args | 4 +- .../qemuxml2argv-panic-no-address.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-panic.args | 5 +- .../qemuxml2argv-parallel-parport-chardev.args | 5 +- .../qemuxml2argv-parallel-tcp-chardev.args | 5 +- .../qemuxml2argv-parallel-tcp.args | 4 +- .../qemuxml2argv-pci-autoadd-addr.args | 6 +- .../qemuxml2argv-pci-autoadd-idx.args | 6 +- .../qemuxml2argv-pci-bridge-many-disks.args | 317 ++++++--- tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 89 ++- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args | 5 +- .../qemuxml2argv-pci-serial-dev-chardev.args | 5 +- .../qemuxml2argv-pcie-root-port.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 2 + .../qemuxml2argv-pcie-switch-downstream-port.args | 4 +- .../qemuxml2argv-pcie-switch-upstream-port.args | 4 +- .../qemuxml2argv-pcihole64-none.args | 2 + .../qemuxml2argv-pcihole64-q35.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args | 2 + .../qemuxml2argv-pmu-feature-off.args | 2 + .../qemuxml2argvdata/qemuxml2argv-pmu-feature.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 2 + .../qemuxml2argv-ppce500-serial.args | 2 + .../qemuxml2argv-ppce500-serial.xml | 1 + .../qemuxml2argv-pseries-basic.args | 2 + .../qemuxml2argv-pseries-cpu-compat.args | 2 + .../qemuxml2argv-pseries-cpu-compat.xml | 1 + .../qemuxml2argv-pseries-cpu-exact.args | 2 + .../qemuxml2argv-pseries-cpu-le.args | 2 + .../qemuxml2argv-pseries-disk.args | 1 + .../qemuxml2argv-pseries-nvram.args | 2 + .../qemuxml2argv-pseries-panic-missing.args | 2 + .../qemuxml2argv-pseries-panic-no-address.args | 2 + .../qemuxml2argv-pseries-usb-default.args | 2 + .../qemuxml2argv-pseries-usb-kbd.args | 2 + .../qemuxml2argv-pseries-usb-multi.args | 2 + .../qemuxml2argv-pseries-vio-user-assigned.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 4 +- .../qemuxml2argv-pv-spinlock-disabled.args | 2 + .../qemuxml2argv-pv-spinlock-enabled.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-q35.args | 4 +- .../qemuxml2argv-qemu-ns-no-env.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 4 +- .../qemuxml2argv-reboot-timeout-disabled.args | 2 + .../qemuxml2argv-reboot-timeout-enabled.args | 2 + .../qemuxml2argvdata/qemuxml2argv-restore-v1.args | 21 - tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml | 28 - .../qemuxml2argv-restore-v2-fd.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-restore-v2.args | 4 +- ...muxml2argv-s390-allow-bogus-usb-controller.args | 4 +- ...emuxml2argv-s390-allow-bogus-usb-controller.xml | 1 + .../qemuxml2argv-s390-allow-bogus-usb-none.args | 4 +- .../qemuxml2argv-s390-allow-bogus-usb-none.xml | 1 + .../qemuxml2argv-seclabel-dac-none.args | 3 +- .../qemuxml2argv-seclabel-dynamic-baselabel.args | 3 +- .../qemuxml2argv-seclabel-dynamic-labelskip.args | 3 +- .../qemuxml2argv-seclabel-dynamic-override.args | 5 +- .../qemuxml2argv-seclabel-dynamic-relabel.args | 3 +- .../qemuxml2argv-seclabel-dynamic.args | 3 +- .../qemuxml2argv-seclabel-none.args | 3 +- .../qemuxml2argv-seclabel-static-labelskip.args | 3 +- .../qemuxml2argv-seclabel-static-relabel.args | 3 +- .../qemuxml2argv-seclabel-static.args | 3 +- .../qemuxml2argv-serial-dev-chardev-iobase.args | 5 +- .../qemuxml2argv-serial-dev-chardev.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-serial-dev.args | 4 +- .../qemuxml2argv-serial-file-chardev.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.args | 4 +- .../qemuxml2argv-serial-many-chardev.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.args | 4 +- .../qemuxml2argv-serial-pty-chardev.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-serial-pty.args | 4 +- .../qemuxml2argv-serial-spiceport-nospice.args | 3 +- .../qemuxml2argv-serial-spiceport.args | 5 +- .../qemuxml2argv-serial-tcp-chardev.args | 5 +- .../qemuxml2argv-serial-tcp-telnet-chardev.args | 5 +- .../qemuxml2argv-serial-tcp-telnet.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 4 +- .../qemuxml2argv-serial-udp-chardev.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-serial-udp.args | 4 +- .../qemuxml2argv-serial-unix-chardev.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.args | 4 +- .../qemuxml2argv-serial-vc-chardev.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 2 + .../qemuxml2argv-smartcard-controller.args | 2 + .../qemuxml2argv-smartcard-host-certificates.args | 2 + .../qemuxml2argv-smartcard-host.args | 2 + ...emuxml2argv-smartcard-passthrough-spicevmc.args | 2 + .../qemuxml2argv-smartcard-passthrough-tcp.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-smp.args | 4 +- .../qemuxml2argv-sound-device.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-sound.args | 4 +- .../qemuxml2argv-tpm-passthrough.args | 2 + .../qemuxml2argv-usb-controller.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args | 2 + .../qemuxml2argv-usb-ich9-companion.args | 2 + .../qemuxml2argv-usb-ich9-ehci-addr.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-usb-none.args | 2 + .../qemuxml2argv-usb-piix3-controller.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args | 2 + .../qemuxml2argv-usb-redir-boot.args | 2 + .../qemuxml2argv-usb-redir-filter-version.args | 2 + .../qemuxml2argv-usb-redir-filter.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args | 2 + .../qemuxml2argv-video-device-pciaddr-default.args | 6 +- .../qemuxml2argv-video-qxl-device-vgamem.args | 6 +- .../qemuxml2argv-video-qxl-device.args | 6 +- .../qemuxml2argv-video-qxl-nodevice.args | 5 +- .../qemuxml2argv-video-qxl-sec-device-vgamem.args | 6 +- .../qemuxml2argv-video-qxl-sec-device.args | 6 +- .../qemuxml2argv-video-vga-device-vgamem.args | 6 +- .../qemuxml2argv-video-vga-device.args | 6 +- .../qemuxml2argv-video-vga-nodevice.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-virtio-lun.args | 6 +- .../qemuxml2argv-virtio-rng-ccw.args | 4 +- .../qemuxml2argv-virtio-rng-default.args | 2 + .../qemuxml2argv-virtio-rng-egd.args | 2 + .../qemuxml2argv-virtio-rng-multiple.args | 2 + .../qemuxml2argv-virtio-rng-random.args | 2 + .../qemuxml2argv-watchdog-device.args | 5 +- .../qemuxml2argv-watchdog-diag288.args | 4 +- .../qemuxml2argv-watchdog-dump.args | 4 +- .../qemuxml2argv-watchdog-injectnmi.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.args | 4 +- tests/qemuxml2argvtest.c | 498 ++++++-------- tests/qemuxml2xmltest.c | 8 - .../qemuxmlns-qemu-ns-commandline-ns0.args | 4 +- .../qemuxmlns-qemu-ns-commandline-ns1.args | 4 +- .../qemuxmlns-qemu-ns-commandline.args | 4 +- .../qemuxmlns-qemu-ns-domain-commandline-ns0.args | 4 +- .../qemuxmlns-qemu-ns-domain-commandline.args | 4 +- .../qemuxmlns-qemu-ns-domain-ns0.args | 4 +- tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args | 4 +- tests/qemuxmlnstest.c | 2 - 491 files changed, 2258 insertions(+), 3395 deletions(-) delete mode 100644 tests/qemuhelpdata/kvm-74 delete mode 100644 tests/qemuhelpdata/kvm-83-rhel56 delete mode 100644 tests/qemuhelpdata/kvm-86 delete mode 100644 tests/qemuhelpdata/qemu-0.10.5 delete mode 100644 tests/qemuhelpdata/qemu-0.9.1 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.10.5 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.11.0-rc2 delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml -- 2.5.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list