9:23 a.m.
This series converts all outstanding test cases to use real
capabilities.
In the process few cases of pointless tests or features which are
supported by every version of qemu were identified and addressed.
To simplify the bulk of the conversion I've opted to simply set the most
common capabilities in DO_TEST and DO_TEST_NOCAPS in addition to what
the test asked for. This is done in a handful of patches and allows then
a bulk conversion of many tests with no changes in the output files.
I've payed special attention to CPU tests were I've ensured that they
are semantically testing what they were before.
Peter Krempa (51):
qemu: Always assume support for QEMU_CAPS_PIIX_DISABLE_S* and
QEMU_CAPS_ICH9_DISABLE_S*
qemu: capabilities: Retire QEMU_CAPS_ICH9_DISABLE_S* and
QEMU_CAPS_ICH9_DISABLE_S* capabilities
qemu: capabilities: Preserve location of the default machine type when
stripping aliases for tests
qemuxml2argvtest: Clean up host CPU if overriden
qemuxml2argvtest: testAddCPUModels: Remove non-x86_64 fake cpu models
qemuxml2argvtest: Drop 'monitor-json' case
qemu: Always assume support for QEMU_CAPS_CPU_CACHE
qemu: capabilities: Retire QEMU_CAPS_CPU_CACHE
qemu: Always assume support for QEMU_CAPS_DEVICE_VFIO_PCI
qemu_capabilities: Retire QEMU_CAPS_DEVICE_VFIO_PCI
qemuxml2argvtest: Add missing versioned test cases for
'cpu-host-model'
qemuxml2argvtest: Remove old chardev tests
qemuxml2argvtest: Simplify invocation of GIC tests
qemuxml2argvtest: Remove duplicated test invocations
qemuxml2argvtest: Remove fake-caps invocations of tests which also
real caps version
qemuxml2argvtest: Use proper version in negative
'virtio-options-memballoon-freepage-reporting' case
qemuxml2argvtest: Use real caps for 'cpu-host-model-fallback' test
case
qemuxml2argvtest: Use real caps for 'cpu-host-model-nofallback' test
case
qemuxml2argvtest: Remove FLAG_SKIP_LEGACY_CPUS
qemuxml2argvtest: Enable JSON syntax for -device, -object, and -netdev
for all fake-caps tests
virQEMUCapsAddCPUDefinitions: Fill in cpu type in data and node it's
used only in tests
qemuxml2argvtest: Modernize negative testing for hugepages
qemuxml2argvtest: Modernize 'numatune' tests
testutilsqemu: Always populate default ram id, default cpu, ACPI
support for fake machines
qemuxml2argvtest: Enable 'seccomp' sandbox in all fake caps tests
qemuxml2argvtest: Consolidate tests for usb controllers
qemuxml2argvtest: Add tests for auto-added USB controllers
qemuxml2argvtest: Improve default usb controller testing
qemuxml2argvtest: Consolidate testing of 'xhci' controllers
qemuxml2argvtest: Assume QEMU_CAPS_PIIX3_USB_UHCI for all fake-caps
tests
qemuxml2argvtest: Assume QEMU_CAPS_DEVICE_PCIE_ROOT_PORT for fake-caps
tests
qemuxml2argvtest: Assume QEMU_CAPS_CPU_MIGRATABLE and
QEMU_CAPS_SMP_DIES for fake-caps tests
qemuxml2argvtest: Assume QEMU_CAPS_USB_HOST_HOSTDEVICE and
QEMU_CAPS_DEVICE_QEMU_XHCI for fake-caps tests
qemuxml2argvtest: Assume QEMU_CAPS_QXL_VRAM64,
QEMU_CAPS_(QXL|VGA)_VGAMEM for fake-caps tests
qemuxml2argvtest: Properly modernize 'clock-hpet-off' test case
qemuxml2argvtest: Modernize migration/restore tests
qemuxml2argvtest: Consolidate and modernize CPU topology testing
qemuxml2argvtest: Modernize test cases using 'host-model' CPU
qemuxml2argvtest: Modernize 'cpu-Haswell' test cases
qemuxml2argvtest: Modernize 'cpu-minimum' cases
qemuxml2argvtest: Modernize 'cpu-strict' case
qemuxml2argvtest: Modernize 'cpu-(no)fallback' test
qemuxml2argvtest: Modernize 'cpu-exact' cases
qemuxml2argvtest: Modernize rest of the test cases
testutilsqemu: Drop fake machine capability data for 'x86_64'
qemustatusxml2xmltest: Remove capabilities infrastructure
testutilsqemu: Drop infrastructure for fake-caps testing
testutilsqemu: Unexport 'testQemuCapsInit'
qemu: capabilities: Unexport 'virQEMUCapsAddMachine'
qemuxml2argvtest: Remove cpu model faking for fake-caps tests
qemu: capabilities: Remove 'virQEMUCapsAddCPUDefinitions'
src/qemu/qemu_capabilities.c | 81 +-
src/qemu/qemu_capabilities.h | 17 +-
src/qemu/qemu_capspriv.h | 14 -
src/qemu/qemu_command.c | 46 +-
src/qemu/qemu_domain.c | 11 +-
src/qemu/qemu_validate.c | 43 +-
.../caps_4.2.0_aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 1 -
.../qemucapabilitiesdata/caps_4.2.0_s390x.xml | 1 -
.../caps_4.2.0_x86_64.xml | 6 -
.../caps_5.0.0_aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 1 -
.../caps_5.0.0_riscv64.xml | 1 -
.../caps_5.0.0_x86_64.xml | 6 -
.../caps_5.1.0_x86_64.xml | 6 -
.../caps_5.2.0_aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 1 -
.../caps_5.2.0_riscv64.xml | 1 -
.../qemucapabilitiesdata/caps_5.2.0_s390x.xml | 1 -
.../caps_5.2.0_x86_64.xml | 6 -
.../caps_6.0.0_aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_6.0.0_s390x.xml | 1 -
.../caps_6.0.0_x86_64.xml | 6 -
.../caps_6.1.0_x86_64.xml | 6 -
.../caps_6.2.0_aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 3 -
.../caps_6.2.0_x86_64.xml | 6 -
.../caps_7.0.0_aarch64+hvf.xml | 1 -
.../caps_7.0.0_aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 3 -
.../caps_7.0.0_x86_64.xml | 6 -
.../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 3 -
.../caps_7.1.0_x86_64.xml | 6 -
tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 3 -
.../caps_7.2.0_x86_64+hvf.xml | 6 -
.../caps_7.2.0_x86_64.xml | 6 -
.../caps_8.0.0_riscv64.xml | 1 -
.../caps_8.0.0_x86_64.xml | 6 -
.../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 -
.../caps_8.1.0_x86_64.xml | 6 -
tests/qemustatusxml2xmltest.c | 17 +-
...fx-ide-address-conflict.x86_64-latest.err} | 0
...err => 440fx-wrong-root.x86_64-latest.err} | 0
...ch64-gic-default-both.aarch64-latest.args} | 0
...arch64-gic-default-v2.aarch64-latest.args} | 0
...arch64-gic-default-v3.aarch64-latest.args} | 0
...s => aarch64-gic-host.aarch64-latest.args} | 0
...aarch64-gic-none-both.aarch64-latest.args} | 0
... aarch64-gic-none-tcg.aarch64-latest.args} | 0
...> aarch64-gic-none-v2.aarch64-latest.args} | 0
...> aarch64-gic-none-v3.aarch64-latest.args} | 0
...rgs => aarch64-gic-v2.aarch64-latest.args} | 0
...rgs => aarch64-gic-v3.aarch64-latest.args} | 0
...off.args => acpi-table.x86_64-latest.args} | 14 +-
tests/qemuxml2argvdata/autoindex.args | 63 -
.../autoindex.x86_64-latest.args | 65 +
.../balloon-device-auto.x86_64-latest.args | 36 +
...loon-device-deflate-off.x86_64-latest.args | 36 +
.../balloon-device-deflate.x86_64-latest.args | 36 +
.../balloon-device-period.x86_64-latest.args | 36 +
.../balloon-device.x86_64-latest.args | 36 +
tests/qemuxml2argvdata/blkiotune-device.args | 34 -
.../blkiotune-device.x86_64-latest.args | 36 +
tests/qemuxml2argvdata/blkiotune.args | 34 -
.../blkiotune.x86_64-latest.args | 36 +
...gs => channel-guestfwd.x86_64-latest.args} | 16 +-
...gs => channel-spicevmc.x86_64-latest.args} | 20 +-
.../qemuxml2argvdata/channel-virtio-auto.args | 49 -
.../channel-virtio-auto.x86_64-latest.args | 51 +
.../channel-virtio-autoadd.args | 48 -
.../channel-virtio-autoadd.x86_64-latest.args | 50 +
.../channel-virtio-autoassign.args | 48 -
...annel-virtio-autoassign.x86_64-latest.args | 50 +
.../channel-virtio-default.args | 41 -
.../channel-virtio-default.x86_64-latest.args | 43 +
.../channel-virtio-state.x86_64-latest.args | 43 +
...=> channel-virtio-unix.x86_64-latest.args} | 24 +-
tests/qemuxml2argvdata/channel-virtio.args | 37 -
...args => channel-virtio.x86_64-latest.args} | 22 +-
...econnect-generated-path.x86_64-latest.err} | 0
...connect-invalid-timeout.x86_64-latest.err} | 0
tests/qemuxml2argvdata/chardev-reconnect.args | 44 -
.../chardev-reconnect.x86_64-latest.args | 46 +
....args => clock-catchup.x86_64-latest.args} | 14 +-
...e.args => clock-france.x86_64-latest.args} | 14 +-
....args => clock-hpet-off.x86_64-7.2.0.args} | 14 +-
.../clock-hpet-off.x86_64-latest.args | 37 +
...altime-basis-localtime.x86_64-latest.args} | 14 +-
...rgs => clock-localtime.x86_64-latest.args} | 14 +-
...clock-timer-hyperv-rtc.x86_64-latest.args} | 11 +-
...-off.args => clock-utc.x86_64-latest.args} | 13 +-
...args => clock-variable.x86_64-latest.args} | 14 +-
.../qemuxml2argvdata/console-compat-auto.args | 36 -
.../console-compat-chardev.args | 36 -
tests/qemuxml2argvdata/console-compat.args | 35 -
...=> console-virtio-many.x86_64-latest.args} | 24 +-
...args => console-virtio.x86_64-latest.args} | 18 +-
tests/qemuxml2argvdata/controller-order.args | 52 -
.../controller-order.x86_64-latest.args | 55 +
...s => cpu-Haswell-noTSX.x86_64-latest.args} | 11 +-
...ll.args => cpu-Haswell.x86_64-latest.args} | 11 +-
...2.args => cpu-Haswell2.x86_64-latest.args} | 11 +-
...3.args => cpu-Haswell3.x86_64-latest.args} | 11 +-
.../cpu-cache-disable.x86_64-latest.args | 33 +
tests/qemuxml2argvdata/cpu-cache-disable2.xml | 20 -
.../cpu-cache-disable3.x86_64-latest.args | 33 +
...=> cpu-cache-emulate-l2.x86_64-latest.err} | 0
...> cpu-cache-emulate-l3.x86_64-latest.args} | 13 +-
...pu-cache-passthrough-l3.x86_64-latest.err} | 0
.../cpu-cache-passthrough.args | 32 -
... cpu-cache-passthrough.x86_64-latest.args} | 13 +-
.../cpu-cache-passthrough2.args | 32 -
.../cpu-cache-passthrough2.xml | 20 -
... cpu-cache-passthrough3.x86_64-latest.err} | 0
.../cpu-check-default-none.args | 32 -
.../cpu-check-default-none.x86_64-latest.args | 33 +
...pu-check-default-none2.x86_64-latest.args} | 11 +-
.../cpu-check-default-partial.args | 32 -
...u-check-default-partial.x86_64-latest.args | 33 +
...check-default-partial2.x86_64-latest.args} | 11 +-
tests/qemuxml2argvdata/cpu-check-full.args | 1 -
.../cpu-check-full.x86_64-latest.args | 1 +
...args => cpu-check-none.x86_64-latest.args} | 11 +-
tests/qemuxml2argvdata/cpu-check-partial.args | 1 -
.../cpu-check-partial.x86_64-latest.args | 1 +
...ct1.args => cpu-exact1.x86_64-latest.args} | 11 +-
... cpu-exact2-nofallback.x86_64-latest.args} | 11 +-
...ct2.args => cpu-exact2.x86_64-latest.args} | 11 +-
tests/qemuxml2argvdata/cpu-fallback.args | 32 -
...er.args => cpu-fallback.x86_64-5.2.0.args} | 9 +-
.../cpu-fallback.x86_64-8.0.0.args | 33 +
tests/qemuxml2argvdata/cpu-fallback.xml | 15 +-
tests/qemuxml2argvdata/cpu-host-kvmclock.args | 32 -
.../cpu-host-kvmclock.x86_64-latest.args | 33 +
... => cpu-host-model-cmt.x86_64-latest.args} | 11 +-
...cpu-host-model-fallback.x86_64-4.2.0.args} | 7 +-
...cpu-host-model-fallback.x86_64-5.0.0.args} | 7 +-
.../cpu-host-model-fallback.x86_64-5.1.0.args | 33 +
.../cpu-host-model-fallback.x86_64-5.2.0.args | 34 +
.../cpu-host-model-fallback.x86_64-6.0.0.args | 34 +
.../cpu-host-model-fallback.x86_64-6.1.0.args | 34 +
.../cpu-host-model-fallback.x86_64-6.2.0.args | 34 +
.../cpu-host-model-fallback.x86_64-7.0.0.args | 34 +
.../cpu-host-model-fallback.x86_64-7.1.0.args | 34 +
.../cpu-host-model-fallback.x86_64-7.2.0.args | 34 +
.../cpu-host-model-fallback.x86_64-8.0.0.args | 33 +
...cpu-host-model-fallback.x86_64-latest.args | 33 +
.../cpu-host-model-nofallback.err | 1 -
...pu-host-model-nofallback.x86_64-4.2.0.args | 33 +
...pu-host-model-nofallback.x86_64-5.0.0.args | 33 +
...pu-host-model-nofallback.x86_64-5.1.0.args | 33 +
...pu-host-model-nofallback.x86_64-5.2.0.args | 34 +
...pu-host-model-nofallback.x86_64-6.0.0.args | 34 +
...pu-host-model-nofallback.x86_64-6.1.0.args | 34 +
...pu-host-model-nofallback.x86_64-6.2.0.args | 34 +
...pu-host-model-nofallback.x86_64-7.0.0.args | 34 +
...pu-host-model-nofallback.x86_64-7.1.0.args | 34 +
...pu-host-model-nofallback.x86_64-7.2.0.args | 34 +
...pu-host-model-nofallback.x86_64-8.0.0.args | 33 +
...u-host-model-nofallback.x86_64-latest.args | 33 +
.../cpu-host-model-vendor.x86_64-latest.args | 33 +
tests/qemuxml2argvdata/cpu-host-model.args | 40 -
.../cpu-host-model.x86_64-6.2.0.args | 39 +
.../cpu-host-model.x86_64-7.0.0.args | 39 +
.../cpu-host-model.x86_64-7.1.0.args | 39 +
.../cpu-host-model.x86_64-7.2.0.args | 39 +
.../cpu-host-model.x86_64-8.0.0.args | 38 +
...t-passthrough-features.x86_64-latest.args} | 14 +-
.../cpu-host-passthrough.args | 32 -
.../cpu-host-passthrough.x86_64-latest.args | 33 +
...k.args => cpu-kvmclock.x86_64-latest.args} | 11 +-
tests/qemuxml2argvdata/cpu-minimum1.args | 32 -
.../cpu-minimum1.x86_64-latest.args | 33 +
tests/qemuxml2argvdata/cpu-minimum2.args | 32 -
.../cpu-minimum2.x86_64-latest.args | 33 +
...pu-no-removed-features.x86_64-latest.args} | 11 +-
tests/qemuxml2argvdata/cpu-nofallback.err | 1 -
.../cpu-nofallback.x86_64-5.2.0.err | 1 +
.../cpu-nofallback.x86_64-8.0.0.args | 33 +
tests/qemuxml2argvdata/cpu-nofallback.xml | 15 +-
tests/qemuxml2argvdata/cpu-numa-disjoint.args | 33 -
.../cpu-numa-disjoint.x86_64-latest.args | 36 +
.../cpu-numa-memshared.x86_64-latest.args | 36 +
.../cpu-numa-no-memory-element.args | 33 -
...numa-no-memory-element.x86_64-latest.args} | 17 +-
tests/qemuxml2argvdata/cpu-numa1.args | 33 -
.../cpu-numa1.x86_64-latest.args | 36 +
tests/qemuxml2argvdata/cpu-numa2.args | 33 -
.../cpu-numa2.x86_64-latest.args | 36 +
...-numa3.err => cpu-numa3.x86_64-latest.err} | 0
.../cpu-phys-bits-emulate.args | 32 -
... cpu-phys-bits-emulate.x86_64-latest.args} | 13 +-
.../cpu-phys-bits-emulate2.args | 32 -
.../cpu-phys-bits-emulate2.x86_64-latest.args | 33 +
.../cpu-phys-bits-passthrough.args | 32 -
...-phys-bits-passthrough.x86_64-latest.args} | 13 +-
...-phys-bits-passthrough2.x86_64-latest.err} | 0
...u-qemu-host-passthrough.x86_64-latest.err} | 0
tests/qemuxml2argvdata/cpu-strict1.args | 32 -
.../cpu-strict1.x86_64-latest.args | 33 +
tests/qemuxml2argvdata/cpu-strict1.xml | 12 +-
tests/qemuxml2argvdata/cpu-topology1.args | 31 -
....args => cpu-topology1.x86_64-latest.args} | 17 +-
tests/qemuxml2argvdata/cpu-topology1.xml | 4 +-
tests/qemuxml2argvdata/cpu-topology2.args | 32 -
.../cpu-topology2.x86_64-latest.args | 33 +
tests/qemuxml2argvdata/cpu-topology2.xml | 5 +-
tests/qemuxml2argvdata/cpu-topology3.args | 31 -
.../cpu-topology3.x86_64-latest.args | 33 +
tests/qemuxml2argvdata/cpu-topology3.xml | 2 +-
.../cpu-topology4.x86_64-latest.args | 33 +
.../{monitor-json.xml => cpu-topology4.xml} | 18 +-
...s => cpu-tsc-frequency.x86_64-latest.args} | 11 +-
... default-kvm-host-arch.x86_64-latest.args} | 12 +-
...default-qemu-host-arch.x86_64-latest.args} | 12 +-
.../graphics-egl-headless.args | 33 -
...raphics-sdl-fullscreen.x86_64-latest.args} | 14 +-
...l.args => graphics-sdl.x86_64-latest.args} | 14 +-
...isplay-missing-graphics.x86_64-latest.err} | 0
... hostdev-mdev-duplicate.x86_64-latest.err} | 0
...-invalid-target-address.x86_64-latest.err} | 0
...ostdev-mdev-precreated.x86_64-latest.args} | 12 +-
...dev-src-address-invalid.x86_64-latest.err} | 0
.../hostdev-pci-address-unassigned.args | 34 -
...-pci-address-unassigned.x86_64-latest.args | 36 +
...> hostdev-pci-duplicate.x86_64-latest.err} | 0
.../hostdev-pci-multifunction.args | 38 -
...stdev-pci-multifunction.x86_64-latest.args | 40 +
... hostdev-scsi-duplicate.x86_64-latest.err} | 0
...ev-scsi-vhost-scsi-pci.x86_64-latest.args} | 22 +-
...> hostdev-usb-duplicate.x86_64-latest.err} | 0
...stdev-vfio-multidomain.x86_64-latest.args} | 17 +-
...ev-vfio-zpci-wrong-arch.x86_64-latest.err} | 0
tests/qemuxml2argvdata/hostdev-vfio.args | 35 -
...n.args => hostdev-vfio.x86_64-latest.args} | 16 +-
...e.args => hotplug-base.x86_64-latest.args} | 13 +-
...s-default-1G-nodeset-2M.x86_64-latest.err} | 0
...pages-memaccess-invalid.x86_64-latest.err} | 0
... => hugepages-memaccess3.x86_64-5.1.0.err} | 0
.../qemuxml2argvdata/input-usbmouse-addr.args | 35 -
.../input-usbmouse-addr.x86_64-latest.args | 37 +
.../input-usbmouse.x86_64-latest.args | 36 +
tests/qemuxml2argvdata/input-usbtablet.args | 34 -
.../input-usbtablet.x86_64-latest.args | 36 +
....args => kvm-pit-delay.x86_64-latest.args} | 14 +-
...rgs => kvm-pit-discard.x86_64-latest.args} | 14 +-
...clock.args => kvmclock.x86_64-latest.args} | 9 +-
tests/qemuxml2argvdata/machine-aliases1.args | 34 -
.../machine-aliases1.x86_64-latest.args | 36 +
...gs => machine-aliases2.x86_64-latest.args} | 15 +-
.../machine-core-off.x86_64-latest.args | 35 +
tests/qemuxml2argvdata/machine-core-on.args | 33 -
...rgs => machine-core-on.x86_64-latest.args} | 13 +-
...dparm-s390-char-invalid.x86_64-latest.err} | 0
...adparm-s390-len-invalid.x86_64-latest.err} | 0
.../qemuxml2argvdata/machine-vmport-opt.args | 34 -
.../machine-vmport-opt.x86_64-latest.args | 36 +
...rr => memory-align-fail.x86_64-latest.err} | 0
.../memory-hotplug-dimm.x86_64-latest.args | 41 +
...plug-invalid-targetnode.x86_64-latest.err} | 0
...> memory-hotplug-nonuma.x86_64-latest.err} | 0
tests/qemuxml2argvdata/memory-hotplug.args | 35 -
...args => memory-hotplug.x86_64-latest.args} | 22 +-
tests/qemuxml2argvdata/memtune-unlimited.args | 34 -
.../memtune-unlimited.x86_64-latest.args | 36 +
tests/qemuxml2argvdata/memtune.args | 34 -
.../memtune.x86_64-latest.args | 36 +
...migrate-numa-unaligned.x86_64-latest.args} | 17 +-
...igrate.args => migrate.x86_64-latest.args} | 12 +-
...rr => minimal-no-memory.x86_64-latest.err} | 0
tests/qemuxml2argvdata/minimal.args | 34 -
.../minimal.x86_64-latest.args | 36 +
tests/qemuxml2argvdata/misc-acpi.args | 32 -
...late.args => misc-acpi.x86_64-latest.args} | 13 +-
...rgs => misc-disable-s3.x86_64-latest.args} | 12 +-
... misc-disable-suspends.x86_64-latest.args} | 12 +-
tests/qemuxml2argvdata/misc-enable-s4.err | 1 -
...args => misc-enable-s4.x86_64-latest.args} | 12 +-
tests/qemuxml2argvdata/misc-uuid.args | 32 -
...auto.args => misc-uuid.x86_64-latest.args} | 13 +-
tests/qemuxml2argvdata/monitor-json.args | 34 -
.../multifunction-pci-device.args | 43 -
...ultifunction-pci-device.x86_64-latest.args | 45 +
...s.args => nosharepages.x86_64-latest.args} | 12 +-
.../numad-auto-memory-vcpu-cpuset.args | 34 -
...auto-memory-vcpu-cpuset.x86_64-latest.args | 36 +
...o-memory-vcpu-no-cpuset-and-placement.args | 34 -
...no-cpuset-and-placement.x86_64-latest.args | 36 +
...tic-numatune-no-nodeset.x86_64-latest.err} | 0
.../numad-auto-vcpu-static-numatune.args | 34 -
...to-vcpu-static-numatune.x86_64-latest.args | 36 +
.../numad-static-memory-auto-vcpu.args | 34 -
...static-memory-auto-vcpu.x86_64-latest.args | 36 +
tests/qemuxml2argvdata/numad.args | 34 -
.../qemuxml2argvdata/numad.x86_64-latest.args | 36 +
.../numatune-auto-nodeset-invalid.args | 34 -
...ne-auto-nodeset-invalid.x86_64-latest.args | 36 +
...> numatune-auto-prefer.x86_64-latest.args} | 14 +-
... => numatune-distances.x86_64-latest.args} | 28 +-
...ne-memnode-invalid-mode.x86_64-latest.err} | 0
...tune-memnode-no-memory.x86_64-latest.args} | 15 +-
... numatune-memnode-nocpu.x86_64-latest.err} | 0
tests/qemuxml2argvdata/numatune-memnode.args | 37 -
...ne-memnodes-problematic.x86_64-latest.err} | 0
...-memory-invalid-nodeset.x86_64-latest.err} | 0
tests/qemuxml2argvdata/numatune-memory.args | 34 -
tests/qemuxml2argvdata/numatune-memory.xml | 31 -
...nodeset-exceed-hostnode.x86_64-latest.err} | 0
.../parallel-parport-chardev.args | 36 -
.../parallel-tcp-chardev.args | 36 -
tests/qemuxml2argvdata/pci-autoadd-addr.args | 41 -
.../pci-autoadd-addr.x86_64-latest.args | 44 +
tests/qemuxml2argvdata/pci-autoadd-idx.args | 42 -
.../pci-autoadd-idx.x86_64-latest.args | 45 +
...s => pci-autofill-addr.x86_64-latest.args} | 16 +-
...-bridge-duplicate-index.x86_64-latest.err} | 0
... pci-bridge-many-disks.x86_64-latest.args} | 224 ++--
...-negative-index-invalid.x86_64-latest.err} | 0
tests/qemuxml2argvdata/pci-bridge.args | 101 --
.../pci-bridge.x86_64-latest.args | 104 ++
....err => pci-bus-invalid.x86_64-latest.err} | 0
...r => pci-domain-invalid.x86_64-latest.err} | 0
...ci-expander-bus-bad-bus.x86_64-latest.err} | 0
...xpander-bus-bad-machine.x86_64-latest.err} | 0
...i-expander-bus-bad-node.x86_64-latest.err} | 0
tests/qemuxml2argvdata/pci-expander-bus.args | 98 --
.../pci-expander-bus.x86_64-latest.args | 101 ++
...=> pci-function-invalid.x86_64-latest.err} | 0
...-many.args => pci-many.x86_64-latest.args} | 71 +-
.../pci-rom-disabled-invalid.args | 1 -
...ci-rom-disabled-invalid.x86_64-latest.args | 1 +
...gs => pci-rom-disabled.x86_64-latest.args} | 12 +-
.../pci-rom.x86_64-latest.args | 42 +
...err => pci-root-address.x86_64-latest.err} | 0
... pci-root-nonzero-index.x86_64-latest.err} | 0
.../pci-serial-dev-chardev.args | 36 -
...err => pci-slot-invalid.x86_64-latest.err} | 0
...ie-expander-bus-bad-bus.x86_64-latest.err} | 0
...xpander-bus-bad-machine.x86_64-latest.err} | 0
tests/qemuxml2argvdata/pcie-expander-bus.args | 135 --
.../pcie-expander-bus.x86_64-latest.args | 140 ++
...oot-port-model-generic.x86_64-latest.args} | 14 +-
...oot-port-model-ioh3420.x86_64-latest.args} | 14 +-
...pcie-root-port-too-many.x86_64-latest.err} | 0
...args => pcie-root-port.x86_64-latest.args} | 17 +-
...root.args => pcie-root.x86_64-latest.args} | 11 +-
.../pcie-switch-downstream-port.args | 45 -
...-switch-downstream-port.x86_64-latest.args | 48 +
.../pcie-switch-upstream-port.args | 39 -
...ie-switch-upstream-port.x86_64-latest.args | 43 +
....args => pcihole64-q35.x86_64-latest.args} | 15 +-
...le64.args => pcihole64.x86_64-latest.args} | 12 +-
...rgs => pmu-feature-off.x86_64-latest.args} | 8 +-
...re.args => pmu-feature.x86_64-latest.args} | 8 +-
...eatures-invalid-machine.x86_64-latest.err} | 0
...-serial-invalid-machine.x86_64-latest.err} | 0
...=> q35-dmi-bad-address1.x86_64-latest.err} | 0
...=> q35-dmi-bad-address2.x86_64-latest.err} | 0
.../q35-pci-force-address.args | 38 -
.../q35-pci-force-address.x86_64-latest.args | 40 +
.../q35-pm-disable-fallback.args | 37 -
.../q35-pm-disable-fallback.xml | 18 -
tests/qemuxml2argvdata/q35-pm-disable.args | 37 -
tests/qemuxml2argvdata/q35-pm-disable.xml | 18 -
tests/qemuxml2argvdata/q35-usb2-multi.args | 49 -
.../q35-usb2-multi.x86_64-latest.args | 51 +
tests/qemuxml2argvdata/q35-usb2-reorder.args | 49 -
.../q35-usb2-reorder.x86_64-latest.args | 51 +
.../q35-usb2.x86_64-latest.args | 43 +
...t.err => q35-wrong-root.x86_64-latest.err} | 0
tests/qemuxml2argvdata/q35.args | 39 -
.../{q35-usb2.args => q35.x86_64-latest.args} | 23 +-
tests/qemuxml2argvdata/q35.xml | 4 +
...nv.args => qemu-ns-alt.x86_64-latest.args} | 15 +-
.../qemu-ns-commandline-ns0.args | 34 -
...qemu-ns-commandline-ns0.x86_64-latest.args | 36 +
.../qemu-ns-commandline-ns1.args | 34 -
...qemu-ns-commandline-ns1.x86_64-latest.args | 36 +
.../qemuxml2argvdata/qemu-ns-commandline.args | 34 -
.../qemu-ns-commandline.x86_64-latest.args | 36 +
.../qemu-ns-domain-commandline-ns0.args | 34 -
...-domain-commandline-ns0.x86_64-latest.args | 36 +
.../qemu-ns-domain-commandline.args | 34 -
...u-ns-domain-commandline.x86_64-latest.args | 36 +
.../qemuxml2argvdata/qemu-ns-domain-ns0.args | 34 -
.../qemu-ns-domain-ns0.x86_64-latest.args | 36 +
...args => qemu-ns-no-env.x86_64-latest.args} | 15 +-
...eboot-timeout-disabled.x86_64-latest.args} | 10 +-
...reboot-timeout-enabled.x86_64-latest.args} | 10 +-
....args => restore-v2-fd.x86_64-latest.args} | 14 +-
...-v2.args => restore-v2.x86_64-latest.args} | 12 +-
tests/qemuxml2argvdata/seclabel-dac-none.args | 34 -
.../seclabel-dac-none.x86_64-latest.args | 36 +
...label-device-duplicates.x86_64-latest.err} | 0
...-device-relabel-invalid.x86_64-latest.err} | 0
.../seclabel-dynamic-baselabel.args | 34 -
...label-dynamic-baselabel.x86_64-latest.args | 36 +
.../seclabel-dynamic-labelskip.args | 34 -
...label-dynamic-labelskip.x86_64-latest.args | 36 +
...label-dynamic-override.x86_64-latest.args} | 16 +-
.../seclabel-dynamic-relabel.args | 34 -
...eclabel-dynamic-relabel.x86_64-latest.args | 36 +
tests/qemuxml2argvdata/seclabel-dynamic.args | 34 -
.../seclabel-dynamic.x86_64-latest.args | 36 +
...rr => seclabel-multiple.x86_64-latest.err} | 0
tests/qemuxml2argvdata/seclabel-none.args | 34 -
.../seclabel-none.x86_64-latest.args | 36 +
.../seclabel-static-labelskip.args | 34 -
...clabel-static-labelskip.x86_64-latest.args | 36 +
.../seclabel-static-relabel.args | 34 -
...seclabel-static-relabel.x86_64-latest.args | 36 +
tests/qemuxml2argvdata/seclabel-static.args | 34 -
.../seclabel-static.x86_64-latest.args | 36 +
.../serial-dev-chardev-iobase.args | 36 -
.../qemuxml2argvdata/serial-dev-chardev.args | 36 -
.../qemuxml2argvdata/serial-file-chardev.args | 37 -
tests/qemuxml2argvdata/serial-file-log.args | 37 -
.../qemuxml2argvdata/serial-many-chardev.args | 39 -
.../qemuxml2argvdata/serial-pty-chardev.args | 36 -
tests/qemuxml2argvdata/serial-spiceport.args | 38 -
.../qemuxml2argvdata/serial-tcp-chardev.args | 36 -
.../serial-tcp-telnet-chardev.args | 36 -
.../serial-tcp-tlsx509-chardev-verify.args | 39 -
.../serial-tcp-tlsx509-chardev.args | 39 -
.../serial-tcp-tlsx509-secret-chardev.args | 40 -
.../qemuxml2argvdata/serial-udp-chardev.args | 38 -
tests/qemuxml2argvdata/serial-vc-chardev.args | 36 -
.../smartcard-controller.x86_64-latest.args | 35 +
...t-certificates-database.x86_64-latest.args | 35 +
.../smartcard-host-certificates.args | 33 -
...tcard-host-certificates.x86_64-latest.args | 35 +
tests/qemuxml2argvdata/smartcard-host.args | 33 -
.../smartcard-host.x86_64-latest.args | 35 +
...d-passthrough-spicevmc.x86_64-latest.args} | 18 +-
...rtcard-passthrough-tcp.x86_64-latest.args} | 16 +-
...date.err => smbios-date.x86_64-latest.err} | 0
...rr => smbios-uuid-match.x86_64-latest.err} | 0
...{smbios.args => smbios.x86_64-latest.args} | 14 +-
tests/qemuxml2argvdata/smp-dies.args | 33 -
tests/qemuxml2argvdata/smp.args | 33 -
... tpm-no-backend-invalid.x86_64-latest.err} | 0
....err => usb-bus-missing.x86_64-latest.err} | 0
...troller-default-i440fx.x86_64-latest.args} | 14 +-
....xml => usb-controller-default-i440fx.xml} | 0
...controller-default-isapc.x86_64-latest.err | 1 +
.../usb-controller-default-isapc.xml | 16 +
...controller-default-q35.x86_64-latest.args} | 10 +-
...ult-unavailable-i440fx.x86_64-latest.args} | 12 +-
...-controller-default-unavailable-i440fx.xml | 1 +
...default-unavailable-q35.x86_64-latest.err} | 0
...sb-controller-explicit-unavailable-q35.xml | 1 -
...troller-ich9-autoassign.x86_64-latest.args | 41 +
...xml => usb-controller-ich9-autoassign.xml} | 0
...ntroller-ich9-companion.x86_64-latest.args | 36 +
....xml => usb-controller-ich9-companion.xml} | 0
...ntroller-ich9-ehci-addr.x86_64-latest.args | 44 +
....xml => usb-controller-ich9-ehci-addr.xml} | 0
...oller-ich9-no-companion.x86_64-latest.err} | 0
...l => usb-controller-ich9-no-companion.xml} | 0
...roller-implicit-i440fx.x86_64-latest.args} | 13 +-
...xml => usb-controller-implicit-i440fx.xml} | 1 -
...troller-implicit-isapc.x86_64-latest.args} | 8 +-
.../usb-controller-implicit-isapc.xml | 15 +
...controller-implicit-q35.x86_64-latest.args | 36 +
.../usb-controller-implicit-q35.xml | 15 +
...ntroller-nec-xhci-limit.x86_64-latest.err} | 0
....xml => usb-controller-nec-xhci-limit.xml} | 0
...er-nec-xhci-unavailable.x86_64-latest.err} | 0
.../usb-controller-nec-xhci-unavailable.xml | 1 +
...sb-controller-nec-xhci.x86_64-latest.args} | 10 +-
...it-q35.xml => usb-controller-nec-xhci.xml} | 0
...ler-nex-xhci-autoassign.x86_64-latest.args | 37 +
...=> usb-controller-nex-xhci-autoassign.xml} | 0
...> usb-controller-piix3.x86_64-latest.args} | 15 +-
...ontroller.xml => usb-controller-piix3.xml} | 0
...troller-qemu-xhci-limit.x86_64-latest.err} | 0
.../usb-controller-qemu-xhci-unavailable.err | 1 -
.../usb-controller-qemu-xhci-unavailable.xml | 1 -
.../usb-controller-qemu-xhci.args | 30 -
...b-controller-qemu-xhci.x86_64-latest.args} | 15 +-
.../qemuxml2argvdata/usb-controller-xhci.args | 30 -
tests/qemuxml2argvdata/usb-controller.args | 31 -
.../usb-hub-autoadd-deluxe.args | 50 -
.../usb-hub-autoadd-deluxe.x86_64-latest.args | 52 +
tests/qemuxml2argvdata/usb-hub-autoadd.args | 36 -
.../usb-hub-autoadd.x86_64-latest.args | 38 +
...err => usb-hub-conflict.x86_64-latest.err} | 0
... => usb-hub-nonexistent.x86_64-latest.err} | 0
tests/qemuxml2argvdata/usb-hub.args | 32 -
.../usb-hub.x86_64-latest.args | 34 +
.../qemuxml2argvdata/usb-ich9-autoassign.args | 39 -
.../qemuxml2argvdata/usb-ich9-companion.args | 34 -
.../qemuxml2argvdata/usb-ich9-ehci-addr.args | 42 -
.../qemuxml2argvdata/usb-long-port-path.args | 35 -
.../usb-long-port-path.x86_64-latest.args | 37 +
...hub.err => usb-none-hub.x86_64-latest.err} | 0
...r.err => usb-none-other.x86_64-latest.err} | 0
...r => usb-none-usbtablet.x86_64-latest.err} | 0
tests/qemuxml2argvdata/usb-none.args | 30 -
.../usb-none.x86_64-latest.args | 32 +
.../qemuxml2argvdata/usb-port-autoassign.args | 36 -
.../usb-port-autoassign.x86_64-latest.args | 38 +
tests/qemuxml2argvdata/usb-port-missing.args | 34 -
.../usb-port-missing.x86_64-latest.args | 36 +
... usb-ports-out-of-range.x86_64-latest.err} | 0
tests/qemuxml2argvdata/usb-ports.args | 36 -
.../usb-ports.x86_64-latest.args | 38 +
tests/qemuxml2argvdata/usb-redir-boot.args | 39 -
.../usb-redir-boot.x86_64-latest.args | 41 +
.../usb-redir-filter-version.args | 36 -
...sb-redir-filter-version.x86_64-latest.args | 38 +
tests/qemuxml2argvdata/usb-redir-filter.args | 39 -
.../usb-redir-filter.x86_64-latest.args | 41 +
tests/qemuxml2argvdata/usb-redir.args | 39 -
.../usb-redir.x86_64-latest.args | 41 +
...-long-port-path-invalid.x86_64-latest.err} | 0
.../qemuxml2argvdata/usb-xhci-autoassign.args | 35 -
tests/qemuxml2argvdata/usb1-usb2.args | 43 -
.../usb1-usb2.x86_64-latest.args | 45 +
...=> vhost_queues-invalid.x86_64-latest.err} | 0
.../virtio-input-passthrough.args | 32 -
...irtio-input-passthrough.x86_64-latest.args | 34 +
tests/qemuxml2argvdata/virtio-input.args | 34 -
.../virtio-input.x86_64-latest.args | 36 +
...lloon-freepage-reporting.x86_64-5.0.0.err} | 0
.../qemuxml2argvdata/virtio-rng-default.args | 33 -
.../virtio-rng-default.x86_64-latest.args | 35 +
...=> virtio-rng-egd-crash.x86_64-latest.err} | 0
...args => virtio-rng-egd.x86_64-latest.args} | 16 +-
.../qemuxml2argvdata/virtio-rng-multiple.args | 36 -
.../virtio-rng-multiple.x86_64-latest.args | 38 +
tests/qemuxml2argvdata/virtio-rng-random.args | 33 -
.../virtio-rng-random.x86_64-latest.args | 35 +
tests/qemuxml2argvdata/vmcoreinfo.args | 35 -
.../vmcoreinfo.x86_64-latest.args | 37 +
tests/qemuxml2argvtest.c | 1189 ++++++-----------
.../default-kvm-host-arch.x86_64-latest.xml | 2 +-
.../default-qemu-host-arch.x86_64-latest.xml | 2 +-
.../qemuxml2xmloutdata/q35.x86_64-latest.xml | 4 +
...ntroller-default-i440fx.x86_64-latest.xml} | 0
...ault-unavailable-i440fx.x86_64-latest.xml} | 22 +-
...ntroller-ich9-ehci-addr.x86_64-latest.xml} | 0
...troller-implicit-i440fx.x86_64-latest.xml} | 12 +-
...ntroller-implicit-isapc.x86_64-latest.xml} | 18 +-
...-controller-implicit-q35.x86_64-latest.xml | 43 +
...usb-controller-nec-xhci.x86_64-latest.xml} | 0
...=> usb-controller-piix3.x86_64-latest.xml} | 0
tests/qemuxml2xmltest.c | 14 +-
tests/testutilsqemu.c | 159 +--
tests/testutilsqemu.h | 6 +-
550 files changed, 6870 insertions(+), 7188 deletions(-)
rename tests/qemuxml2argvdata/{440fx-ide-address-conflict.err =>
440fx-ide-address-conflict.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{440fx-wrong-root.err =>
440fx-wrong-root.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-default-both.args =>
aarch64-gic-default-both.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-default-v2.args =>
aarch64-gic-default-v2.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-default-v3.args =>
aarch64-gic-default-v3.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-host.args =>
aarch64-gic-host.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-none-both.args =>
aarch64-gic-none-both.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-none-tcg.args =>
aarch64-gic-none-tcg.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-none-v2.args =>
aarch64-gic-none-v2.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-none-v3.args =>
aarch64-gic-none-v3.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-v2.args =>
aarch64-gic-v2.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-v3.args =>
aarch64-gic-v3.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{machine-core-off.args => acpi-table.x86_64-latest.args}
(60%)
delete mode 100644 tests/qemuxml2argvdata/autoindex.args
create mode 100644 tests/qemuxml2argvdata/autoindex.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/balloon-device-auto.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/balloon-device-deflate-off.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/balloon-device-deflate.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/balloon-device-period.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/balloon-device.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/blkiotune-device.args
create mode 100644 tests/qemuxml2argvdata/blkiotune-device.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/blkiotune.args
create mode 100644 tests/qemuxml2argvdata/blkiotune.x86_64-latest.args
rename tests/qemuxml2argvdata/{channel-guestfwd.args =>
channel-guestfwd.x86_64-latest.args} (58%)
rename tests/qemuxml2argvdata/{channel-spicevmc.args =>
channel-spicevmc.x86_64-latest.args} (55%)
delete mode 100644 tests/qemuxml2argvdata/channel-virtio-auto.args
create mode 100644 tests/qemuxml2argvdata/channel-virtio-auto.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/channel-virtio-autoadd.args
create mode 100644 tests/qemuxml2argvdata/channel-virtio-autoadd.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/channel-virtio-autoassign.args
create mode 100644 tests/qemuxml2argvdata/channel-virtio-autoassign.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/channel-virtio-default.args
create mode 100644 tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/channel-virtio-state.x86_64-latest.args
rename tests/qemuxml2argvdata/{channel-virtio-unix.args =>
channel-virtio-unix.x86_64-latest.args} (50%)
delete mode 100644 tests/qemuxml2argvdata/channel-virtio.args
rename tests/qemuxml2argvdata/{channel-virtio-state.args =>
channel-virtio.x86_64-latest.args} (54%)
rename tests/qemuxml2argvdata/{chardev-reconnect-generated-path.err =>
chardev-reconnect-generated-path.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{chardev-reconnect-invalid-timeout.err =>
chardev-reconnect-invalid-timeout.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/chardev-reconnect.args
create mode 100644 tests/qemuxml2argvdata/chardev-reconnect.x86_64-latest.args
rename tests/qemuxml2argvdata/{clock-catchup.args => clock-catchup.x86_64-latest.args}
(61%)
rename tests/qemuxml2argvdata/{clock-localtime.args =>
clock-france.x86_64-latest.args} (60%)
rename tests/qemuxml2argvdata/{clock-hpet-off.args =>
clock-hpet-off.x86_64-7.2.0.args} (60%)
create mode 100644 tests/qemuxml2argvdata/clock-hpet-off.x86_64-latest.args
rename tests/qemuxml2argvdata/{clock-localtime-basis-localtime.args =>
clock-localtime-basis-localtime.x86_64-latest.args} (61%)
rename tests/qemuxml2argvdata/{clock-france.args =>
clock-localtime.x86_64-latest.args} (64%)
rename tests/qemuxml2argvdata/{clock-timer-hyperv-rtc.args =>
clock-timer-hyperv-rtc.x86_64-latest.args} (60%)
rename tests/qemuxml2argvdata/{balloon-device-deflate-off.args =>
clock-utc.x86_64-latest.args} (64%)
rename tests/qemuxml2argvdata/{clock-variable.args =>
clock-variable.x86_64-latest.args} (61%)
delete mode 100644 tests/qemuxml2argvdata/console-compat-auto.args
delete mode 100644 tests/qemuxml2argvdata/console-compat-chardev.args
delete mode 100644 tests/qemuxml2argvdata/console-compat.args
rename tests/qemuxml2argvdata/{console-virtio-many.args =>
console-virtio-many.x86_64-latest.args} (52%)
rename tests/qemuxml2argvdata/{console-virtio.args =>
console-virtio.x86_64-latest.args} (56%)
delete mode 100644 tests/qemuxml2argvdata/controller-order.args
create mode 100644 tests/qemuxml2argvdata/controller-order.x86_64-latest.args
rename tests/qemuxml2argvdata/{cpu-Haswell-noTSX.args =>
cpu-Haswell-noTSX.x86_64-latest.args} (60%)
rename tests/qemuxml2argvdata/{cpu-Haswell.args => cpu-Haswell.x86_64-latest.args}
(60%)
rename tests/qemuxml2argvdata/{cpu-Haswell2.args => cpu-Haswell2.x86_64-latest.args}
(60%)
rename tests/qemuxml2argvdata/{cpu-Haswell3.args => cpu-Haswell3.x86_64-latest.args}
(60%)
create mode 100644 tests/qemuxml2argvdata/cpu-cache-disable.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/cpu-cache-disable2.xml
create mode 100644 tests/qemuxml2argvdata/cpu-cache-disable3.x86_64-latest.args
rename tests/qemuxml2argvdata/{cpu-cache-emulate-l2.err =>
cpu-cache-emulate-l2.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{cpu-cache-disable.args =>
cpu-cache-emulate-l3.x86_64-latest.args} (56%)
rename tests/qemuxml2argvdata/{cpu-cache-passthrough-l3.err =>
cpu-cache-passthrough-l3.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough.args
rename tests/qemuxml2argvdata/{cpu-cache-disable2.args =>
cpu-cache-passthrough.x86_64-latest.args} (56%)
delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough2.args
delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough2.xml
rename tests/qemuxml2argvdata/{cpu-cache-passthrough3.err =>
cpu-cache-passthrough3.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/cpu-check-default-none.args
create mode 100644 tests/qemuxml2argvdata/cpu-check-default-none.x86_64-latest.args
rename tests/qemuxml2argvdata/{cpu-check-default-none2.args =>
cpu-check-default-none2.x86_64-latest.args} (60%)
delete mode 100644 tests/qemuxml2argvdata/cpu-check-default-partial.args
create mode 100644 tests/qemuxml2argvdata/cpu-check-default-partial.x86_64-latest.args
rename tests/qemuxml2argvdata/{cpu-check-default-partial2.args =>
cpu-check-default-partial2.x86_64-latest.args} (60%)
delete mode 120000 tests/qemuxml2argvdata/cpu-check-full.args
create mode 120000 tests/qemuxml2argvdata/cpu-check-full.x86_64-latest.args
rename tests/qemuxml2argvdata/{cpu-check-none.args =>
cpu-check-none.x86_64-latest.args} (60%)
delete mode 120000 tests/qemuxml2argvdata/cpu-check-partial.args
create mode 120000 tests/qemuxml2argvdata/cpu-check-partial.x86_64-latest.args
rename tests/qemuxml2argvdata/{cpu-exact1.args => cpu-exact1.x86_64-latest.args}
(62%)
rename tests/qemuxml2argvdata/{cpu-exact2-nofallback.args =>
cpu-exact2-nofallback.x86_64-latest.args} (63%)
rename tests/qemuxml2argvdata/{cpu-exact2.args => cpu-exact2.x86_64-latest.args}
(63%)
delete mode 100644 tests/qemuxml2argvdata/cpu-fallback.args
rename tests/qemuxml2argvdata/{usb-piix3-controller.args =>
cpu-fallback.x86_64-5.2.0.args} (73%)
create mode 100644 tests/qemuxml2argvdata/cpu-fallback.x86_64-8.0.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-kvmclock.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-kvmclock.x86_64-latest.args
rename tests/qemuxml2argvdata/{cpu-host-model-cmt.args =>
cpu-host-model-cmt.x86_64-latest.args} (64%)
rename tests/qemuxml2argvdata/{cpu-host-model-fallback.args =>
cpu-host-model-fallback.x86_64-4.2.0.args} (63%)
rename tests/qemuxml2argvdata/{cpu-host-model-vendor.args =>
cpu-host-model-fallback.x86_64-5.0.0.args} (63%)
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.err
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-4.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.0.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.1.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.0.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.1.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.0.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.1.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-vendor.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args
rename tests/qemuxml2argvdata/{machine-aliases2.args =>
cpu-host-passthrough-features.x86_64-latest.args} (60%)
delete mode 100644 tests/qemuxml2argvdata/cpu-host-passthrough.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-passthrough.x86_64-latest.args
rename tests/qemuxml2argvdata/{cpu-kvmclock.args => cpu-kvmclock.x86_64-latest.args}
(60%)
delete mode 100644 tests/qemuxml2argvdata/cpu-minimum1.args
create mode 100644 tests/qemuxml2argvdata/cpu-minimum1.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/cpu-minimum2.args
create mode 100644 tests/qemuxml2argvdata/cpu-minimum2.x86_64-latest.args
rename tests/qemuxml2argvdata/{cpu-no-removed-features.args =>
cpu-no-removed-features.x86_64-latest.args} (60%)
delete mode 100644 tests/qemuxml2argvdata/cpu-nofallback.err
create mode 100644 tests/qemuxml2argvdata/cpu-nofallback.x86_64-5.2.0.err
create mode 100644 tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-numa-disjoint.args
create mode 100644 tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
rename tests/qemuxml2argvdata/{cpu-numa-memshared.args =>
cpu-numa-no-memory-element.x86_64-latest.args} (56%)
delete mode 100644 tests/qemuxml2argvdata/cpu-numa1.args
create mode 100644 tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/cpu-numa2.args
create mode 100644 tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args
rename tests/qemuxml2argvdata/{cpu-numa3.err => cpu-numa3.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate.args
rename tests/qemuxml2argvdata/{cpu-cache-disable3.args =>
cpu-phys-bits-emulate.x86_64-latest.args} (57%)
delete mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args
create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate2.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args
rename tests/qemuxml2argvdata/{cpu-cache-emulate-l3.args =>
cpu-phys-bits-passthrough.x86_64-latest.args} (57%)
rename tests/qemuxml2argvdata/{cpu-phys-bits-passthrough2.err =>
cpu-phys-bits-passthrough2.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{cpu-qemu-host-passthrough.err =>
cpu-qemu-host-passthrough.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/cpu-strict1.args
create mode 100644 tests/qemuxml2argvdata/cpu-strict1.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/cpu-topology1.args
rename tests/qemuxml2argvdata/{balloon-device.args =>
cpu-topology1.x86_64-latest.args} (55%)
delete mode 100644 tests/qemuxml2argvdata/cpu-topology2.args
create mode 100644 tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/cpu-topology3.args
create mode 100644 tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args
rename tests/qemuxml2argvdata/{monitor-json.xml => cpu-topology4.xml} (51%)
rename tests/qemuxml2argvdata/{cpu-tsc-frequency.args =>
cpu-tsc-frequency.x86_64-latest.args} (65%)
rename tests/qemuxml2argvdata/{default-kvm-host-arch.args =>
default-kvm-host-arch.x86_64-latest.args} (58%)
rename tests/qemuxml2argvdata/{default-qemu-host-arch.args =>
default-qemu-host-arch.x86_64-latest.args} (59%)
delete mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.args
rename tests/qemuxml2argvdata/{graphics-sdl-fullscreen.args =>
graphics-sdl-fullscreen.x86_64-latest.args} (62%)
rename tests/qemuxml2argvdata/{graphics-sdl.args => graphics-sdl.x86_64-latest.args}
(61%)
rename tests/qemuxml2argvdata/{hostdev-mdev-display-missing-graphics.err =>
hostdev-mdev-display-missing-graphics.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{hostdev-mdev-duplicate.err =>
hostdev-mdev-duplicate.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{hostdev-mdev-invalid-target-address.err =>
hostdev-mdev-invalid-target-address.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{hostdev-mdev-precreated.args =>
hostdev-mdev-precreated.x86_64-latest.args} (55%)
rename tests/qemuxml2argvdata/{hostdev-mdev-src-address-invalid.err =>
hostdev-mdev-src-address-invalid.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
create mode 100644
tests/qemuxml2argvdata/hostdev-pci-address-unassigned.x86_64-latest.args
rename tests/qemuxml2argvdata/{hostdev-pci-duplicate.err =>
hostdev-pci-duplicate.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-multifunction.args
create mode 100644 tests/qemuxml2argvdata/hostdev-pci-multifunction.x86_64-latest.args
rename tests/qemuxml2argvdata/{hostdev-scsi-duplicate.err =>
hostdev-scsi-duplicate.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{pci-rom.args =>
hostdev-scsi-vhost-scsi-pci.x86_64-latest.args} (54%)
rename tests/qemuxml2argvdata/{hostdev-usb-duplicate.err =>
hostdev-usb-duplicate.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{hostdev-scsi-vhost-scsi-pci.args =>
hostdev-vfio-multidomain.x86_64-latest.args} (58%)
rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-wrong-arch.err =>
hostdev-vfio-zpci-wrong-arch.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/hostdev-vfio.args
rename tests/qemuxml2argvdata/{hostdev-vfio-multidomain.args =>
hostdev-vfio.x86_64-latest.args} (58%)
rename tests/qemuxml2argvdata/{hotplug-base.args => hotplug-base.x86_64-latest.args}
(55%)
rename tests/qemuxml2argvdata/{hugepages-default-1G-nodeset-2M.err =>
hugepages-default-1G-nodeset-2M.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{hugepages-memaccess-invalid.err =>
hugepages-memaccess-invalid.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{hugepages-memaccess3.err =>
hugepages-memaccess3.x86_64-5.1.0.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/input-usbmouse-addr.args
create mode 100644 tests/qemuxml2argvdata/input-usbmouse-addr.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/input-usbmouse.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/input-usbtablet.args
create mode 100644 tests/qemuxml2argvdata/input-usbtablet.x86_64-latest.args
rename tests/qemuxml2argvdata/{kvm-pit-delay.args => kvm-pit-delay.x86_64-latest.args}
(62%)
rename tests/qemuxml2argvdata/{kvm-pit-discard.args =>
kvm-pit-discard.x86_64-latest.args} (62%)
rename tests/qemuxml2argvdata/{kvmclock.args => kvmclock.x86_64-latest.args} (64%)
delete mode 100644 tests/qemuxml2argvdata/machine-aliases1.args
create mode 100644 tests/qemuxml2argvdata/machine-aliases1.x86_64-latest.args
rename tests/qemuxml2argvdata/{cpu-host-passthrough-features.args =>
machine-aliases2.x86_64-latest.args} (61%)
create mode 100644 tests/qemuxml2argvdata/machine-core-off.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/machine-core-on.args
rename tests/qemuxml2argvdata/{balloon-device-period.args =>
machine-core-on.x86_64-latest.args} (64%)
rename tests/qemuxml2argvdata/{machine-loadparm-s390-char-invalid.err =>
machine-loadparm-s390-char-invalid.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{machine-loadparm-s390-len-invalid.err =>
machine-loadparm-s390-len-invalid.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/machine-vmport-opt.args
create mode 100644 tests/qemuxml2argvdata/machine-vmport-opt.x86_64-latest.args
rename tests/qemuxml2argvdata/{memory-align-fail.err =>
memory-align-fail.x86_64-latest.err} (100%)
create mode 100644 tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args
rename tests/qemuxml2argvdata/{memory-hotplug-invalid-targetnode.err =>
memory-hotplug-invalid-targetnode.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{memory-hotplug-nonuma.err =>
memory-hotplug-nonuma.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/memory-hotplug.args
rename tests/qemuxml2argvdata/{memory-hotplug-dimm.args =>
memory-hotplug.x86_64-latest.args} (58%)
delete mode 100644 tests/qemuxml2argvdata/memtune-unlimited.args
create mode 100644 tests/qemuxml2argvdata/memtune-unlimited.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/memtune.args
create mode 100644 tests/qemuxml2argvdata/memtune.x86_64-latest.args
rename tests/qemuxml2argvdata/{migrate-numa-unaligned.args =>
migrate-numa-unaligned.x86_64-latest.args} (54%)
rename tests/qemuxml2argvdata/{migrate.args => migrate.x86_64-latest.args} (65%)
rename tests/qemuxml2argvdata/{minimal-no-memory.err =>
minimal-no-memory.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/minimal.args
create mode 100644 tests/qemuxml2argvdata/minimal.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/misc-acpi.args
rename tests/qemuxml2argvdata/{balloon-device-deflate.args =>
misc-acpi.x86_64-latest.args} (64%)
rename tests/qemuxml2argvdata/{misc-disable-s3.args =>
misc-disable-s3.x86_64-latest.args} (65%)
rename tests/qemuxml2argvdata/{misc-disable-suspends.args =>
misc-disable-suspends.x86_64-latest.args} (65%)
delete mode 100644 tests/qemuxml2argvdata/misc-enable-s4.err
rename tests/qemuxml2argvdata/{misc-enable-s4.args =>
misc-enable-s4.x86_64-latest.args} (65%)
delete mode 100644 tests/qemuxml2argvdata/misc-uuid.args
rename tests/qemuxml2argvdata/{balloon-device-auto.args =>
misc-uuid.x86_64-latest.args} (64%)
delete mode 100644 tests/qemuxml2argvdata/monitor-json.args
delete mode 100644 tests/qemuxml2argvdata/multifunction-pci-device.args
create mode 100644 tests/qemuxml2argvdata/multifunction-pci-device.x86_64-latest.args
rename tests/qemuxml2argvdata/{nosharepages.args => nosharepages.x86_64-latest.args}
(64%)
delete mode 100644 tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
create mode 100644
tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args
delete mode 100644
tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
create mode 100644
tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args
rename tests/qemuxml2argvdata/{numad-auto-vcpu-static-numatune-no-nodeset.err =>
numad-auto-vcpu-static-numatune-no-nodeset.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
create mode 100644
tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
create mode 100644
tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/numad.args
create mode 100644 tests/qemuxml2argvdata/numad.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
create mode 100644
tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args
rename tests/qemuxml2argvdata/{numatune-auto-prefer.args =>
numatune-auto-prefer.x86_64-latest.args} (56%)
rename tests/qemuxml2argvdata/{numatune-distances.args =>
numatune-distances.x86_64-latest.args} (60%)
rename tests/qemuxml2argvdata/{numatune-memnode-invalid-mode.err =>
numatune-memnode-invalid-mode.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{numatune-memnode-no-memory.args =>
numatune-memnode-no-memory.x86_64-latest.args} (57%)
rename tests/qemuxml2argvdata/{numatune-memnode-nocpu.err =>
numatune-memnode-nocpu.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/numatune-memnode.args
rename tests/qemuxml2argvdata/{numatune-memnodes-problematic.err =>
numatune-memnodes-problematic.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{numatune-memory-invalid-nodeset.err =>
numatune-memory-invalid-nodeset.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/numatune-memory.args
delete mode 100644 tests/qemuxml2argvdata/numatune-memory.xml
rename tests/qemuxml2argvdata/{numatune-static-nodeset-exceed-hostnode.err =>
numatune-static-nodeset-exceed-hostnode.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/parallel-parport-chardev.args
delete mode 100644 tests/qemuxml2argvdata/parallel-tcp-chardev.args
delete mode 100644 tests/qemuxml2argvdata/pci-autoadd-addr.args
create mode 100644 tests/qemuxml2argvdata/pci-autoadd-addr.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/pci-autoadd-idx.args
create mode 100644 tests/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args
rename tests/qemuxml2argvdata/{pci-autofill-addr.args =>
pci-autofill-addr.x86_64-latest.args} (57%)
rename tests/qemuxml2argvdata/{pci-bridge-duplicate-index.err =>
pci-bridge-duplicate-index.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{pci-bridge-many-disks.args =>
pci-bridge-many-disks.x86_64-latest.args} (68%)
rename tests/qemuxml2argvdata/{pci-bridge-negative-index-invalid.err =>
pci-bridge-negative-index-invalid.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/pci-bridge.args
create mode 100644 tests/qemuxml2argvdata/pci-bridge.x86_64-latest.args
rename tests/qemuxml2argvdata/{pci-bus-invalid.err =>
pci-bus-invalid.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{pci-domain-invalid.err =>
pci-domain-invalid.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{pci-expander-bus-bad-bus.err =>
pci-expander-bus-bad-bus.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{pci-expander-bus-bad-machine.err =>
pci-expander-bus-bad-machine.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{pci-expander-bus-bad-node.err =>
pci-expander-bus-bad-node.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/pci-expander-bus.args
create mode 100644 tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args
rename tests/qemuxml2argvdata/{pci-function-invalid.err =>
pci-function-invalid.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{pci-many.args => pci-many.x86_64-latest.args} (67%)
delete mode 120000 tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
create mode 120000 tests/qemuxml2argvdata/pci-rom-disabled-invalid.x86_64-latest.args
rename tests/qemuxml2argvdata/{pci-rom-disabled.args =>
pci-rom-disabled.x86_64-latest.args} (58%)
create mode 100644 tests/qemuxml2argvdata/pci-rom.x86_64-latest.args
rename tests/qemuxml2argvdata/{pci-root-address.err =>
pci-root-address.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{pci-root-nonzero-index.err =>
pci-root-nonzero-index.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/pci-serial-dev-chardev.args
rename tests/qemuxml2argvdata/{pci-slot-invalid.err =>
pci-slot-invalid.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{pcie-expander-bus-bad-bus.err =>
pcie-expander-bus-bad-bus.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{pcie-expander-bus-bad-machine.err =>
pcie-expander-bus-bad-machine.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/pcie-expander-bus.args
create mode 100644 tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args
rename tests/qemuxml2argvdata/{pcie-root-port-model-ioh3420.args =>
pcie-root-port-model-generic.x86_64-latest.args} (51%)
rename tests/qemuxml2argvdata/{pcie-root-port-model-generic.args =>
pcie-root-port-model-ioh3420.x86_64-latest.args} (55%)
rename tests/qemuxml2argvdata/{pcie-root-port-too-many.err =>
pcie-root-port-too-many.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{pcie-root-port.args =>
pcie-root-port.x86_64-latest.args} (53%)
rename tests/qemuxml2argvdata/{pcie-root.args => pcie-root.x86_64-latest.args} (55%)
delete mode 100644 tests/qemuxml2argvdata/pcie-switch-downstream-port.args
create mode 100644 tests/qemuxml2argvdata/pcie-switch-downstream-port.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/pcie-switch-upstream-port.args
create mode 100644 tests/qemuxml2argvdata/pcie-switch-upstream-port.x86_64-latest.args
rename tests/qemuxml2argvdata/{pcihole64-q35.args => pcihole64-q35.x86_64-latest.args}
(54%)
rename tests/qemuxml2argvdata/{pcihole64.args => pcihole64.x86_64-latest.args} (59%)
rename tests/qemuxml2argvdata/{pmu-feature-off.args =>
pmu-feature-off.x86_64-latest.args} (64%)
rename tests/qemuxml2argvdata/{pmu-feature.args => pmu-feature.x86_64-latest.args}
(64%)
rename tests/qemuxml2argvdata/{pseries-features-invalid-machine.err =>
pseries-features-invalid-machine.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{pseries-serial-invalid-machine.err =>
pseries-serial-invalid-machine.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{q35-dmi-bad-address1.err =>
q35-dmi-bad-address1.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{q35-dmi-bad-address2.err =>
q35-dmi-bad-address2.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/q35-pci-force-address.args
create mode 100644 tests/qemuxml2argvdata/q35-pci-force-address.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable-fallback.args
delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable-fallback.xml
delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable.args
delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable.xml
delete mode 100644 tests/qemuxml2argvdata/q35-usb2-multi.args
create mode 100644 tests/qemuxml2argvdata/q35-usb2-multi.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/q35-usb2-reorder.args
create mode 100644 tests/qemuxml2argvdata/q35-usb2-reorder.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/q35-usb2.x86_64-latest.args
rename tests/qemuxml2argvdata/{q35-wrong-root.err => q35-wrong-root.x86_64-latest.err}
(100%)
delete mode 100644 tests/qemuxml2argvdata/q35.args
rename tests/qemuxml2argvdata/{q35-usb2.args => q35.x86_64-latest.args} (51%)
rename tests/qemuxml2argvdata/{qemu-ns-no-env.args => qemu-ns-alt.x86_64-latest.args}
(61%)
delete mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
create mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline-ns0.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
create mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline-ns1.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline.args
create mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
create mode 100644
tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
create mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-commandline.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
create mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-ns0.x86_64-latest.args
rename tests/qemuxml2argvdata/{qemu-ns-alt.args => qemu-ns-no-env.x86_64-latest.args}
(65%)
rename tests/qemuxml2argvdata/{reboot-timeout-disabled.args =>
reboot-timeout-disabled.x86_64-latest.args} (63%)
rename tests/qemuxml2argvdata/{reboot-timeout-enabled.args =>
reboot-timeout-enabled.x86_64-latest.args} (63%)
rename tests/qemuxml2argvdata/{restore-v2-fd.args => restore-v2-fd.x86_64-latest.args}
(61%)
rename tests/qemuxml2argvdata/{restore-v2.args => restore-v2.x86_64-latest.args}
(65%)
delete mode 100644 tests/qemuxml2argvdata/seclabel-dac-none.args
create mode 100644 tests/qemuxml2argvdata/seclabel-dac-none.x86_64-latest.args
rename tests/qemuxml2argvdata/{seclabel-device-duplicates.err =>
seclabel-device-duplicates.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{seclabel-device-relabel-invalid.err =>
seclabel-device-relabel-invalid.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-baselabel.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-labelskip.x86_64-latest.args
rename tests/qemuxml2argvdata/{seclabel-dynamic-override.args =>
seclabel-dynamic-override.x86_64-latest.args} (63%)
delete mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-relabel.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/seclabel-dynamic.args
create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic.x86_64-latest.args
rename tests/qemuxml2argvdata/{seclabel-multiple.err =>
seclabel-multiple.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/seclabel-none.args
create mode 100644 tests/qemuxml2argvdata/seclabel-none.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/seclabel-static-labelskip.args
create mode 100644 tests/qemuxml2argvdata/seclabel-static-labelskip.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/seclabel-static-relabel.args
create mode 100644 tests/qemuxml2argvdata/seclabel-static-relabel.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/seclabel-static.args
create mode 100644 tests/qemuxml2argvdata/seclabel-static.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
delete mode 100644 tests/qemuxml2argvdata/serial-dev-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-file-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-file-log.args
delete mode 100644 tests/qemuxml2argvdata/serial-many-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-pty-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-spiceport.args
delete mode 100644 tests/qemuxml2argvdata/serial-tcp-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-udp-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-vc-chardev.args
create mode 100644 tests/qemuxml2argvdata/smartcard-controller.x86_64-latest.args
create mode 100644
tests/qemuxml2argvdata/smartcard-host-certificates-database.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/smartcard-host-certificates.args
create mode 100644 tests/qemuxml2argvdata/smartcard-host-certificates.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/smartcard-host.args
create mode 100644 tests/qemuxml2argvdata/smartcard-host.x86_64-latest.args
rename tests/qemuxml2argvdata/{smartcard-passthrough-spicevmc.args =>
smartcard-passthrough-spicevmc.x86_64-latest.args} (52%)
rename tests/qemuxml2argvdata/{smartcard-passthrough-tcp.args =>
smartcard-passthrough-tcp.x86_64-latest.args} (54%)
rename tests/qemuxml2argvdata/{smbios-date.err => smbios-date.x86_64-latest.err}
(100%)
rename tests/qemuxml2argvdata/{smbios-uuid-match.err =>
smbios-uuid-match.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{smbios.args => smbios.x86_64-latest.args} (70%)
delete mode 100644 tests/qemuxml2argvdata/smp-dies.args
delete mode 100644 tests/qemuxml2argvdata/smp.args
rename tests/qemuxml2argvdata/{tpm-no-backend-invalid.err =>
tpm-no-backend-invalid.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{usb-bus-missing.err =>
usb-bus-missing.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{clock-utc.args =>
usb-controller-default-i440fx.x86_64-latest.args} (59%)
rename tests/qemuxml2argvdata/{usb-controller.xml =>
usb-controller-default-i440fx.xml} (100%)
create mode 100644 tests/qemuxml2argvdata/usb-controller-default-isapc.x86_64-latest.err
create mode 100644 tests/qemuxml2argvdata/usb-controller-default-isapc.xml
rename tests/qemuxml2argvdata/{usb-controller-default-q35.args =>
usb-controller-default-q35.x86_64-latest.args} (64%)
rename tests/qemuxml2argvdata/{smartcard-controller.args =>
usb-controller-default-unavailable-i440fx.x86_64-latest.args} (63%)
create mode 120000 tests/qemuxml2argvdata/usb-controller-default-unavailable-i440fx.xml
rename tests/qemuxml2argvdata/{usb-controller-default-unavailable-q35.err =>
usb-controller-default-unavailable-q35.x86_64-latest.err} (100%)
delete mode 120000 tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.xml
create mode 100644
tests/qemuxml2argvdata/usb-controller-ich9-autoassign.x86_64-latest.args
rename tests/qemuxml2argvdata/{usb-ich9-autoassign.xml =>
usb-controller-ich9-autoassign.xml} (100%)
create mode 100644
tests/qemuxml2argvdata/usb-controller-ich9-companion.x86_64-latest.args
rename tests/qemuxml2argvdata/{usb-ich9-companion.xml =>
usb-controller-ich9-companion.xml} (100%)
create mode 100644
tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.x86_64-latest.args
rename tests/qemuxml2argvdata/{usb-ich9-ehci-addr.xml =>
usb-controller-ich9-ehci-addr.xml} (100%)
rename tests/qemuxml2argvdata/{usb-ich9-no-companion.err =>
usb-controller-ich9-no-companion.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{usb-ich9-no-companion.xml =>
usb-controller-ich9-no-companion.xml} (100%)
rename tests/qemuxml2argvdata/{smartcard-host-certificates-database.args =>
usb-controller-implicit-i440fx.x86_64-latest.args} (63%)
rename tests/qemuxml2argvdata/{usb-controller-xhci.xml =>
usb-controller-implicit-i440fx.xml} (86%)
rename tests/qemuxml2argvdata/{acpi-table.args =>
usb-controller-implicit-isapc.x86_64-latest.args} (67%)
create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-isapc.xml
create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-q35.xml
rename tests/qemuxml2argvdata/{usb-controller-xhci-limit.err =>
usb-controller-nec-xhci-limit.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{usb-controller-xhci-limit.xml =>
usb-controller-nec-xhci-limit.xml} (100%)
rename tests/qemuxml2argvdata/{usb-controller-explicit-unavailable-q35.err =>
usb-controller-nec-xhci-unavailable.x86_64-latest.err} (100%)
create mode 120000 tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.xml
rename tests/qemuxml2argvdata/{usb-controller-explicit-q35.args =>
usb-controller-nec-xhci.x86_64-latest.args} (64%)
rename tests/qemuxml2argvdata/{usb-controller-explicit-q35.xml =>
usb-controller-nec-xhci.xml} (100%)
create mode 100644
tests/qemuxml2argvdata/usb-controller-nex-xhci-autoassign.x86_64-latest.args
rename tests/qemuxml2argvdata/{usb-xhci-autoassign.xml =>
usb-controller-nex-xhci-autoassign.xml} (100%)
rename tests/qemuxml2argvdata/{input-usbmouse.args =>
usb-controller-piix3.x86_64-latest.args} (59%)
rename tests/qemuxml2argvdata/{usb-piix3-controller.xml => usb-controller-piix3.xml}
(100%)
rename tests/qemuxml2argvdata/{usb-controller-qemu-xhci-limit.err =>
usb-controller-qemu-xhci-limit.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.err
delete mode 120000 tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml
delete mode 100644 tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
rename tests/qemuxml2argvdata/{serial-unix-chardev.args =>
usb-controller-qemu-xhci.x86_64-latest.args} (63%)
delete mode 100644 tests/qemuxml2argvdata/usb-controller-xhci.args
delete mode 100644 tests/qemuxml2argvdata/usb-controller.args
delete mode 100644 tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
create mode 100644 tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/usb-hub-autoadd.args
create mode 100644 tests/qemuxml2argvdata/usb-hub-autoadd.x86_64-latest.args
rename tests/qemuxml2argvdata/{usb-hub-conflict.err =>
usb-hub-conflict.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{usb-hub-nonexistent.err =>
usb-hub-nonexistent.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/usb-hub.args
create mode 100644 tests/qemuxml2argvdata/usb-hub.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/usb-ich9-autoassign.args
delete mode 100644 tests/qemuxml2argvdata/usb-ich9-companion.args
delete mode 100644 tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
delete mode 100644 tests/qemuxml2argvdata/usb-long-port-path.args
create mode 100644 tests/qemuxml2argvdata/usb-long-port-path.x86_64-latest.args
rename tests/qemuxml2argvdata/{usb-none-hub.err => usb-none-hub.x86_64-latest.err}
(100%)
rename tests/qemuxml2argvdata/{usb-none-other.err => usb-none-other.x86_64-latest.err}
(100%)
rename tests/qemuxml2argvdata/{usb-none-usbtablet.err =>
usb-none-usbtablet.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/usb-none.args
create mode 100644 tests/qemuxml2argvdata/usb-none.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/usb-port-autoassign.args
create mode 100644 tests/qemuxml2argvdata/usb-port-autoassign.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/usb-port-missing.args
create mode 100644 tests/qemuxml2argvdata/usb-port-missing.x86_64-latest.args
rename tests/qemuxml2argvdata/{usb-ports-out-of-range.err =>
usb-ports-out-of-range.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/usb-ports.args
create mode 100644 tests/qemuxml2argvdata/usb-ports.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/usb-redir-boot.args
create mode 100644 tests/qemuxml2argvdata/usb-redir-boot.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/usb-redir-filter-version.args
create mode 100644 tests/qemuxml2argvdata/usb-redir-filter-version.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/usb-redir-filter.args
create mode 100644 tests/qemuxml2argvdata/usb-redir-filter.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/usb-redir.args
create mode 100644 tests/qemuxml2argvdata/usb-redir.x86_64-latest.args
rename tests/qemuxml2argvdata/{usb-too-long-port-path-invalid.err =>
usb-too-long-port-path-invalid.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/usb-xhci-autoassign.args
delete mode 100644 tests/qemuxml2argvdata/usb1-usb2.args
create mode 100644 tests/qemuxml2argvdata/usb1-usb2.x86_64-latest.args
rename tests/qemuxml2argvdata/{vhost_queues-invalid.err =>
vhost_queues-invalid.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/virtio-input-passthrough.args
create mode 100644 tests/qemuxml2argvdata/virtio-input-passthrough.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/virtio-input.args
create mode 100644 tests/qemuxml2argvdata/virtio-input.x86_64-latest.args
rename tests/qemuxml2argvdata/{virtio-options-memballoon-freepage-reporting.err =>
virtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/virtio-rng-default.args
create mode 100644 tests/qemuxml2argvdata/virtio-rng-default.x86_64-latest.args
rename tests/qemuxml2argvdata/{virtio-rng-egd-crash.err =>
virtio-rng-egd-crash.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{virtio-rng-egd.args =>
virtio-rng-egd.x86_64-latest.args} (54%)
delete mode 100644 tests/qemuxml2argvdata/virtio-rng-multiple.args
create mode 100644 tests/qemuxml2argvdata/virtio-rng-multiple.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/virtio-rng-random.args
create mode 100644 tests/qemuxml2argvdata/virtio-rng-random.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/vmcoreinfo.args
create mode 100644 tests/qemuxml2argvdata/vmcoreinfo.x86_64-latest.args
rename tests/qemuxml2xmloutdata/{usb-controller.x86_64-latest.xml =>
usb-controller-default-i440fx.x86_64-latest.xml} (100%)
rename tests/{qemuxml2argvdata/smp.xml =>
qemuxml2xmloutdata/usb-controller-default-unavailable-i440fx.x86_64-latest.xml} (57%)
rename tests/qemuxml2xmloutdata/{usb-ich9-ehci-addr.x86_64-latest.xml =>
usb-controller-ich9-ehci-addr.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{smp.x86_64-latest.xml =>
usb-controller-implicit-i440fx.x86_64-latest.xml} (65%)
rename tests/{qemuxml2argvdata/smp-dies.xml =>
qemuxml2xmloutdata/usb-controller-implicit-isapc.x86_64-latest.xml} (50%)
create mode 100644
tests/qemuxml2xmloutdata/usb-controller-implicit-q35.x86_64-latest.xml
rename tests/qemuxml2xmloutdata/{usb-controller-explicit-q35.x86_64-latest.xml =>
usb-controller-nec-xhci.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{usb-piix3-controller.x86_64-latest.xml =>
usb-controller-piix3.x86_64-latest.xml} (100%)
--
2.41.0
9:23 a.m.
New subject: [PATCH 01/51] qemu: Always assume support for QEMU_CAPS_PIIX_DISABLE_S* and QEMU_CAPS_ICH9_DISABLE_S*
The support for PIIX power management was added in qemu commit
v1.0-3094-g459ae5ea5a and the suport for ICH9 power management was added
in qemu commit v2.2.0-542-g6ac0d8d44c and both can't be compiled out.
This means we can always assume support for these features. Remove the
validation and impossible tests. Move relevant bits from
'q35-pm-disable' to 'q35' test case.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 40 +++++++------------
src/qemu/qemu_validate.c | 37 ++---------------
tests/qemuxml2argvdata/misc-enable-s4.err | 1 -
.../q35-pm-disable-fallback.args | 37 -----------------
.../q35-pm-disable-fallback.xml | 18 ---------
tests/qemuxml2argvdata/q35-pm-disable.args | 37 -----------------
tests/qemuxml2argvdata/q35-pm-disable.xml | 18 ---------
tests/qemuxml2argvdata/q35.args | 2 +
tests/qemuxml2argvdata/q35.xml | 4 ++
tests/qemuxml2argvtest.c | 18 ++-------
.../qemuxml2xmloutdata/q35.x86_64-latest.xml | 4 ++
11 files changed, 31 insertions(+), 185 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/misc-enable-s4.err
delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable-fallback.args
delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable-fallback.xml
delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable.args
delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable.xml
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index a55218d5fd..f7079c6920 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6047,7 +6047,7 @@ qemuBuildClockCommandLine(virCommand *cmd,
}
-static int
+static void
qemuBuildPMCommandLine(virCommand *cmd,
const virDomainDef *def,
qemuDomainObjPrivate *priv)
@@ -6075,35 +6075,24 @@ qemuBuildPMCommandLine(virCommand *cmd,
virCommandAddArg(cmd, "-no-acpi");
}
- /* We fall back to PIIX4_PM even for q35, since it's what we did
- pre-q35-pm support. QEMU starts up fine (with a warning) if
- mixing PIIX PM and -M q35. Starting to reject things here
- could mean we refuse to start existing configs in the wild.*/
- if (def->pm.s3) {
+ if (def->pm.s3 || def->pm.s4) {
const char *pm_object = "PIIX4_PM";
- if (qemuDomainIsQ35(def) &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_DISABLE_S3))
+ if (qemuDomainIsQ35(def))
pm_object = "ICH9-LPC";
- virCommandAddArg(cmd, "-global");
- virCommandAddArgFormat(cmd, "%s.disable_s3=%d",
- pm_object, def->pm.s3 == VIR_TRISTATE_BOOL_NO);
- }
-
- if (def->pm.s4) {
- const char *pm_object = "PIIX4_PM";
-
- if (qemuDomainIsQ35(def) &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_DISABLE_S4))
- pm_object = "ICH9-LPC";
+ if (def->pm.s3) {
+ virCommandAddArg(cmd, "-global");
+ virCommandAddArgFormat(cmd, "%s.disable_s3=%d",
+ pm_object, def->pm.s3 == VIR_TRISTATE_BOOL_NO);
+ }
- virCommandAddArg(cmd, "-global");
- virCommandAddArgFormat(cmd, "%s.disable_s4=%d",
- pm_object, def->pm.s4 == VIR_TRISTATE_BOOL_NO);
+ if (def->pm.s4) {
+ virCommandAddArg(cmd, "-global");
+ virCommandAddArgFormat(cmd, "%s.disable_s4=%d",
+ pm_object, def->pm.s4 == VIR_TRISTATE_BOOL_NO);
+ }
}
-
- return 0;
}
@@ -10444,8 +10433,7 @@ qemuBuildCommandLine(virDomainObj *vm,
if (qemuBuildClockCommandLine(cmd, def, qemuCaps) < 0)
return NULL;
- if (qemuBuildPMCommandLine(cmd, def, priv) < 0)
- return NULL;
+ qemuBuildPMCommandLine(cmd, def, priv);
if (qemuBuildBootCommandLine(cmd, def) < 0)
return NULL;
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 8f9e8fd7f0..d5fe1cbd73 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -588,38 +588,6 @@ qemuValidateDomainDefClockTimers(const virDomainDef *def,
}
-static int
-qemuValidateDomainDefPM(const virDomainDef *def,
- virQEMUCaps *qemuCaps)
-{
- bool q35Dom = qemuDomainIsQ35(def);
-
- if (def->pm.s3) {
- bool q35ICH9_S3 = q35Dom &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_DISABLE_S3);
-
- if (!q35ICH9_S3 && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX_DISABLE_S3))
{
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- "%s", _("setting ACPI S3 not
supported"));
- return -1;
- }
- }
-
- if (def->pm.s4) {
- bool q35ICH9_S4 = q35Dom &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_DISABLE_S4);
-
- if (!q35ICH9_S4 && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX_DISABLE_S4))
{
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- "%s", _("setting ACPI S4 not
supported"));
- return -1;
- }
- }
-
- return 0;
-}
-
-
static int
qemuValidateDomainDefNvram(const virDomainDef *def,
virQEMUCaps *qemuCaps)
@@ -1279,8 +1247,11 @@ qemuValidateDomainDef(const virDomainDef *def,
if (qemuValidateDomainDefClockTimers(def, qemuCaps) < 0)
return -1;
- if (qemuValidateDomainDefPM(def, qemuCaps) < 0)
+ if ((def->pm.s3 || def->pm.s4) && !ARCH_IS_X86(def->os.arch)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("setting ACPI S3/S4 not supported"));
return -1;
+ }
if (qemuValidateDomainDefBoot(def, qemuCaps) < 0)
return -1;
diff --git a/tests/qemuxml2argvdata/misc-enable-s4.err
b/tests/qemuxml2argvdata/misc-enable-s4.err
deleted file mode 100644
index a256b75792..0000000000
--- a/tests/qemuxml2argvdata/misc-enable-s4.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: setting ACPI S4 not supported
diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
deleted file mode 100644
index 924e3087fb..0000000000
--- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
+++ /dev/null
@@ -1,37 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-q35 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-q35/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-q35/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=q35,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35/master-key.aes \
--machine q35,usb=off,dump-guest-core=off \
--accel tcg \
--m size=1048576k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--global PIIX4_PM.disable_s3=1 \
--global PIIX4_PM.disable_s4=1 \
--boot strict=on \
--device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
--device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--global ICH9-LPC.noreboot=off \
--watchdog-action reset \
--device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.xml
b/tests/qemuxml2argvdata/q35-pm-disable-fallback.xml
deleted file mode 100644
index 386391b270..0000000000
--- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<domain type='qemu'>
- <name>q35</name>
- <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
- <memory unit='KiB'>1048576</memory>
- <currentMemory unit='KiB'>1048576</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='x86_64' machine='q35'>hvm</type>
- <boot dev='network'/>
- </os>
- <pm>
- <suspend-to-mem enabled='no'/>
- <suspend-to-disk enabled='no'/>
- </pm>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args
b/tests/qemuxml2argvdata/q35-pm-disable.args
deleted file mode 100644
index f50ddcc118..0000000000
--- a/tests/qemuxml2argvdata/q35-pm-disable.args
+++ /dev/null
@@ -1,37 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-q35 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-q35/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-q35/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=q35,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35/master-key.aes \
--machine q35,usb=off,dump-guest-core=off \
--accel tcg \
--m size=1048576k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--global ICH9-LPC.disable_s3=1 \
--global ICH9-LPC.disable_s4=1 \
--boot strict=on \
--device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
--device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--global ICH9-LPC.noreboot=off \
--watchdog-action reset \
--device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-pm-disable.xml
b/tests/qemuxml2argvdata/q35-pm-disable.xml
deleted file mode 100644
index 386391b270..0000000000
--- a/tests/qemuxml2argvdata/q35-pm-disable.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<domain type='qemu'>
- <name>q35</name>
- <uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
- <memory unit='KiB'>1048576</memory>
- <currentMemory unit='KiB'>1048576</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='x86_64' machine='q35'>hvm</type>
- <boot dev='network'/>
- </os>
- <pm>
- <suspend-to-mem enabled='no'/>
- <suspend-to-disk enabled='no'/>
- </pm>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args
index e4cb36b1d0..638c79d45f 100644
--- a/tests/qemuxml2argvdata/q35.args
+++ b/tests/qemuxml2argvdata/q35.args
@@ -24,6 +24,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-global ICH9-LPC.disable_s3=1 \
+-global ICH9-LPC.disable_s4=0 \
-boot strict=on \
-device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \
-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d
\
diff --git a/tests/qemuxml2argvdata/q35.xml b/tests/qemuxml2argvdata/q35.xml
index 22a7aca47b..30697fb940 100644
--- a/tests/qemuxml2argvdata/q35.xml
+++ b/tests/qemuxml2argvdata/q35.xml
@@ -8,6 +8,10 @@
<type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/>
</os>
+ <pm>
+ <suspend-to-mem enabled='no'/>
+ <suspend-to-disk enabled='yes'/>
+ </pm>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 1e6cbbf028..5d23c552c5 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1394,10 +1394,9 @@ mymain(void)
DO_TEST_NOCAPS("input-usbmouse");
DO_TEST_NOCAPS("input-usbtablet");
DO_TEST_NOCAPS("misc-acpi");
- DO_TEST("misc-disable-s3", QEMU_CAPS_PIIX_DISABLE_S3);
- DO_TEST("misc-disable-suspends", QEMU_CAPS_PIIX_DISABLE_S3,
QEMU_CAPS_PIIX_DISABLE_S4);
- DO_TEST("misc-enable-s4", QEMU_CAPS_PIIX_DISABLE_S4);
- DO_TEST_PARSE_ERROR_NOCAPS("misc-enable-s4");
+ DO_TEST_NOCAPS("misc-disable-s3");
+ DO_TEST_NOCAPS("misc-disable-suspends");
+ DO_TEST_NOCAPS("misc-enable-s4");
DO_TEST_CAPS_VER("misc-no-reboot", "5.2.0");
DO_TEST_CAPS_LATEST("misc-no-reboot");
DO_TEST_NOCAPS("misc-uuid");
@@ -2135,17 +2134,6 @@ mymain(void)
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_DEVICE_IOH3420);
- DO_TEST("q35-pm-disable",
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4,
- QEMU_CAPS_ICH9_DISABLE_S3, QEMU_CAPS_ICH9_DISABLE_S4);
- DO_TEST("q35-pm-disable-fallback",
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4);
DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable");
DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-enable");
DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-disable",
"5.1.0");
diff --git a/tests/qemuxml2xmloutdata/q35.x86_64-latest.xml
b/tests/qemuxml2xmloutdata/q35.x86_64-latest.xml
index 909f94fe2c..3303370e7a 100644
--- a/tests/qemuxml2xmloutdata/q35.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/q35.x86_64-latest.xml
@@ -15,6 +15,10 @@
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
+ <pm>
+ <suspend-to-mem enabled='no'/>
+ <suspend-to-disk enabled='yes'/>
+ </pm>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
--
2.41.0
9:23 a.m.
New subject: [PATCH 02/51] qemu: capabilities: Retire QEMU_CAPS_ICH9_DISABLE_S* and QEMU_CAPS_ICH9_DISABLE_S* capabilities
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 12 ++++--------
src/qemu/qemu_capabilities.h | 8 ++++----
tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml | 4 ----
tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml | 4 ----
tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml | 4 ----
tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 4 ----
tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 4 ----
tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 4 ----
tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 2 --
tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 4 ----
tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 2 --
tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 4 ----
tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 2 --
tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 4 ----
tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 2 --
tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 4 ----
tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 4 ----
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 4 ----
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 4 ----
19 files changed, 8 insertions(+), 72 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ea4e248349..b52e25a072 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -208,8 +208,8 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 100 */
"virtio-scsi-pci", /* QEMU_CAPS_VIRTIO_SCSI */
"blockio", /* X_QEMU_CAPS_BLOCKIO */
- "disable-s3", /* QEMU_CAPS_PIIX_DISABLE_S3 */
- "disable-s4", /* QEMU_CAPS_PIIX_DISABLE_S4 */
+ "disable-s3", /* X_QEMU_CAPS_PIIX_DISABLE_S3 */
+ "disable-s4", /* X_QEMU_CAPS_PIIX_DISABLE_S4 */
"usb-redir.filter", /* QEMU_CAPS_USB_REDIR_FILTER */
/* 105 */
@@ -354,8 +354,8 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 205 */
"chardev-file-append", /* X_QEMU_CAPS_CHARDEV_FILE_APPEND */
- "ich9-disable-s3", /* QEMU_CAPS_ICH9_DISABLE_S3 */
- "ich9-disable-s4", /* QEMU_CAPS_ICH9_DISABLE_S4 */
+ "ich9-disable-s3", /* X_QEMU_CAPS_ICH9_DISABLE_S3 */
+ "ich9-disable-s4", /* X_QEMU_CAPS_ICH9_DISABLE_S4 */
"vserport-change-event", /* X_QEMU_CAPS_VSERPORT_CHANGE */
"virtio-balloon-pci.deflate-on-oom", /*
QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE */
@@ -1457,8 +1457,6 @@ static struct virQEMUCapsDevicePropsFlags
virQEMUCapsDevicePropsIDEDrive[] = {
};
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPiix4PM[] = {
- { "disable_s3", QEMU_CAPS_PIIX_DISABLE_S3, NULL },
- { "disable_s4", QEMU_CAPS_PIIX_DISABLE_S4, NULL },
{ "acpi-root-pci-hotplug", QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG, NULL },
};
@@ -1493,8 +1491,6 @@ static struct virQEMUCapsDevicePropsFlags
virQEMUCapsDevicePropsVirtioGpu[] = {
};
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsICH9[] = {
- { "disable_s3", QEMU_CAPS_ICH9_DISABLE_S3, NULL },
- { "disable_s4", QEMU_CAPS_ICH9_DISABLE_S4, NULL },
};
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIntelIOMMU[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index ba289ba6b9..642a4762b3 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -186,8 +186,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 100 */
QEMU_CAPS_VIRTIO_SCSI, /* -device virtio-scsi-* */
X_QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */
- QEMU_CAPS_PIIX_DISABLE_S3, /* -M pc S3 BIOS Advertisement on/off */
- QEMU_CAPS_PIIX_DISABLE_S4, /* -M pc S4 BIOS Advertisement on/off */
+ X_QEMU_CAPS_PIIX_DISABLE_S3, /* -M pc S3 BIOS Advertisement on/off */
+ X_QEMU_CAPS_PIIX_DISABLE_S4, /* -M pc S4 BIOS Advertisement on/off */
QEMU_CAPS_USB_REDIR_FILTER, /* usb-redir.filter */
/* 105 */
@@ -332,8 +332,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 205 */
X_QEMU_CAPS_CHARDEV_FILE_APPEND, /* -chardev file,append=on|off */
- QEMU_CAPS_ICH9_DISABLE_S3, /* -M q35 S3 BIOS Advertisement on/off */
- QEMU_CAPS_ICH9_DISABLE_S4, /* -M q35 S4 BIOS Advertisement on/off */
+ X_QEMU_CAPS_ICH9_DISABLE_S3, /* -M q35 S3 BIOS Advertisement on/off */
+ X_QEMU_CAPS_ICH9_DISABLE_S4, /* -M q35 S4 BIOS Advertisement on/off */
X_QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */
QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, /* virtio-balloon-{device,pci,ccw}.
* deflate-on-oom */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
index bf920a74c4..3c197af464 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
@@ -25,8 +25,6 @@
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
- <flag name='disable-s3'/>
- <flag name='disable-s4'/>
<flag name='usb-redir.filter'/>
<flag name='seccomp-sandbox'/>
<flag name='vnc'/>
@@ -72,8 +70,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='ich9-disable-s3'/>
- <flag name='ich9-disable-s4'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
index 8fa4148232..dc107952ca 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
@@ -25,8 +25,6 @@
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
- <flag name='disable-s3'/>
- <flag name='disable-s4'/>
<flag name='usb-redir.filter'/>
<flag name='seccomp-sandbox'/>
<flag name='vnc'/>
@@ -72,8 +70,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='ich9-disable-s3'/>
- <flag name='ich9-disable-s4'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
index c0f3444d85..ddd3b560ab 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
@@ -25,8 +25,6 @@
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
- <flag name='disable-s3'/>
- <flag name='disable-s4'/>
<flag name='usb-redir.filter'/>
<flag name='seccomp-sandbox'/>
<flag name='vnc'/>
@@ -72,8 +70,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='ich9-disable-s3'/>
- <flag name='ich9-disable-s4'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
index 6bd531a825..7162ca6a18 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
@@ -25,8 +25,6 @@
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
- <flag name='disable-s3'/>
- <flag name='disable-s4'/>
<flag name='usb-redir.filter'/>
<flag name='seccomp-sandbox'/>
<flag name='vnc'/>
@@ -72,8 +70,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='ich9-disable-s3'/>
- <flag name='ich9-disable-s4'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
index 4223eb1a2e..77890694ad 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
@@ -24,8 +24,6 @@
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
- <flag name='disable-s3'/>
- <flag name='disable-s4'/>
<flag name='usb-redir.filter'/>
<flag name='seccomp-sandbox'/>
<flag name='vnc'/>
@@ -71,8 +69,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='ich9-disable-s3'/>
- <flag name='ich9-disable-s4'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
index cacfd6969f..563c337b23 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
@@ -24,8 +24,6 @@
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
- <flag name='disable-s3'/>
- <flag name='disable-s4'/>
<flag name='usb-redir.filter'/>
<flag name='seccomp-sandbox'/>
<flag name='vnc'/>
@@ -70,8 +68,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='ich9-disable-s3'/>
- <flag name='ich9-disable-s4'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
index 914cda2048..b18d0509c2 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
@@ -20,8 +20,6 @@
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
- <flag name='disable-s3'/>
- <flag name='disable-s4'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='cirrus-vga'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
index 4792691285..a33911ff3c 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@@ -24,8 +24,6 @@
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
- <flag name='disable-s3'/>
- <flag name='disable-s4'/>
<flag name='usb-redir.filter'/>
<flag name='seccomp-sandbox'/>
<flag name='vnc'/>
@@ -70,8 +68,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='ich9-disable-s3'/>
- <flag name='ich9-disable-s4'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
index 748b897f70..6f29b29632 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
@@ -24,8 +24,6 @@
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
- <flag name='disable-s3'/>
- <flag name='disable-s4'/>
<flag name='usb-redir.filter'/>
<flag name='seccomp-sandbox'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
index 8d026d540d..ce16662d6b 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@@ -24,8 +24,6 @@
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
- <flag name='disable-s3'/>
- <flag name='disable-s4'/>
<flag name='usb-redir.filter'/>
<flag name='seccomp-sandbox'/>
<flag name='vnc'/>
@@ -70,8 +68,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='ich9-disable-s3'/>
- <flag name='ich9-disable-s4'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
index 310b8f9d75..67d9b23e79 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
@@ -23,8 +23,6 @@
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
- <flag name='disable-s3'/>
- <flag name='disable-s4'/>
<flag name='usb-redir.filter'/>
<flag name='seccomp-sandbox'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
index 07e8c57f27..56422fbdf8 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@@ -24,8 +24,6 @@
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
- <flag name='disable-s3'/>
- <flag name='disable-s4'/>
<flag name='usb-redir.filter'/>
<flag name='seccomp-sandbox'/>
<flag name='vnc'/>
@@ -70,8 +68,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='ich9-disable-s3'/>
- <flag name='ich9-disable-s4'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
index b8d4d4888c..e5df1832b7 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
@@ -24,8 +24,6 @@
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
- <flag name='disable-s3'/>
- <flag name='disable-s4'/>
<flag name='usb-redir.filter'/>
<flag name='seccomp-sandbox'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
index 928270d287..69e35c7133 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@@ -23,8 +23,6 @@
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
- <flag name='disable-s3'/>
- <flag name='disable-s4'/>
<flag name='usb-redir.filter'/>
<flag name='seccomp-sandbox'/>
<flag name='vnc'/>
@@ -69,8 +67,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='ich9-disable-s3'/>
- <flag name='ich9-disable-s4'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
index a889c1b034..b2fd5794cc 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@@ -24,8 +24,6 @@
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
- <flag name='disable-s3'/>
- <flag name='disable-s4'/>
<flag name='usb-redir.filter'/>
<flag name='seccomp-sandbox'/>
<flag name='vnc'/>
@@ -70,8 +68,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='ich9-disable-s3'/>
- <flag name='ich9-disable-s4'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
index 6d105e78a9..3613dfd4cc 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@@ -24,8 +24,6 @@
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
- <flag name='disable-s3'/>
- <flag name='disable-s4'/>
<flag name='usb-redir.filter'/>
<flag name='seccomp-sandbox'/>
<flag name='vnc'/>
@@ -70,8 +68,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='ich9-disable-s3'/>
- <flag name='ich9-disable-s4'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
index adcf594138..965ba37c7f 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@@ -24,8 +24,6 @@
<flag name='nec-usb-xhci'/>
<flag name='lsi'/>
<flag name='virtio-scsi-pci'/>
- <flag name='disable-s3'/>
- <flag name='disable-s4'/>
<flag name='usb-redir.filter'/>
<flag name='seccomp-sandbox'/>
<flag name='vnc'/>
@@ -70,8 +68,6 @@
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
- <flag name='ich9-disable-s3'/>
- <flag name='ich9-disable-s4'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
--
2.41.0
9:23 a.m.
New subject: [PATCH 03/51] qemu: capabilities: Preserve location of the default machine type when stripping aliases for tests
Internally the preferred machine which is 'pc' for x86_64 must be kept
in the first place in the array of machines. This was not the case when
stripping the machine aliases for use in tests (so that test output
stays stable) where we've created a new entry for the alias. This means
that the original name (e.g. pc-i440fx-8.1) stayed in the first place.
To fix this we now swap the names around and create a new entry at the
end for the specific type. Additionally the default flag is not
propagated to the copy.
This is also visible now in the output of 'qemuxml2xmltest' as the test
cases which use the default machine type return to 'pc' instead of the
more specific name.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 21 +++++++++++++++----
.../default-kvm-host-arch.x86_64-latest.xml | 2 +-
.../default-qemu-host-arch.x86_64-latest.xml | 2 +-
3 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b52e25a072..972f3e24ee 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -6756,11 +6756,21 @@ virQEMUCapsStripMachineAliasesForVirtType(virQEMUCaps *qemuCaps,
for (i = 0; i < accel->nmachineTypes; i++) {
virQEMUCapsMachineType *mach = &accel->machineTypes[i];
- g_autofree char *name = g_steal_pointer(&mach->alias);
- if (name) {
- virQEMUCapsAddMachine(qemuCaps, virtType, name, NULL, mach->defaultCPU,
- mach->maxCpus, mach->hotplugCpus,
mach->qemuDefault,
+ if (mach->alias) {
+ g_autofree char *origName = g_steal_pointer(&mach->name);
+
+ /* The preferred machine type, which is generally the default by qemu
+ * in most cases but also generally an alias needs to be kept at the
+ * first entry in the list, because virQEMUCapsGetPreferredMachine
+ * picks the first element. Thus we create a new entry for the
+ * original machine name and replace the existing one by the alias. */
+ mach->name = g_steal_pointer(&mach->alias);
+
+ /* also de-assert the copy's default flag, to ensure we don't have
multiple
+ * machines with it */
+ virQEMUCapsAddMachine(qemuCaps, virtType, origName, NULL,
mach->defaultCPU,
+ mach->maxCpus, mach->hotplugCpus, false,
mach->numaMemSupported, mach->defaultRAMid,
mach->deprecated, mach->acpi);
}
@@ -6778,6 +6788,9 @@ virQEMUCapsStripMachineAliasesForVirtType(virQEMUCaps *qemuCaps,
*
* Remove all aliases so that the tests depending on the latest capabilities
* file can be stable when new files are added.
+ *
+ * Additionally if a machine type is default, only the copy created for the
+ * alias will be kept as default to eliminate churn in output files.
*/
void
virQEMUCapsStripMachineAliases(virQEMUCaps *qemuCaps)
diff --git a/tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml
b/tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml
index a9de07d41c..c5f03ff2c1 100644
--- a/tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>4194304</currentMemory>
<vcpu placement='static'>4</vcpu>
<os>
- <type arch='x86_64' machine='pc-i440fx-8.1'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
diff --git a/tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml
b/tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml
index 37673010f6..36ed26c473 100644
--- a/tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>4194304</currentMemory>
<vcpu placement='static'>4</vcpu>
<os>
- <type arch='x86_64' machine='pc-i440fx-8.1'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
--
2.41.0
9:23 a.m.
New subject: [PATCH 04/51] qemuxml2argvtest: Clean up host CPU if overriden
If a test uses ARG_CAPS_HOST_CPU_MODEL feature we override the global
host cpu model to the selected CPU but don't clear it afterwards. This
can trip up fake caps tests following a test which uses this feature.
This does not happen with real caps, because unless overriden, the host
cpu from capabilities is always populated as the host cpu.
Clear the CPU on cleanup.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvtest.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5d23c552c5..32affb16c0 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -713,6 +713,9 @@ testCompareXMLToArgv(const void *data)
ret = 0;
cleanup:
+ /* clear overriden host cpu */
+ if (info->args.capsHostCPUModel)
+ qemuTestSetHostCPU(&driver, driver.hostarch, NULL);
virDomainChrSourceDefClear(&monitor_chr);
virObjectUnref(vm);
virIdentitySetCurrent(NULL);
--
2.41.0
9:23 a.m.
New subject: [PATCH 05/51] qemuxml2argvtest: testAddCPUModels: Remove non-x86_64 fake cpu models
At this point only x86_64 is using fake machines, and for real machines
we don't populate the fake cpu models. Thus we can remove everything
non-x86_64.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvtest.c | 30 ------------------------------
1 file changed, 30 deletions(-)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 32affb16c0..3c2156118a 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -270,15 +270,6 @@ testAddCPUModels(virQEMUCaps *caps, bool skipLegacy)
"486", "coreduo", "kvm32", "qemu32",
"kvm64",
"core2duo", "phenom", "qemu64",
};
- const char *armModels[] = {
- "cortex-a9", "cortex-a8", "cortex-a57",
"cortex-a53",
- };
- const char *ppc64Models[] = {
- "POWER8", "POWER7",
- };
- const char *s390xModels[] = {
- "z990", "zEC12", "z13",
- };
if (ARCH_IS_X86(arch)) {
if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, x86Models,
@@ -300,27 +291,6 @@ testAddCPUModels(virQEMUCaps *caps, bool skipLegacy)
VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0)
return -1;
}
- } else if (ARCH_IS_ARM(arch)) {
- if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, armModels,
- G_N_ELEMENTS(armModels),
- VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0 ||
- virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_QEMU, armModels,
- G_N_ELEMENTS(armModels),
- VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0)
- return -1;
- } else if (ARCH_IS_PPC64(arch)) {
- if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, ppc64Models,
- G_N_ELEMENTS(ppc64Models),
- VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0 ||
- virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_QEMU, ppc64Models,
- G_N_ELEMENTS(ppc64Models),
- VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0)
- return -1;
- } else if (ARCH_IS_S390(arch)) {
- if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, s390xModels,
- G_N_ELEMENTS(s390xModels),
- VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0)
- return -1;
}
return 0;
--
2.41.0
9:23 a.m.
New subject: [PATCH 06/51] qemuxml2argvtest: Drop 'monitor-json' case
QMP monitor is the only thing we support at this point, thus all other
tests test the same thing.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/monitor-json.args | 34 ------------------------
tests/qemuxml2argvdata/monitor-json.xml | 25 -----------------
tests/qemuxml2argvtest.c | 2 --
3 files changed, 61 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/monitor-json.args
delete mode 100644 tests/qemuxml2argvdata/monitor-json.xml
diff --git a/tests/qemuxml2argvdata/monitor-json.args
b/tests/qemuxml2argvdata/monitor-json.args
deleted file mode 100644
index 817806f5a4..0000000000
--- a/tests/qemuxml2argvdata/monitor-json.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=encryptdisk,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"file","filename":"/dev/hda1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/monitor-json.xml
b/tests/qemuxml2argvdata/monitor-json.xml
deleted file mode 100644
index d151884434..0000000000
--- a/tests/qemuxml2argvdata/monitor-json.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<domain type='qemu'>
- <name>encryptdisk</name>
- <uuid>496898a6-e6ff-f7c8-5dc2-3cf410945ee9</uuid>
- <memory unit='KiB'>219100</memory>
- <currentMemory unit='KiB'>219100</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='x86_64' machine='pc'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2'/>
- <source file='/dev/hda1'/>
- <target dev='hda'/>
- </disk>
- <controller type='usb' index='0'/>
- <memballoon model='virtio'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 3c2156118a..8238dceed8 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1892,8 +1892,6 @@ mymain(void)
DO_TEST("multifunction-pci-device",
QEMU_CAPS_SCSI_LSI);
- DO_TEST_NOCAPS("monitor-json");
-
DO_TEST_NOCAPS("seclabel-dynamic");
DO_TEST_NOCAPS("seclabel-dynamic-baselabel");
DO_TEST_NOCAPS("seclabel-dynamic-override");
--
2.41.0
9:23 a.m.
New subject: [PATCH 07/51] qemu: Always assume support for QEMU_CAPS_CPU_CACHE
All supported qemu versions have this feature and it can't be compiled
out. The logic is a bit more complex in this instance as the flag is
asserted if:
if (ARCH_IS_X86(qemuCaps->arch) &&
virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) {
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE);
}
Now QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION is available since qemu-2.8 but
only on certain architectures, thus we need to keep the flag itself, but
x86_64 is one of them.
The flag can be also assumed as qemuValidateDomainDefCpu rejects any
cache config on non-x86 arches.
Remove any use of the capability and drop the impossible test cases.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 6 ++--
.../qemuxml2argvdata/cpu-cache-disable2.args | 32 -------------------
tests/qemuxml2argvdata/cpu-cache-disable2.xml | 20 ------------
.../cpu-cache-passthrough2.args | 32 -------------------
.../cpu-cache-passthrough2.xml | 20 ------------
tests/qemuxml2argvtest.c | 10 +++---
6 files changed, 6 insertions(+), 114 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/cpu-cache-disable2.args
delete mode 100644 tests/qemuxml2argvdata/cpu-cache-disable2.xml
delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough2.args
delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough2.xml
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index f7079c6920..a912ed064f 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6560,12 +6560,10 @@ qemuBuildCpuCommandLine(virCommand *cmd,
if (hostOff &&
(def->cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH ||
- def->cpu->mode == VIR_CPU_MODE_MAXIMUM) &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_CACHE))
+ def->cpu->mode == VIR_CPU_MODE_MAXIMUM))
virBufferAddLit(&buf, ",host-cache-info=off");
- if (l3Off &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_CACHE))
+ if (l3Off)
virBufferAddLit(&buf, ",l3-cache=off");
}
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.args
b/tests/qemuxml2argvdata/cpu-cache-disable2.args
deleted file mode 100644
index adfad725aa..0000000000
--- a/tests/qemuxml2argvdata/cpu-cache-disable2.args
+++ /dev/null
@@ -1,32 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-foo \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-foo/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-foo/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=foo,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
--accel kvm \
--cpu host \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.xml
b/tests/qemuxml2argvdata/cpu-cache-disable2.xml
deleted file mode 100644
index e6f39951ca..0000000000
--- a/tests/qemuxml2argvdata/cpu-cache-disable2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<domain type='kvm'>
- <name>foo</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219136</memory>
- <currentMemory unit='KiB'>219136</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='x86_64' machine='pc'>hvm</type>
- <boot dev='hd'/>
- </os>
- <cpu mode='host-passthrough'>
- <cache mode='disable'/>
- </cpu>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
deleted file mode 100644
index 37b27e450a..0000000000
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
+++ /dev/null
@@ -1,32 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-foo \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-foo/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-foo/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=foo,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
--accel kvm \
--cpu host,host-cache-info=on \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.xml
b/tests/qemuxml2argvdata/cpu-cache-passthrough2.xml
deleted file mode 100644
index 74846fdd31..0000000000
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<domain type='kvm'>
- <name>foo</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219136</memory>
- <currentMemory unit='KiB'>219136</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='x86_64' machine='pc'>hvm</type>
- <boot dev='hd'/>
- </os>
- <cpu mode='host-passthrough'>
- <cache mode='passthrough'/>
- </cpu>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 8238dceed8..8afb2bf2be 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2521,12 +2521,10 @@ mymain(void)
DO_TEST("cpu-check-default-partial", QEMU_CAPS_KVM);
DO_TEST("cpu-check-default-partial2", QEMU_CAPS_KVM);
- DO_TEST("cpu-cache-disable", QEMU_CAPS_KVM, QEMU_CAPS_CPU_CACHE);
- DO_TEST("cpu-cache-disable2", QEMU_CAPS_KVM);
- DO_TEST("cpu-cache-disable3", QEMU_CAPS_KVM, QEMU_CAPS_CPU_CACHE);
- DO_TEST("cpu-cache-passthrough", QEMU_CAPS_KVM, QEMU_CAPS_CPU_CACHE);
- DO_TEST("cpu-cache-passthrough2", QEMU_CAPS_KVM);
- DO_TEST("cpu-cache-emulate-l3", QEMU_CAPS_KVM, QEMU_CAPS_CPU_CACHE);
+ DO_TEST("cpu-cache-disable", QEMU_CAPS_KVM);
+ DO_TEST("cpu-cache-disable3", QEMU_CAPS_KVM);
+ DO_TEST("cpu-cache-passthrough", QEMU_CAPS_KVM);
+ DO_TEST("cpu-cache-emulate-l3", QEMU_CAPS_KVM);
DO_TEST_PARSE_ERROR("cpu-cache-emulate-l2", QEMU_CAPS_KVM);
DO_TEST_PARSE_ERROR("cpu-cache-passthrough3", QEMU_CAPS_KVM);
DO_TEST_PARSE_ERROR("cpu-cache-passthrough-l3", QEMU_CAPS_KVM);
--
2.41.0
9:23 a.m.
New subject: [PATCH 08/51] qemu: capabilities: Retire QEMU_CAPS_CPU_CACHE
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 7 +------
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 -
tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 -
15 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 972f3e24ee..c1aca27d64 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -417,7 +417,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 250 */
"query-named-block-nodes", /* X_QEMU_CAPS_QUERY_NAMED_BLOCK_NODES
*/
- "cpu-cache", /* QEMU_CAPS_CPU_CACHE */
+ "cpu-cache", /* X_QEMU_CAPS_CPU_CACHE */
"qemu-xhci", /* QEMU_CAPS_DEVICE_QEMU_XHCI */
"kernel-irqchip", /* X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP */
"kernel-irqchip.split", /*
X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT */
@@ -5457,11 +5457,6 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps)
static void
virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps)
{
- if (ARCH_IS_X86(qemuCaps->arch) &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) {
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE);
- }
-
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_UNAVAILABLE_FEATURES))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CANONICAL_CPU_FEATURES);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 642a4762b3..612ed03c1f 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -396,7 +396,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 250 */
X_QEMU_CAPS_QUERY_NAMED_BLOCK_NODES, /* qmp query-named-block-nodes */
- QEMU_CAPS_CPU_CACHE, /* -cpu supports host-cache-info and l3-cache properties */
+ X_QEMU_CAPS_CPU_CACHE, /* -cpu supports host-cache-info and l3-cache properties */
QEMU_CAPS_DEVICE_QEMU_XHCI, /* -device qemu-xhci */
X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP, /* -machine kernel_irqchip */
X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT, /* -machine kernel_irqchip=split */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
index 3c197af464..87d4fc6308 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
@@ -86,7 +86,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
index dc107952ca..bd506fc3b3 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
@@ -86,7 +86,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
index ddd3b560ab..96ea862323 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
@@ -86,7 +86,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
index 7162ca6a18..7761b43708 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
@@ -86,7 +86,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
index 77890694ad..237268cb69 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
@@ -85,7 +85,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
index 563c337b23..d7fd5742df 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
@@ -84,7 +84,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
index a33911ff3c..da548c8beb 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@@ -84,7 +84,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
index ce16662d6b..d4b9c16a52 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@@ -84,7 +84,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
index 56422fbdf8..088c417f4d 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@@ -84,7 +84,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
index 69e35c7133..d25f0c50b3 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@@ -83,7 +83,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
index b2fd5794cc..b29c52a643 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@@ -84,7 +84,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
index 3613dfd4cc..20625eee00 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@@ -84,7 +84,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
index 965ba37c7f..a107d2c8dd 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@@ -84,7 +84,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
--
2.41.0
9:23 a.m.
New subject: [PATCH 09/51] qemu: Always assume support for QEMU_CAPS_DEVICE_VFIO_PCI
The 'display' option for the 'vfio-pci' device was added in qemu-2.12
and can't be compiled out. Assume support for the flag.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_domain.c | 11 ++++-------
src/qemu/qemu_validate.c | 6 ------
tests/qemuxml2argvdata/hostdev-mdev-precreated.args | 2 +-
tests/qemuxml2argvtest.c | 3 +--
4 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 9781df1355..c7d64e1b5c 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -6034,13 +6034,11 @@
qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(virDomainHostdevDef *host
static int
-qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDev *mdevsrc,
- virQEMUCaps *qemuCaps)
+qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDev *mdevsrc)
{
/* QEMU 2.12 added support for vfio-pci display type, we default to
* 'display=off' to stay safe from future changes */
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VFIO_PCI_DISPLAY) &&
- mdevsrc->model == VIR_MDEV_MODEL_TYPE_VFIO_PCI &&
+ if (mdevsrc->model == VIR_MDEV_MODEL_TYPE_VFIO_PCI &&
mdevsrc->display == VIR_TRISTATE_SWITCH_ABSENT)
mdevsrc->display = VIR_TRISTATE_SWITCH_OFF;
@@ -6050,7 +6048,6 @@ qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDev
*mdevsrc,
static int
qemuDomainHostdevDefPostParse(virDomainHostdevDef *hostdev,
- virQEMUCaps *qemuCaps,
unsigned int parseFlags)
{
virDomainHostdevSubsys *subsys = &hostdev->source.subsys;
@@ -6063,7 +6060,7 @@ qemuDomainHostdevDefPostParse(virDomainHostdevDef *hostdev,
if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV &&
- qemuDomainHostdevDefMdevPostParse(&subsys->u.mdev, qemuCaps) < 0)
+ qemuDomainHostdevDefMdevPostParse(&subsys->u.mdev) < 0)
return -1;
return 0;
@@ -6213,7 +6210,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDef *dev,
break;
case VIR_DOMAIN_DEVICE_HOSTDEV:
- ret = qemuDomainHostdevDefPostParse(dev->data.hostdev, qemuCaps, parseFlags);
+ ret = qemuDomainHostdevDefPostParse(dev->data.hostdev, parseFlags);
break;
case VIR_DOMAIN_DEVICE_TPM:
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index d5fe1cbd73..1346bbfb44 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -2341,12 +2341,6 @@ qemuValidateDomainMdevDefVFIOPCI(const virDomainHostdevDef
*hostdev,
if (dev->display == VIR_TRISTATE_SWITCH_ABSENT)
return 0;
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VFIO_PCI_DISPLAY)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("display property of device vfio-pci is not supported by
this version of QEMU"));
- return -1;
- }
-
if (dev->model != VIR_MDEV_MODEL_TYPE_VFIO_PCI) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("<hostdev> attribute 'display' is only
supported with model='vfio-pci'"));
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
index 2e49cff0e2..7c76cd5d15 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
@@ -27,5 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device
vfio-pci,id=hostdev0,sysfsdev=/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc,bus=pci.0,addr=0x2
\
+-device
vfio-pci,id=hostdev0,sysfsdev=/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc,display=off,bus=pci.0,addr=0x2
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 8afb2bf2be..1fe2fafeab 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1714,8 +1714,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc");
DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc-egl-headless");
DO_TEST_PARSE_ERROR("hostdev-mdev-display-missing-graphics",
- QEMU_CAPS_DEVICE_VFIO_PCI,
- QEMU_CAPS_VFIO_PCI_DISPLAY);
+ QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST_CAPS_LATEST("hostdev-mdev-display-ramfb");
DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-display-ramfb-multiple");
DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-wrong-arch",
--
2.41.0
9:23 a.m.
New subject: [PATCH 10/51] qemu_capabilities: Retire QEMU_CAPS_DEVICE_VFIO_PCI
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 -
tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 -
tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 -
36 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c1aca27d64..630be618bf 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -503,7 +503,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"machine.pseries.cap-htm", /* X_QEMU_CAPS_MACHINE_PSERIES_CAP_HTM
*/
"usb-storage.werror", /* X_QEMU_CAPS_USB_STORAGE_WERROR */
"egl-headless", /* QEMU_CAPS_EGL_HEADLESS */
- "vfio-pci.display", /* QEMU_CAPS_VFIO_PCI_DISPLAY */
+ "vfio-pci.display", /* X_QEMU_CAPS_VFIO_PCI_DISPLAY */
"blockdev", /* X_QEMU_CAPS_BLOCKDEV */
/* 315 */
@@ -1445,7 +1445,6 @@ static struct virQEMUCapsDevicePropsFlags
virQEMUCapsDevicePropsVirtioSCSI[] = {
};
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVfioPCI[] = {
- { "display", QEMU_CAPS_VFIO_PCI_DISPLAY, NULL },
};
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 612ed03c1f..afc28620dd 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -482,7 +482,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
X_QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, /* -machine pseries.cap-htm */
X_QEMU_CAPS_USB_STORAGE_WERROR, /* -device usb-storage,werror=..,rerror=.. */
QEMU_CAPS_EGL_HEADLESS, /* -display egl-headless */
- QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */
+ X_QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */
X_QEMU_CAPS_BLOCKDEV, /* -blockdev and blockdev-add are supported */
/* 315 */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
index f4f52fc1af..72e6b614cf 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
@@ -77,7 +77,6 @@
<flag name='hda-output'/>
<flag name='vhost-vsock'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
index baa05be2fb..9eff51672f 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
@@ -78,7 +78,6 @@
<flag name='hda-output'/>
<flag name='vhost-vsock'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
index 4f7c98377d..20d458e55d 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
@@ -46,7 +46,6 @@
<flag name='screendump_device'/>
<flag name='vhost-vsock'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='vfio-ap'/>
<flag name='zpci'/>
<flag name='memory-backend-memfd'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
index 87d4fc6308..28ccaa1271 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
@@ -107,7 +107,6 @@
<flag name='mch'/>
<flag name='mch.extended-tseg-mbytes'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
index 0b9eabd3da..9d90e25343 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
@@ -80,7 +80,6 @@
<flag name='vhost-vsock'/>
<flag name='tpm-emulator'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
index 481519c762..3e244da67e 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
@@ -81,7 +81,6 @@
<flag name='vhost-vsock'/>
<flag name='tpm-emulator'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
index 60384517a1..a1393e843d 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
@@ -79,7 +79,6 @@
<flag name='hda-output'/>
<flag name='vhost-vsock'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
index bd506fc3b3..d40f771e77 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
@@ -107,7 +107,6 @@
<flag name='mch'/>
<flag name='mch.extended-tseg-mbytes'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
index 96ea862323..e26f946a63 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
@@ -106,7 +106,6 @@
<flag name='mch'/>
<flag name='mch.extended-tseg-mbytes'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
index d0c75c2bb9..46666a783f 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
@@ -79,7 +79,6 @@
<flag name='vhost-vsock'/>
<flag name='tpm-emulator'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
index d86dab4482..0496d3f0d6 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
@@ -79,7 +79,6 @@
<flag name='vhost-vsock'/>
<flag name='tpm-emulator'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
index f57dc02b13..edd562898e 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
@@ -77,7 +77,6 @@
<flag name='hda-output'/>
<flag name='vhost-vsock'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
index d44ca2a121..0a18f55960 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
@@ -44,7 +44,6 @@
<flag name='screendump_device'/>
<flag name='vhost-vsock'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='vfio-ap'/>
<flag name='zpci'/>
<flag name='memory-backend-memfd'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
index 7761b43708..387fa3c8c2 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
@@ -106,7 +106,6 @@
<flag name='mch'/>
<flag name='mch.extended-tseg-mbytes'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
index 5f2e6c2e5b..6b7c40fb54 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
@@ -80,7 +80,6 @@
<flag name='vhost-vsock'/>
<flag name='tpm-emulator'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
index 19f23f22f1..483962c83b 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
@@ -44,7 +44,6 @@
<flag name='screendump_device'/>
<flag name='vhost-vsock'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='vfio-ap'/>
<flag name='zpci'/>
<flag name='memory-backend-memfd'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
index 237268cb69..daf47aa4b5 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
@@ -106,7 +106,6 @@
<flag name='mch.extended-tseg-mbytes'/>
<flag name='sev-guest'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
index d7fd5742df..28f3a94617 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
@@ -104,7 +104,6 @@
<flag name='mch'/>
<flag name='mch.extended-tseg-mbytes'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
index 5cfce5eaa9..3a16a54ca7 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
@@ -87,7 +87,6 @@
<flag name='vhost-vsock'/>
<flag name='tpm-emulator'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
index b18d0509c2..fe1bffd491 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
@@ -76,7 +76,6 @@
<flag name='hda-output'/>
<flag name='vhost-vsock'/>
<flag name='tpm-emulator'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='nvdimm.unarmed'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
index da548c8beb..3f021441ed 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@@ -104,7 +104,6 @@
<flag name='mch'/>
<flag name='mch.extended-tseg-mbytes'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
index 9a340e2566..45131f0b7f 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
@@ -86,7 +86,6 @@
<flag name='vhost-vsock'/>
<flag name='tpm-emulator'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
index f662cefb42..bbdd01b55a 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
@@ -87,7 +87,6 @@
<flag name='vhost-vsock'/>
<flag name='tpm-emulator'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
index 6f29b29632..047a867766 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
@@ -83,7 +83,6 @@
<flag name='vhost-vsock'/>
<flag name='tpm-emulator'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
index d4b9c16a52..25d9725391 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@@ -104,7 +104,6 @@
<flag name='mch'/>
<flag name='mch.extended-tseg-mbytes'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
index 67d9b23e79..4315241d1d 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
@@ -81,7 +81,6 @@
<flag name='hda-output'/>
<flag name='vhost-vsock'/>
<flag name='tpm-emulator'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='memory-backend-file.pmem'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
index 088c417f4d..bd84750dc5 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@@ -104,7 +104,6 @@
<flag name='mch'/>
<flag name='mch.extended-tseg-mbytes'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
index e5df1832b7..a1fc441412 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
@@ -76,7 +76,6 @@
<flag name='hda-output'/>
<flag name='vhost-vsock'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
index d25f0c50b3..06a01a2c4c 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@@ -103,7 +103,6 @@
<flag name='mch'/>
<flag name='mch.extended-tseg-mbytes'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
index b29c52a643..8ac1529c30 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@@ -104,7 +104,6 @@
<flag name='mch'/>
<flag name='mch.extended-tseg-mbytes'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
index 4aeb210ca7..31300d3d31 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
@@ -70,7 +70,6 @@
<flag name='hda-output'/>
<flag name='vhost-vsock'/>
<flag name='tpm-emulator'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='memory-backend-file.pmem'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
index 20625eee00..c2fa8eb028 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@@ -104,7 +104,6 @@
<flag name='mch'/>
<flag name='mch.extended-tseg-mbytes'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
index a7519021e2..427ee9d5c7 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
@@ -41,7 +41,6 @@
<flag name='screendump_device'/>
<flag name='vhost-vsock'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='vfio-ap'/>
<flag name='zpci'/>
<flag name='memory-backend-memfd'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
index a107d2c8dd..6f8c5a57b7 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@@ -104,7 +104,6 @@
<flag name='mch'/>
<flag name='mch.extended-tseg-mbytes'/>
<flag name='egl-headless'/>
- <flag name='vfio-pci.display'/>
<flag name='memory-backend-memfd'/>
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
--
2.41.0
9:23 a.m.
New subject: [PATCH 11/51] qemuxml2argvtest: Add missing versioned test cases for 'cpu-host-model'
We've forgot to add test invocations with real caps for qemu versions
starting with 6.2.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../cpu-host-model.x86_64-6.2.0.args | 39 +++++++++++++++++++
.../cpu-host-model.x86_64-7.0.0.args | 39 +++++++++++++++++++
.../cpu-host-model.x86_64-7.1.0.args | 39 +++++++++++++++++++
.../cpu-host-model.x86_64-7.2.0.args | 39 +++++++++++++++++++
.../cpu-host-model.x86_64-8.0.0.args | 38 ++++++++++++++++++
tests/qemuxml2argvtest.c | 5 +++
6 files changed, 199 insertions(+)
create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args
new file mode 100644
index 0000000000..f65444948e
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args
@@ -0,0 +1,39 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-q35-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel kvm \
+-cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
+-device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
+-device pcie-root-port,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
+-device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=off \
+-watchdog-action reset \
+-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args
new file mode 100644
index 0000000000..8f8b1645d5
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args
@@ -0,0 +1,39 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-q35-7.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel kvm \
+-cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device
'{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}'
\
+-device
'{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}'
\
+-device
'{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}'
\
+-device
'{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=off \
+-watchdog-action reset \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","addr":"0x0"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args
new file mode 100644
index 0000000000..df03bafab3
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args
@@ -0,0 +1,39 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-q35-7.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel kvm \
+-cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,vmcb-clean=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device
'{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}'
\
+-device
'{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}'
\
+-device
'{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}'
\
+-device
'{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=off \
+-watchdog-action reset \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","addr":"0x0"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args
new file mode 100644
index 0000000000..7a796812fa
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args
@@ -0,0 +1,39 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-q35-7.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel kvm \
+-cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device
'{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}'
\
+-device
'{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}'
\
+-device
'{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}'
\
+-device
'{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=off \
+-watchdog-action reset \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","addr":"0x0"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args
new file mode 100644
index 0000000000..d63438e81c
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-q35-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel kvm \
+-cpu
EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}'
\
+-device
'{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}'
\
+-device
'{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}'
\
+-device
'{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=off \
+-watchdog-action reset \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","addr":"0x0"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 1fe2fafeab..49041e7925 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1813,6 +1813,11 @@ mymain(void)
DO_TEST_CAPS_VER("cpu-host-model", "5.2.0");
DO_TEST_CAPS_VER("cpu-host-model", "6.0.0");
DO_TEST_CAPS_VER("cpu-host-model", "6.1.0");
+ DO_TEST_CAPS_VER("cpu-host-model", "6.2.0");
+ DO_TEST_CAPS_VER("cpu-host-model", "7.0.0");
+ DO_TEST_CAPS_VER("cpu-host-model", "7.1.0");
+ DO_TEST_CAPS_VER("cpu-host-model", "7.2.0");
+ DO_TEST_CAPS_VER("cpu-host-model", "8.0.0");
/* For this specific test we accept the increased likelihood of changes
* if qemu updates the CPU model */
--
2.41.0
9:23 a.m.
New subject: [PATCH 12/51] qemuxml2argvtest: Remove old chardev tests
All tests have already a real capability variant.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../qemuxml2argvdata/console-compat-auto.args | 36 ---------------
.../console-compat-chardev.args | 36 ---------------
tests/qemuxml2argvdata/console-compat.args | 35 --------------
.../parallel-parport-chardev.args | 36 ---------------
.../parallel-tcp-chardev.args | 36 ---------------
.../pci-serial-dev-chardev.args | 36 ---------------
.../serial-dev-chardev-iobase.args | 36 ---------------
.../qemuxml2argvdata/serial-dev-chardev.args | 36 ---------------
.../qemuxml2argvdata/serial-file-chardev.args | 37 ---------------
tests/qemuxml2argvdata/serial-file-log.args | 37 ---------------
.../qemuxml2argvdata/serial-many-chardev.args | 39 ----------------
.../qemuxml2argvdata/serial-pty-chardev.args | 36 ---------------
tests/qemuxml2argvdata/serial-spiceport.args | 38 ---------------
.../qemuxml2argvdata/serial-tcp-chardev.args | 36 ---------------
.../serial-tcp-telnet-chardev.args | 36 ---------------
.../serial-tcp-tlsx509-chardev-verify.args | 39 ----------------
.../serial-tcp-tlsx509-chardev.args | 39 ----------------
.../serial-tcp-tlsx509-secret-chardev.args | 40 ----------------
.../qemuxml2argvdata/serial-udp-chardev.args | 38 ---------------
.../qemuxml2argvdata/serial-unix-chardev.args | 35 --------------
tests/qemuxml2argvdata/serial-vc-chardev.args | 36 ---------------
tests/qemuxml2argvtest.c | 46 -------------------
22 files changed, 819 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/console-compat-auto.args
delete mode 100644 tests/qemuxml2argvdata/console-compat-chardev.args
delete mode 100644 tests/qemuxml2argvdata/console-compat.args
delete mode 100644 tests/qemuxml2argvdata/parallel-parport-chardev.args
delete mode 100644 tests/qemuxml2argvdata/parallel-tcp-chardev.args
delete mode 100644 tests/qemuxml2argvdata/pci-serial-dev-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
delete mode 100644 tests/qemuxml2argvdata/serial-dev-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-file-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-file-log.args
delete mode 100644 tests/qemuxml2argvdata/serial-many-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-pty-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-spiceport.args
delete mode 100644 tests/qemuxml2argvdata/serial-tcp-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-udp-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-unix-chardev.args
delete mode 100644 tests/qemuxml2argvdata/serial-vc-chardev.args
diff --git a/tests/qemuxml2argvdata/console-compat-auto.args
b/tests/qemuxml2argvdata/console-compat-auto.args
deleted file mode 100644
index 12159aca7d..0000000000
--- a/tests/qemuxml2argvdata/console-compat-auto.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev pty,id=charserial0 \
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args
b/tests/qemuxml2argvdata/console-compat-chardev.args
deleted file mode 100644
index 12159aca7d..0000000000
--- a/tests/qemuxml2argvdata/console-compat-chardev.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev pty,id=charserial0 \
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-compat.args
b/tests/qemuxml2argvdata/console-compat.args
deleted file mode 100644
index 69439cba46..0000000000
--- a/tests/qemuxml2argvdata/console-compat.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev pty,id=charserial0 \
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args
b/tests/qemuxml2argvdata/parallel-parport-chardev.args
deleted file mode 100644
index 0ced8a58ac..0000000000
--- a/tests/qemuxml2argvdata/parallel-parport-chardev.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev parallel,id=charparallel0,path=/dev/parport0 \
--device isa-parallel,chardev=charparallel0,id=parallel0 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
deleted file mode 100644
index 6ffc4cbf10..0000000000
--- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev socket,id=charparallel0,host=127.0.0.1,port=9999,server=on,wait=off \
--device isa-parallel,chardev=charparallel0,id=parallel0 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
deleted file mode 100644
index 7dbba6985d..0000000000
--- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev serial,id=charserial0,path=/dev/ttyS2 \
--device pci-serial,chardev=charserial0,id=serial0,bus=pci.0,addr=0x4 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
deleted file mode 100644
index d118e5a204..0000000000
--- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev serial,id=charserial0,path=/dev/ttyS2 \
--device isa-serial,chardev=charserial0,id=serial0,index=0,iobase=1016,irq=4 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args
b/tests/qemuxml2argvdata/serial-dev-chardev.args
deleted file mode 100644
index 67e965d648..0000000000
--- a/tests/qemuxml2argvdata/serial-dev-chardev.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev serial,id=charserial0,path=/dev/ttyS2 \
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args
b/tests/qemuxml2argvdata/serial-file-chardev.args
deleted file mode 100644
index 5e0f9baab8..0000000000
--- a/tests/qemuxml2argvdata/serial-file-chardev.args
+++ /dev/null
@@ -1,37 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--add-fd set=0,fd=1750,opaque=serial0-source \
--chardev file,id=charserial0,path=/dev/fdset/0,append=on \
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-file-log.args
b/tests/qemuxml2argvdata/serial-file-log.args
deleted file mode 100644
index 0068cf98ce..0000000000
--- a/tests/qemuxml2argvdata/serial-file-log.args
+++ /dev/null
@@ -1,37 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--add-fd set=0,fd=1750,opaque=serial0-source \
--add-fd set=1,fd=1751,opaque=serial0-log \
--chardev
file,id=charserial0,path=/dev/fdset/0,append=on,logfile=/dev/fdset/1,logappend=on \
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args
b/tests/qemuxml2argvdata/serial-many-chardev.args
deleted file mode 100644
index 540a97ad65..0000000000
--- a/tests/qemuxml2argvdata/serial-many-chardev.args
+++ /dev/null
@@ -1,39 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev pty,id=charserial0 \
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--add-fd set=0,fd=1750,opaque=serial1-source \
--chardev file,id=charserial1,path=/dev/fdset/0,append=on \
--device isa-serial,chardev=charserial1,id=serial1,index=1 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args
b/tests/qemuxml2argvdata/serial-pty-chardev.args
deleted file mode 100644
index 12159aca7d..0000000000
--- a/tests/qemuxml2argvdata/serial-pty-chardev.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev pty,id=charserial0 \
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-spiceport.args
b/tests/qemuxml2argvdata/serial-spiceport.args
deleted file mode 100644
index ce8356ae48..0000000000
--- a/tests/qemuxml2argvdata/serial-spiceport.args
+++ /dev/null
@@ -1,38 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev spiceport,id=charserial0,name=org.qemu.console.serial.0 \
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--device usb-tablet,id=input0,bus=usb.0,port=1 \
--audiodev
'{"id":"audio1","driver":"spice"}' \
--spice
port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,seamless-migration=on
\
--device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-chardev.args
deleted file mode 100644
index b204fcc650..0000000000
--- a/tests/qemuxml2argvdata/serial-tcp-chardev.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev socket,id=charserial0,host=127.0.0.1,port=9999 \
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
deleted file mode 100644
index e8df25bd92..0000000000
--- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev socket,id=charserial0,host=127.0.0.1,port=9999,telnet=on,server=on,wait=off \
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
deleted file mode 100644
index bbc4b83808..0000000000
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
+++ /dev/null
@@ -1,39 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev udp,id=charserial0,host=127.0.0.1,port=2222,localaddr=127.0.0.1,localport=1111
\
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--object
tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,endpoint=client,verify-peer=on
\
--chardev socket,id=charserial1,host=127.0.0.1,port=5555,tls-creds=objcharserial1_tls0 \
--device isa-serial,chardev=charserial1,id=serial1,index=1 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
deleted file mode 100644
index bbc4b83808..0000000000
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
+++ /dev/null
@@ -1,39 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev udp,id=charserial0,host=127.0.0.1,port=2222,localaddr=127.0.0.1,localport=1111
\
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--object
tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,endpoint=client,verify-peer=on
\
--chardev socket,id=charserial1,host=127.0.0.1,port=5555,tls-creds=objcharserial1_tls0 \
--device isa-serial,chardev=charserial1,id=serial1,index=1 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
deleted file mode 100644
index 292953e184..0000000000
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
+++ /dev/null
@@ -1,40 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev udp,id=charserial0,host=127.0.0.1,port=2222,localaddr=127.0.0.1,localport=1111
\
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--object
secret,id=charserial1-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
--object
tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,endpoint=client,verify-peer=on,passwordid=charserial1-secret0
\
--chardev socket,id=charserial1,host=127.0.0.1,port=5555,tls-creds=objcharserial1_tls0 \
--device isa-serial,chardev=charserial1,id=serial1,index=1 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args
b/tests/qemuxml2argvdata/serial-udp-chardev.args
deleted file mode 100644
index 0bf4f1c7af..0000000000
--- a/tests/qemuxml2argvdata/serial-udp-chardev.args
+++ /dev/null
@@ -1,38 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev udp,id=charserial0,host=127.0.0.1,port=9998,localaddr=127.0.0.1,localport=9999
\
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--chardev udp,id=charserial1,host=,port=9999,localaddr=,localport=0 \
--device isa-serial,chardev=charserial1,id=serial1,index=1 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args
b/tests/qemuxml2argvdata/serial-unix-chardev.args
deleted file mode 100644
index f518b03568..0000000000
--- a/tests/qemuxml2argvdata/serial-unix-chardev.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--chardev socket,id=charserial0,path=/tmp/serial.sock \
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--chardev socket,id=charserial1,fd=1729,server=on,wait=off \
--device isa-serial,chardev=charserial1,id=serial1,index=1 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args
b/tests/qemuxml2argvdata/serial-vc-chardev.args
deleted file mode 100644
index 3d87049879..0000000000
--- a/tests/qemuxml2argvdata/serial-vc-chardev.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev vc,id=charserial0 \
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 49041e7925..fd8339a819 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1423,32 +1423,6 @@ mymain(void)
QEMU_CAPS_KVM,
QEMU_CAPS_DEVICE_VFIO_PCI);
- DO_TEST("serial-file-log",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
- driver.config->spiceTLS = 1;
- DO_TEST("serial-spiceport",
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_SPICE,
- QEMU_CAPS_DEVICE_ISA_SERIAL);
- driver.config->spiceTLS = 0;
-
- DO_TEST("console-compat",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
- DO_TEST("console-compat-auto",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
-
- DO_TEST("serial-vc-chardev",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
- DO_TEST("serial-pty-chardev",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
- DO_TEST("serial-dev-chardev",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
- DO_TEST("serial-dev-chardev-iobase",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
- DO_TEST("serial-file-chardev",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
- DO_TEST("serial-unix-chardev",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST_CAPS_LATEST("serial-file-log");
driver.config->spiceTLS = 1;
DO_TEST_CAPS_LATEST("serial-spiceport");
@@ -1464,45 +1438,25 @@ mymain(void)
DO_TEST_CAPS_LATEST("serial-dev-chardev-iobase");
DO_TEST_CAPS_LATEST("serial-file-chardev");
DO_TEST_CAPS_LATEST("serial-unix-chardev");
- DO_TEST("serial-tcp-chardev",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
- DO_TEST("serial-udp-chardev",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
- DO_TEST("serial-tcp-telnet-chardev",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST_CAPS_LATEST("serial-unix-chardev");
DO_TEST_CAPS_LATEST_PARSE_ERROR("serial-unix-missing-source");
DO_TEST_CAPS_LATEST("serial-tcp-chardev");
DO_TEST_CAPS_LATEST("serial-udp-chardev");
DO_TEST_CAPS_LATEST("serial-tcp-telnet-chardev");
driver.config->chardevTLS = 1;
- DO_TEST("serial-tcp-tlsx509-chardev",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev");
driver.config->chardevTLSx509verify = 1;
- DO_TEST("serial-tcp-tlsx509-chardev-verify",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev-verify");
driver.config->chardevTLSx509verify = 0;
DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev-notls");
driver.config->chardevTLSx509secretUUID =
g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea");
- DO_TEST("serial-tcp-tlsx509-secret-chardev",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-secret-chardev");
VIR_FREE(driver.config->chardevTLSx509secretUUID);
driver.config->chardevTLS = 0;
- DO_TEST("serial-many-chardev",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
- DO_TEST_NOCAPS("parallel-tcp-chardev");
- DO_TEST_NOCAPS("parallel-parport-chardev");
DO_TEST_CAPS_LATEST("serial-many-chardev");
DO_TEST_CAPS_LATEST("parallel-tcp-chardev");
DO_TEST_CAPS_LATEST("parallel-parport-chardev");
DO_TEST_CAPS_LATEST("parallel-unix-chardev");
- DO_TEST("console-compat-chardev",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
- DO_TEST("pci-serial-dev-chardev",
- QEMU_CAPS_DEVICE_PCI_SERIAL);
DO_TEST_CAPS_LATEST("console-compat-chardev");
DO_TEST_CAPS_LATEST("pci-serial-dev-chardev");
--
2.41.0
9:23 a.m.
New subject: [PATCH 13/51] qemuxml2argvtest: Simplify invocation of GIC tests
Change DO_TEST_GIC so that it accepts the version and switch it to use
DO_TEST_CAPS_ARCH_VER_FULL internally which will ensure that the output
filenames conform to the format we use for real capabilities.
This also allows us to convert a few of versioned tests to use this
improved macro.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...ch64-gic-default-both.aarch64-latest.args} | 0
...arch64-gic-default-v2.aarch64-latest.args} | 0
...arch64-gic-default-v3.aarch64-latest.args} | 0
...s => aarch64-gic-host.aarch64-latest.args} | 0
...aarch64-gic-none-both.aarch64-latest.args} | 0
... aarch64-gic-none-tcg.aarch64-latest.args} | 0
...> aarch64-gic-none-v2.aarch64-latest.args} | 0
...> aarch64-gic-none-v3.aarch64-latest.args} | 0
...rgs => aarch64-gic-v2.aarch64-latest.args} | 0
...rgs => aarch64-gic-v3.aarch64-latest.args} | 0
tests/qemuxml2argvtest.c | 79 +++++++------------
11 files changed, 28 insertions(+), 51 deletions(-)
rename tests/qemuxml2argvdata/{aarch64-gic-default-both.args =>
aarch64-gic-default-both.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-default-v2.args =>
aarch64-gic-default-v2.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-default-v3.args =>
aarch64-gic-default-v3.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-host.args =>
aarch64-gic-host.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-none-both.args =>
aarch64-gic-none-both.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-none-tcg.args =>
aarch64-gic-none-tcg.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-none-v2.args =>
aarch64-gic-none-v2.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-none-v3.args =>
aarch64-gic-none-v3.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-v2.args =>
aarch64-gic-v2.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-gic-v3.args =>
aarch64-gic-v3.aarch64-latest.args} (100%)
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.args
b/tests/qemuxml2argvdata/aarch64-gic-default-both.aarch64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-gic-default-both.args
rename to tests/qemuxml2argvdata/aarch64-gic-default-both.aarch64-latest.args
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args
b/tests/qemuxml2argvdata/aarch64-gic-default-v2.aarch64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-gic-default-v2.args
rename to tests/qemuxml2argvdata/aarch64-gic-default-v2.aarch64-latest.args
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args
b/tests/qemuxml2argvdata/aarch64-gic-default-v3.aarch64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-gic-default-v3.args
rename to tests/qemuxml2argvdata/aarch64-gic-default-v3.aarch64-latest.args
diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args
b/tests/qemuxml2argvdata/aarch64-gic-host.aarch64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-gic-host.args
rename to tests/qemuxml2argvdata/aarch64-gic-host.aarch64-latest.args
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.args
b/tests/qemuxml2argvdata/aarch64-gic-none-both.aarch64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-gic-none-both.args
rename to tests/qemuxml2argvdata/aarch64-gic-none-both.aarch64-latest.args
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.aarch64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
rename to tests/qemuxml2argvdata/aarch64-gic-none-tcg.aarch64-latest.args
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args
b/tests/qemuxml2argvdata/aarch64-gic-none-v2.aarch64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-gic-none-v2.args
rename to tests/qemuxml2argvdata/aarch64-gic-none-v2.aarch64-latest.args
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args
b/tests/qemuxml2argvdata/aarch64-gic-none-v3.aarch64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-gic-none-v3.args
rename to tests/qemuxml2argvdata/aarch64-gic-none-v3.aarch64-latest.args
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args
b/tests/qemuxml2argvdata/aarch64-gic-v2.aarch64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-gic-v2.args
rename to tests/qemuxml2argvdata/aarch64-gic-v2.aarch64-latest.args
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args
b/tests/qemuxml2argvdata/aarch64-gic-v3.aarch64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-gic-v3.args
rename to tests/qemuxml2argvdata/aarch64-gic-v3.aarch64-latest.args
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index fd8339a819..92ff7e4b1c 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -877,13 +877,8 @@ mymain(void)
# define DO_TEST_NOCAPS(name) \
DO_TEST_FULL(name, "", ARG_END)
-/* GIC tests use 'latest' capabilities */
-# define DO_TEST_GIC(name, gic) \
- DO_TEST_FULL(name, "", \
- ARG_GIC, gic, \
- ARG_CAPS_ARCH, "aarch64", \
- ARG_CAPS_VER, "latest", \
- ARG_END)
+# define DO_TEST_GIC(name, ver, gic) \
+ DO_TEST_CAPS_ARCH_VER_FULL(name, "aarch64", ver, ARG_GIC, gic, ARG_END)
# define DO_TEST_FAILURE(name, ...) \
DO_TEST_FULL(name, "", \
@@ -2249,50 +2244,32 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio",
"aarch64");
DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-default-nic", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("aarch64-cpu-passthrough", "aarch64");
- DO_TEST_FULL("aarch64-gic-none", ".aarch64-4.2.0",
- ARG_GIC, GIC_NONE,
- ARG_CAPS_ARCH, "aarch64",
- ARG_CAPS_VER, "4.2.0",
- ARG_END);
- DO_TEST_FULL("aarch64-gic-none", ".aarch64-latest",
- ARG_GIC, GIC_NONE,
- ARG_CAPS_ARCH, "aarch64",
- ARG_CAPS_VER, "latest",
- ARG_END);
- DO_TEST_GIC("aarch64-gic-none-v2", GIC_V2);
- DO_TEST_GIC("aarch64-gic-none-v3", GIC_V3);
- DO_TEST_GIC("aarch64-gic-none-both", GIC_BOTH);
- DO_TEST_FULL("aarch64-gic-none-tcg", "",
- ARG_GIC, GIC_BOTH,
- ARG_CAPS_ARCH, "aarch64",
- ARG_CAPS_VER, "latest",
- ARG_QEMU_CAPS_DEL, QEMU_CAPS_KVM, QEMU_CAPS_LAST,
- ARG_END);
- DO_TEST_FULL("aarch64-gic-default", ".aarch64-4.2.0",
- ARG_GIC, GIC_NONE,
- ARG_CAPS_ARCH, "aarch64",
- ARG_CAPS_VER, "4.2.0",
- ARG_END);
- DO_TEST_FULL("aarch64-gic-default", ".aarch64-latest",
- ARG_GIC, GIC_NONE,
- ARG_CAPS_ARCH, "aarch64",
- ARG_CAPS_VER, "latest",
- ARG_END);
- DO_TEST_GIC("aarch64-gic-default-v2", GIC_V2);
- DO_TEST_GIC("aarch64-gic-default-v3", GIC_V3);
- DO_TEST_GIC("aarch64-gic-default-both", GIC_BOTH);
- DO_TEST_GIC("aarch64-gic-v2", GIC_NONE);
- DO_TEST_GIC("aarch64-gic-v2", GIC_V2);
- DO_TEST_GIC("aarch64-gic-v2", GIC_V3);
- DO_TEST_GIC("aarch64-gic-v2", GIC_BOTH);
- DO_TEST_GIC("aarch64-gic-v3", GIC_NONE);
- DO_TEST_GIC("aarch64-gic-v3", GIC_V2);
- DO_TEST_GIC("aarch64-gic-v3", GIC_V3);
- DO_TEST_GIC("aarch64-gic-v3", GIC_BOTH);
- DO_TEST_GIC("aarch64-gic-host", GIC_NONE);
- DO_TEST_GIC("aarch64-gic-host", GIC_V2);
- DO_TEST_GIC("aarch64-gic-host", GIC_V3);
- DO_TEST_GIC("aarch64-gic-host", GIC_BOTH);
+ DO_TEST_GIC("aarch64-gic-none", "4.2.0", GIC_NONE);
+ DO_TEST_GIC("aarch64-gic-none", "latest", GIC_NONE);
+ DO_TEST_GIC("aarch64-gic-none-v2", "latest", GIC_V2);
+ DO_TEST_GIC("aarch64-gic-none-v3", "latest", GIC_V3);
+ DO_TEST_GIC("aarch64-gic-none-both", "latest", GIC_BOTH);
+ DO_TEST_CAPS_ARCH_VER_FULL("aarch64-gic-none-tcg", "aarch64",
"latest",
+ ARG_GIC, GIC_BOTH,
+ ARG_QEMU_CAPS_DEL, QEMU_CAPS_KVM, QEMU_CAPS_LAST,
+ ARG_END);
+ DO_TEST_GIC("aarch64-gic-default", "4.2.0", GIC_NONE);
+ DO_TEST_GIC("aarch64-gic-default", "latest", GIC_NONE);
+ DO_TEST_GIC("aarch64-gic-default-v2", "latest", GIC_V2);
+ DO_TEST_GIC("aarch64-gic-default-v3", "latest", GIC_V3);
+ DO_TEST_GIC("aarch64-gic-default-both", "latest", GIC_BOTH);
+ DO_TEST_GIC("aarch64-gic-v2", "latest", GIC_NONE);
+ DO_TEST_GIC("aarch64-gic-v2", "latest", GIC_V2);
+ DO_TEST_GIC("aarch64-gic-v2", "latest", GIC_V3);
+ DO_TEST_GIC("aarch64-gic-v2", "latest", GIC_BOTH);
+ DO_TEST_GIC("aarch64-gic-v3", "latest", GIC_NONE);
+ DO_TEST_GIC("aarch64-gic-v3", "latest", GIC_V2);
+ DO_TEST_GIC("aarch64-gic-v3", "latest", GIC_V3);
+ DO_TEST_GIC("aarch64-gic-v3", "latest", GIC_BOTH);
+ DO_TEST_GIC("aarch64-gic-host", "latest", GIC_NONE);
+ DO_TEST_GIC("aarch64-gic-host", "latest", GIC_V2);
+ DO_TEST_GIC("aarch64-gic-host", "latest", GIC_V3);
+ DO_TEST_GIC("aarch64-gic-host", "latest", GIC_BOTH);
DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-invalid",
"aarch64");
DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-not-virt",
"aarch64");
DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-not-arm",
"ppc64");
--
2.41.0
9:23 a.m.
New subject: [PATCH 14/51] qemuxml2argvtest: Remove duplicated test invocations
Few tests were invoked multiple times either with identical or
equivalent config. Remove those invocations.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvtest.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 92ff7e4b1c..870902868b 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1371,7 +1371,6 @@ mymain(void)
DO_TEST_PARSE_ERROR_NOCAPS("vhost_queues-invalid");
- DO_TEST_CAPS_LATEST("net-vhostuser");
DO_TEST_CAPS_LATEST("net-vhostuser");
DO_TEST_CAPS_LATEST("net-vhostuser-multiq");
DO_TEST_CAPS_LATEST_FAILURE("net-vhostuser-fail");
@@ -1433,7 +1432,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("serial-dev-chardev-iobase");
DO_TEST_CAPS_LATEST("serial-file-chardev");
DO_TEST_CAPS_LATEST("serial-unix-chardev");
- DO_TEST_CAPS_LATEST("serial-unix-chardev");
DO_TEST_CAPS_LATEST_PARSE_ERROR("serial-unix-missing-source");
DO_TEST_CAPS_LATEST("serial-tcp-chardev");
DO_TEST_CAPS_LATEST("serial-udp-chardev");
@@ -2313,7 +2311,6 @@ mymain(void)
DO_TEST_FAILURE_NOCAPS("memory-align-fail");
DO_TEST_PARSE_ERROR("memory-hotplug-nonuma", QEMU_CAPS_DEVICE_PC_DIMM);
DO_TEST_PARSE_ERROR_NOCAPS("memory-hotplug-invalid-targetnode");
- DO_TEST_NOCAPS("memory-hotplug");
DO_TEST("memory-hotplug", QEMU_CAPS_DEVICE_PC_DIMM);
DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM);
DO_TEST_CAPS_LATEST("memory-hotplug-dimm-addr");
--
2.41.0
9:23 a.m.
New subject: [PATCH 15/51] qemuxml2argvtest: Remove fake-caps invocations of tests which also real caps version
Drop tests which already are tested with real caps, thus the fake caps
version doesn't bring much value.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/cpu-host-model.args | 40 -------------------
.../graphics-egl-headless.args | 33 ---------------
tests/qemuxml2argvtest.c | 9 -----
3 files changed, 82 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.args
delete mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.args
diff --git a/tests/qemuxml2argvdata/cpu-host-model.args
b/tests/qemuxml2argvdata/cpu-host-model.args
deleted file mode 100644
index a35822ada3..0000000000
--- a/tests/qemuxml2argvdata/cpu-host-model.args
+++ /dev/null
@@ -1,40 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine q35,usb=off,dump-guest-core=off \
--accel kvm \
--cpu
core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on
\
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
--device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
--device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \
--device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d
\
--device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \
--device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--global ICH9-LPC.noreboot=off \
--watchdog-action reset \
--device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args
b/tests/qemuxml2argvdata/graphics-egl-headless.args
deleted file mode 100644
index e5ea7bcf2b..0000000000
--- a/tests/qemuxml2argvdata/graphics-egl-headless.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--display egl-headless \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 870902868b..07cc2f9bef 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1292,9 +1292,6 @@ mymain(void)
DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0");
DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations");
- DO_TEST("graphics-egl-headless",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_EGL_HEADLESS);
DO_TEST_CAPS_LATEST("graphics-egl-headless");
DO_TEST_CAPS_LATEST("graphics-egl-headless-rendernode");
@@ -1745,12 +1742,6 @@ mymain(void)
DO_TEST_PARSE_ERROR_NOCAPS("cpu-numa3");
DO_TEST_NOCAPS("cpu-numa-disjoint");
DO_TEST_NOCAPS("cpu-numa-memshared");
- DO_TEST("cpu-host-model",
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_ICH9_USB_EHCI1);
/* host-model cpu expansion depends on the cpu reported by qemu and thus
* we invoke it for all real capability dumps we have */
--
2.41.0
9:23 a.m.
New subject: [PATCH 16/51] qemuxml2argvtest: Use proper version in negative 'virtio-options-memballoon-freepage-reporting' case
The feature is supported since qemu-5.1. Use real qemu-5.0 caps for the
test.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...rtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err} | 0
tests/qemuxml2argvtest.c | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
rename tests/qemuxml2argvdata/{virtio-options-memballoon-freepage-reporting.err =>
virtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err} (100%)
diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.err
b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err
similarity index 100%
rename from tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.err
rename to
tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 07cc2f9bef..840daab25a 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2421,10 +2421,10 @@ mymain(void)
DO_TEST_CAPS_LATEST("virtio-options-input-packed");
DO_TEST_CAPS_LATEST("virtio-options-memballoon-packed");
DO_TEST_CAPS_LATEST("virtio-options-memballoon-freepage-reporting");
+
DO_TEST_CAPS_VER_PARSE_ERROR("virtio-options-memballoon-freepage-reporting",
"5.0.0");
DO_TEST_CAPS_LATEST("virtio-options-net-packed");
DO_TEST_CAPS_LATEST("virtio-options-rng-packed");
DO_TEST_CAPS_LATEST("virtio-options-video-packed");
-
DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-memballoon-freepage-reporting");
DO_TEST_CAPS_LATEST("fd-memory-numa-topology");
DO_TEST_CAPS_LATEST("fd-memory-numa-topology2");
--
2.41.0
9:23 a.m.
New subject: [PATCH 17/51] qemuxml2argvtest: Use real caps for 'cpu-host-model-fallback' test case
Similarly to 'cpu-host-model' add a real capability invocation for each
version we support and remove the old fake caps invocation.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...cpu-host-model-fallback.x86_64-4.2.0.args} | 7 ++--
.../cpu-host-model-fallback.x86_64-5.0.0.args | 33 ++++++++++++++++++
.../cpu-host-model-fallback.x86_64-5.1.0.args | 33 ++++++++++++++++++
.../cpu-host-model-fallback.x86_64-5.2.0.args | 34 +++++++++++++++++++
.../cpu-host-model-fallback.x86_64-6.0.0.args | 34 +++++++++++++++++++
.../cpu-host-model-fallback.x86_64-6.1.0.args | 34 +++++++++++++++++++
.../cpu-host-model-fallback.x86_64-6.2.0.args | 34 +++++++++++++++++++
.../cpu-host-model-fallback.x86_64-7.0.0.args | 34 +++++++++++++++++++
.../cpu-host-model-fallback.x86_64-7.1.0.args | 34 +++++++++++++++++++
.../cpu-host-model-fallback.x86_64-7.2.0.args | 34 +++++++++++++++++++
.../cpu-host-model-fallback.x86_64-8.0.0.args | 33 ++++++++++++++++++
...cpu-host-model-fallback.x86_64-latest.args | 33 ++++++++++++++++++
tests/qemuxml2argvtest.c | 15 ++++++--
13 files changed, 387 insertions(+), 5 deletions(-)
rename tests/qemuxml2argvdata/{cpu-host-model-fallback.args =>
cpu-host-model-fallback.x86_64-4.2.0.args} (63%)
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.0.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-4.2.0.args
similarity index 63%
rename from tests/qemuxml2argvdata/cpu-host-model-fallback.args
rename to tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-4.2.0.args
index 3d09b039f3..cf7ad7b5f4 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-4.2.0.args
@@ -10,9 +10,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-machine pc-i440fx-4.2,usb=off,dump-guest-core=off \
-accel tcg \
--cpu
Conroe,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,monitor=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on
\
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
-m size=219136k \
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
@@ -26,7 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.0.0.args
new file mode 100644
index 0000000000..257b271386
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.0.0.args
@@ -0,0 +1,33 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-machine pc-i440fx-5.0,usb=off,dump-guest-core=off \
+-accel tcg \
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-m size=219136k \
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.args
new file mode 100644
index 0000000000..71551b51a3
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.args
@@ -0,0 +1,33 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-machine pc-i440fx-5.1,usb=off,dump-guest-core=off \
+-accel tcg \
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-m size=219136k \
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.args
new file mode 100644
index 0000000000..834d92c35a
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.args
@@ -0,0 +1,34 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-machine pc-i440fx-5.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-m size=219136k \
+-object memory-backend-ram,id=pc.ram,size=224395264 \
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.args
new file mode 100644
index 0000000000..611bf05482
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.args
@@ -0,0 +1,34 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-i440fx-6.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.args
new file mode 100644
index 0000000000..79ae00e993
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.args
@@ -0,0 +1,34 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-i440fx-6.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.args
new file mode 100644
index 0000000000..9c8331629a
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.args
@@ -0,0 +1,34 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-i440fx-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.args
new file mode 100644
index 0000000000..5929c9a87b
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.args
@@ -0,0 +1,34 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-i440fx-7.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.args
new file mode 100644
index 0000000000..141c2e36eb
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.args
@@ -0,0 +1,34 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-i440fx-7.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args
new file mode 100644
index 0000000000..1e7f444d73
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args
@@ -0,0 +1,34 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-i440fx-7.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args
new file mode 100644
index 0000000000..943b0d477b
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args
@@ -0,0 +1,33 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args
new file mode 100644
index 0000000000..135aed7287
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args
@@ -0,0 +1,33 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,osvw=off,topoext=off,nrip-save=off
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 840daab25a..6222b2edc5 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1757,13 +1757,24 @@ mymain(void)
DO_TEST_CAPS_VER("cpu-host-model", "7.2.0");
DO_TEST_CAPS_VER("cpu-host-model", "8.0.0");
+ DO_TEST_CAPS_VER("cpu-host-model-fallback", "4.2.0");
+ DO_TEST_CAPS_VER("cpu-host-model-fallback", "5.0.0");
+ DO_TEST_CAPS_VER("cpu-host-model-fallback", "5.1.0");
+ DO_TEST_CAPS_VER("cpu-host-model-fallback", "5.2.0");
+ DO_TEST_CAPS_VER("cpu-host-model-fallback", "6.0.0");
+ DO_TEST_CAPS_VER("cpu-host-model-fallback", "6.1.0");
+ DO_TEST_CAPS_VER("cpu-host-model-fallback", "6.2.0");
+ DO_TEST_CAPS_VER("cpu-host-model-fallback", "7.0.0");
+ DO_TEST_CAPS_VER("cpu-host-model-fallback", "7.1.0");
+ DO_TEST_CAPS_VER("cpu-host-model-fallback", "7.2.0");
+ DO_TEST_CAPS_VER("cpu-host-model-fallback", "8.0.0");
+
/* For this specific test we accept the increased likelihood of changes
* if qemu updates the CPU model */
DO_TEST_CAPS_LATEST("cpu-host-model");
+ DO_TEST_CAPS_LATEST("cpu-host-model-fallback");
DO_TEST_NOCAPS("cpu-host-model-vendor");
- DO_TEST_FULL("cpu-host-model-fallback", "",
- ARG_FLAGS, FLAG_SKIP_LEGACY_CPUS, ARG_END);
DO_TEST_FULL("cpu-host-model-nofallback", "",
ARG_FLAGS, FLAG_SKIP_LEGACY_CPUS | FLAG_EXPECT_FAILURE,
ARG_END);
--
2.41.0
9:23 a.m.
New subject: [PATCH 18/51] qemuxml2argvtest: Use real caps for 'cpu-host-model-nofallback' test case
Similarly to 'cpu-host-model' add a real capability invocation for each
version we support and remove the old fake caps invocation.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../cpu-host-model-nofallback.err | 1 -
...pu-host-model-nofallback.x86_64-4.2.0.args | 33 ++++++++++++++++++
...pu-host-model-nofallback.x86_64-5.0.0.args | 33 ++++++++++++++++++
...pu-host-model-nofallback.x86_64-5.1.0.args | 33 ++++++++++++++++++
...pu-host-model-nofallback.x86_64-5.2.0.args | 34 +++++++++++++++++++
...pu-host-model-nofallback.x86_64-6.0.0.args | 34 +++++++++++++++++++
...pu-host-model-nofallback.x86_64-6.1.0.args | 34 +++++++++++++++++++
...pu-host-model-nofallback.x86_64-6.2.0.args | 34 +++++++++++++++++++
...pu-host-model-nofallback.x86_64-7.0.0.args | 34 +++++++++++++++++++
...pu-host-model-nofallback.x86_64-7.1.0.args | 34 +++++++++++++++++++
...pu-host-model-nofallback.x86_64-7.2.0.args | 34 +++++++++++++++++++
...pu-host-model-nofallback.x86_64-8.0.0.args | 33 ++++++++++++++++++
...u-host-model-nofallback.x86_64-latest.args | 33 ++++++++++++++++++
tests/qemuxml2argvtest.c | 16 +++++++--
14 files changed, 416 insertions(+), 4 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.err
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-4.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.0.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.1.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.0.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.1.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.0.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.1.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.args
create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.err
b/tests/qemuxml2argvdata/cpu-host-model-nofallback.err
deleted file mode 100644
index 35fa03a5a4..0000000000
--- a/tests/qemuxml2argvdata/cpu-host-model-nofallback.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: CPU model core2duo is not supported by hypervisor
diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-4.2.0.args
b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-4.2.0.args
new file mode 100644
index 0000000000..cf7ad7b5f4
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-4.2.0.args
@@ -0,0 +1,33 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-machine pc-i440fx-4.2,usb=off,dump-guest-core=off \
+-accel tcg \
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-m size=219136k \
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.0.0.args
new file mode 100644
index 0000000000..257b271386
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.0.0.args
@@ -0,0 +1,33 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-machine pc-i440fx-5.0,usb=off,dump-guest-core=off \
+-accel tcg \
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-m size=219136k \
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.1.0.args
b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.1.0.args
new file mode 100644
index 0000000000..71551b51a3
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.1.0.args
@@ -0,0 +1,33 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-machine pc-i440fx-5.1,usb=off,dump-guest-core=off \
+-accel tcg \
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-m size=219136k \
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.2.0.args
b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.2.0.args
new file mode 100644
index 0000000000..834d92c35a
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.2.0.args
@@ -0,0 +1,34 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-machine pc-i440fx-5.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-m size=219136k \
+-object memory-backend-ram,id=pc.ram,size=224395264 \
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.0.0.args
new file mode 100644
index 0000000000..611bf05482
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.0.0.args
@@ -0,0 +1,34 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-i440fx-6.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.1.0.args
b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.1.0.args
new file mode 100644
index 0000000000..79ae00e993
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.1.0.args
@@ -0,0 +1,34 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-i440fx-6.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.2.0.args
b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.2.0.args
new file mode 100644
index 0000000000..9c8331629a
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.2.0.args
@@ -0,0 +1,34 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-i440fx-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.0.0.args
new file mode 100644
index 0000000000..5929c9a87b
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.0.0.args
@@ -0,0 +1,34 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-i440fx-7.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.1.0.args
b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.1.0.args
new file mode 100644
index 0000000000..141c2e36eb
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.1.0.args
@@ -0,0 +1,34 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-i440fx-7.1,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,rdrand=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,umip=on,pku=on,la57=on,pks=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,vgif=on,svme-addr-chk=on,misalignsse=off
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.0.args
b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.0.args
new file mode 100644
index 0000000000..1e7f444d73
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.0.args
@@ -0,0 +1,34 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-i440fx-7.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.args
new file mode 100644
index 0000000000..943b0d477b
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.args
@@ -0,0 +1,33 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,rdseed=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-latest.args
b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-latest.args
new file mode 100644
index 0000000000..135aed7287
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-latest.args
@@ -0,0 +1,33 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu
EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,umip=on,pku=on,vaes=on,la57=on,rdpid=on,pks=on,fsrm=on,fzrm=on,fsrs=on,fsrc=on,3dnowext=on,3dnow=on,xsaveerptr=on,wbnoinvd=on,npt=on,vgif=on,svme-addr-chk=on,vme=off,sha-ni=off,xsavec=off,fxsr-opt=off,misalignsse=off,osvw=off,topoext=off,nrip-save=off
\
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 6222b2edc5..a8f476b551 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1769,15 +1769,25 @@ mymain(void)
DO_TEST_CAPS_VER("cpu-host-model-fallback", "7.2.0");
DO_TEST_CAPS_VER("cpu-host-model-fallback", "8.0.0");
+ DO_TEST_CAPS_VER("cpu-host-model-nofallback", "4.2.0");
+ DO_TEST_CAPS_VER("cpu-host-model-nofallback", "5.0.0");
+ DO_TEST_CAPS_VER("cpu-host-model-nofallback", "5.1.0");
+ DO_TEST_CAPS_VER("cpu-host-model-nofallback", "5.2.0");
+ DO_TEST_CAPS_VER("cpu-host-model-nofallback", "6.0.0");
+ DO_TEST_CAPS_VER("cpu-host-model-nofallback", "6.1.0");
+ DO_TEST_CAPS_VER("cpu-host-model-nofallback", "6.2.0");
+ DO_TEST_CAPS_VER("cpu-host-model-nofallback", "7.0.0");
+ DO_TEST_CAPS_VER("cpu-host-model-nofallback", "7.1.0");
+ DO_TEST_CAPS_VER("cpu-host-model-nofallback", "7.2.0");
+ DO_TEST_CAPS_VER("cpu-host-model-nofallback", "8.0.0");
+
/* For this specific test we accept the increased likelihood of changes
* if qemu updates the CPU model */
DO_TEST_CAPS_LATEST("cpu-host-model");
DO_TEST_CAPS_LATEST("cpu-host-model-fallback");
+ DO_TEST_CAPS_LATEST("cpu-host-model-nofallback");
DO_TEST_NOCAPS("cpu-host-model-vendor");
- DO_TEST_FULL("cpu-host-model-nofallback", "",
- ARG_FLAGS, FLAG_SKIP_LEGACY_CPUS | FLAG_EXPECT_FAILURE,
- ARG_END);
DO_TEST("cpu-host-passthrough", QEMU_CAPS_KVM);
DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM);
--
2.41.0
9:23 a.m.
New subject: [PATCH 19/51] qemuxml2argvtest: Remove FLAG_SKIP_LEGACY_CPUS
Remove the notion of legacy cpus as there are no test cases using it any
more.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvtest.c | 27 +++++----------------------
tests/testutilsqemu.h | 5 ++---
2 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index a8f476b551..a6a1646efb 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -257,18 +257,16 @@ static virNWFilterDriver fakeNWFilterDriver = {
static int
-testAddCPUModels(virQEMUCaps *caps, bool skipLegacy)
+testAddCPUModels(virQEMUCaps *caps)
{
virArch arch = virQEMUCapsGetArch(caps);
const char *x86Models[] = {
- "Opteron_G3", "Opteron_G2", "Opteron_G1",
- "Nehalem", "Penryn", "Conroe",
- "Haswell-noTSX", "Haswell",
- };
- const char *x86LegacyModels[] = {
"n270", "athlon", "pentium3", "pentium2",
"pentium",
"486", "coreduo", "kvm32", "qemu32",
"kvm64",
"core2duo", "phenom", "qemu64",
+ "Opteron_G3", "Opteron_G2", "Opteron_G1",
+ "Nehalem", "Penryn", "Conroe",
+ "Haswell-noTSX", "Haswell",
};
if (ARCH_IS_X86(arch)) {
@@ -279,18 +277,6 @@ testAddCPUModels(virQEMUCaps *caps, bool skipLegacy)
G_N_ELEMENTS(x86Models),
VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0)
return -1;
-
- if (!skipLegacy) {
- if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM,
- x86LegacyModels,
- G_N_ELEMENTS(x86LegacyModels),
- VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0 ||
- virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_QEMU,
- x86LegacyModels,
- G_N_ELEMENTS(x86LegacyModels),
- VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0)
- return -1;
- }
}
return 0;
@@ -313,8 +299,7 @@ testUpdateQEMUCaps(const struct testQemuInfo *info,
virQEMUCapsSetArch(info->qemuCaps, arch);
- if (testAddCPUModels(info->qemuCaps,
- !!(info->flags & FLAG_SKIP_LEGACY_CPUS)) < 0)
+ if (testAddCPUModels(info->qemuCaps) < 0)
return -1;
testUpdateQEMUCapsHostCPUModel(info->qemuCaps, caps->host.arch);
@@ -330,11 +315,9 @@ testCheckExclusiveFlags(int flags)
FLAG_EXPECT_PARSE_ERROR |
FLAG_FIPS_HOST |
FLAG_REAL_CAPS |
- FLAG_SKIP_LEGACY_CPUS |
FLAG_SLIRP_HELPER |
0, -1);
- VIR_EXCLUSIVE_FLAGS_RET(FLAG_REAL_CAPS, FLAG_SKIP_LEGACY_CPUS, -1);
return 0;
}
diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h
index 7845ac7cb6..89d40ce9bc 100644
--- a/tests/testutilsqemu.h
+++ b/tests/testutilsqemu.h
@@ -57,9 +57,8 @@ typedef enum {
FLAG_EXPECT_PARSE_ERROR = 1 << 1,
FLAG_FIPS_HOST = 1 << 2, /* simulate host with FIPS mode enabled */
FLAG_REAL_CAPS = 1 << 3,
- FLAG_SKIP_LEGACY_CPUS = 1 << 4,
- FLAG_SLIRP_HELPER = 1 << 5,
- FLAG_SKIP_CONFIG_ACTIVE = 1 << 6, /* Skip 'active' config test in
qemuxml2xmltest */
+ FLAG_SLIRP_HELPER = 1 << 4,
+ FLAG_SKIP_CONFIG_ACTIVE = 1 << 5, /* Skip 'active' config test in
qemuxml2xmltest */
} testQemuInfoFlags;
struct testQemuConf {
--
2.41.0
9:23 a.m.
New subject: [PATCH 20/51] qemuxml2argvtest: Enable JSON syntax for -device, -object, and -netdev for all fake-caps tests
To minimize upcoming churn in test data when they will be converted to
latest capabilities enable JSON syntax for -device, -object, and -netdev
for all fake caps test files. Doing this should also help git track
renames of the files better as there will be more of consistent context
present.
We can do this safely as internally we generate JSON first and then
back-convert it into the old-style commandline if given qemu doesn't
support it. This means that all generated content will be the same.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/acpi-table.args | 2 +-
tests/qemuxml2argvdata/autoindex.args | 62 ++---
.../qemuxml2argvdata/balloon-device-auto.args | 6 +-
.../balloon-device-deflate-off.args | 6 +-
.../balloon-device-deflate.args | 6 +-
.../balloon-device-period.args | 6 +-
tests/qemuxml2argvdata/balloon-device.args | 6 +-
tests/qemuxml2argvdata/blkiotune-device.args | 6 +-
tests/qemuxml2argvdata/blkiotune.args | 6 +-
tests/qemuxml2argvdata/channel-guestfwd.args | 8 +-
tests/qemuxml2argvdata/channel-spicevmc.args | 12 +-
.../qemuxml2argvdata/channel-virtio-auto.args | 24 +-
.../channel-virtio-autoadd.args | 22 +-
.../channel-virtio-autoassign.args | 22 +-
.../channel-virtio-default.args | 16 +-
.../channel-virtio-state.args | 14 +-
.../qemuxml2argvdata/channel-virtio-unix.args | 16 +-
tests/qemuxml2argvdata/channel-virtio.args | 10 +-
tests/qemuxml2argvdata/chardev-reconnect.args | 20 +-
tests/qemuxml2argvdata/clock-catchup.args | 6 +-
tests/qemuxml2argvdata/clock-france.args | 6 +-
tests/qemuxml2argvdata/clock-hpet-off.args | 6 +-
.../clock-localtime-basis-localtime.args | 6 +-
tests/qemuxml2argvdata/clock-localtime.args | 4 +-
.../clock-timer-hyperv-rtc.args | 4 +-
tests/qemuxml2argvdata/clock-utc.args | 4 +-
tests/qemuxml2argvdata/clock-variable.args | 6 +-
.../qemuxml2argvdata/console-virtio-many.args | 16 +-
tests/qemuxml2argvdata/console-virtio.args | 10 +-
tests/qemuxml2argvdata/controller-order.args | 36 +--
tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 4 +-
tests/qemuxml2argvdata/cpu-Haswell.args | 4 +-
tests/qemuxml2argvdata/cpu-Haswell2.args | 4 +-
tests/qemuxml2argvdata/cpu-Haswell3.args | 4 +-
tests/qemuxml2argvdata/cpu-cache-disable.args | 4 +-
.../qemuxml2argvdata/cpu-cache-disable3.args | 4 +-
.../cpu-cache-emulate-l3.args | 4 +-
.../cpu-cache-passthrough.args | 4 +-
.../cpu-check-default-none.args | 4 +-
.../cpu-check-default-none2.args | 4 +-
.../cpu-check-default-partial.args | 4 +-
.../cpu-check-default-partial2.args | 4 +-
tests/qemuxml2argvdata/cpu-check-none.args | 4 +-
tests/qemuxml2argvdata/cpu-exact1.args | 4 +-
.../cpu-exact2-nofallback.args | 4 +-
tests/qemuxml2argvdata/cpu-exact2.args | 4 +-
tests/qemuxml2argvdata/cpu-fallback.args | 4 +-
tests/qemuxml2argvdata/cpu-host-kvmclock.args | 4 +-
.../qemuxml2argvdata/cpu-host-model-cmt.args | 4 +-
.../cpu-host-model-vendor.args | 4 +-
.../cpu-host-passthrough-features.args | 6 +-
.../cpu-host-passthrough.args | 4 +-
tests/qemuxml2argvdata/cpu-kvmclock.args | 4 +-
tests/qemuxml2argvdata/cpu-minimum1.args | 4 +-
tests/qemuxml2argvdata/cpu-minimum2.args | 4 +-
.../cpu-no-removed-features.args | 4 +-
tests/qemuxml2argvdata/cpu-numa-disjoint.args | 4 +-
.../qemuxml2argvdata/cpu-numa-memshared.args | 8 +-
.../cpu-numa-no-memory-element.args | 4 +-
tests/qemuxml2argvdata/cpu-numa1.args | 4 +-
tests/qemuxml2argvdata/cpu-numa2.args | 4 +-
.../cpu-phys-bits-emulate.args | 4 +-
.../cpu-phys-bits-emulate2.args | 4 +-
.../cpu-phys-bits-passthrough.args | 4 +-
tests/qemuxml2argvdata/cpu-strict1.args | 4 +-
tests/qemuxml2argvdata/cpu-topology1.args | 4 +-
tests/qemuxml2argvdata/cpu-topology2.args | 4 +-
tests/qemuxml2argvdata/cpu-topology3.args | 4 +-
tests/qemuxml2argvdata/cpu-tsc-frequency.args | 4 +-
.../default-kvm-host-arch.args | 4 +-
.../default-qemu-host-arch.args | 4 +-
.../graphics-sdl-fullscreen.args | 6 +-
tests/qemuxml2argvdata/graphics-sdl.args | 6 +-
.../hostdev-mdev-precreated.args | 4 +-
.../hostdev-pci-address-unassigned.args | 10 +-
.../hostdev-pci-multifunction.args | 18 +-
.../hostdev-scsi-vhost-scsi-pci.args | 10 +-
.../hostdev-vfio-multidomain.args | 8 +-
tests/qemuxml2argvdata/hostdev-vfio.args | 8 +-
tests/qemuxml2argvdata/hotplug-base.args | 6 +-
.../qemuxml2argvdata/input-usbmouse-addr.args | 8 +-
tests/qemuxml2argvdata/input-usbmouse.args | 6 +-
tests/qemuxml2argvdata/input-usbtablet.args | 6 +-
tests/qemuxml2argvdata/kvm-pit-delay.args | 6 +-
tests/qemuxml2argvdata/kvm-pit-discard.args | 6 +-
tests/qemuxml2argvdata/kvmclock.args | 2 +-
tests/qemuxml2argvdata/machine-aliases1.args | 6 +-
tests/qemuxml2argvdata/machine-aliases2.args | 6 +-
tests/qemuxml2argvdata/machine-core-off.args | 4 +-
tests/qemuxml2argvdata/machine-core-on.args | 4 +-
.../qemuxml2argvdata/machine-vmport-opt.args | 6 +-
.../qemuxml2argvdata/memory-hotplug-dimm.args | 14 +-
tests/qemuxml2argvdata/memory-hotplug.args | 6 +-
tests/qemuxml2argvdata/memtune-unlimited.args | 6 +-
tests/qemuxml2argvdata/memtune.args | 6 +-
tests/qemuxml2argvdata/minimal.args | 6 +-
tests/qemuxml2argvdata/misc-acpi.args | 4 +-
tests/qemuxml2argvdata/misc-disable-s3.args | 4 +-
.../misc-disable-suspends.args | 4 +-
tests/qemuxml2argvdata/misc-enable-s4.args | 4 +-
tests/qemuxml2argvdata/misc-uuid.args | 4 +-
.../multifunction-pci-device.args | 24 +-
tests/qemuxml2argvdata/nosharepages.args | 4 +-
.../numad-auto-memory-vcpu-cpuset.args | 6 +-
...o-memory-vcpu-no-cpuset-and-placement.args | 6 +-
.../numad-auto-vcpu-static-numatune.args | 6 +-
.../numad-static-memory-auto-vcpu.args | 6 +-
tests/qemuxml2argvdata/numad.args | 6 +-
.../numatune-auto-nodeset-invalid.args | 6 +-
.../numatune-auto-prefer.args | 4 +-
.../qemuxml2argvdata/numatune-distances.args | 4 +-
.../numatune-memnode-no-memory.args | 8 +-
tests/qemuxml2argvdata/numatune-memnode.args | 10 +-
tests/qemuxml2argvdata/numatune-memory.args | 6 +-
tests/qemuxml2argvdata/pci-autoadd-addr.args | 22 +-
tests/qemuxml2argvdata/pci-autoadd-idx.args | 24 +-
tests/qemuxml2argvdata/pci-autofill-addr.args | 8 +-
.../pci-bridge-many-disks.args | 218 +++++++++---------
tests/qemuxml2argvdata/pci-bridge.args | 140 +++++------
tests/qemuxml2argvdata/pci-expander-bus.args | 136 +++++------
tests/qemuxml2argvdata/pci-many.args | 64 ++---
tests/qemuxml2argvdata/pci-rom-disabled.args | 6 +-
tests/qemuxml2argvdata/pci-rom.args | 18 +-
tests/qemuxml2argvdata/pcie-expander-bus.args | 202 ++++++++--------
.../pcie-root-port-model-generic.args | 8 +-
.../pcie-root-port-model-ioh3420.args | 6 +-
tests/qemuxml2argvdata/pcie-root-port.args | 10 +-
tests/qemuxml2argvdata/pcie-root.args | 2 +-
.../pcie-switch-downstream-port.args | 26 +--
.../pcie-switch-upstream-port.args | 14 +-
tests/qemuxml2argvdata/pcihole64-q35.args | 6 +-
tests/qemuxml2argvdata/pcihole64.args | 4 +-
tests/qemuxml2argvdata/pmu-feature-off.args | 2 +-
tests/qemuxml2argvdata/pmu-feature.args | 2 +-
.../q35-pci-force-address.args | 16 +-
tests/qemuxml2argvdata/q35-usb2-multi.args | 34 +--
tests/qemuxml2argvdata/q35-usb2-reorder.args | 34 +--
tests/qemuxml2argvdata/q35-usb2.args | 18 +-
tests/qemuxml2argvdata/q35.args | 14 +-
tests/qemuxml2argvdata/qemu-ns-alt.args | 6 +-
.../qemu-ns-commandline-ns0.args | 6 +-
.../qemu-ns-commandline-ns1.args | 6 +-
.../qemuxml2argvdata/qemu-ns-commandline.args | 6 +-
.../qemu-ns-domain-commandline-ns0.args | 6 +-
.../qemu-ns-domain-commandline.args | 6 +-
.../qemuxml2argvdata/qemu-ns-domain-ns0.args | 6 +-
tests/qemuxml2argvdata/qemu-ns-no-env.args | 4 +-
.../reboot-timeout-disabled.args | 2 +-
.../reboot-timeout-enabled.args | 2 +-
tests/qemuxml2argvdata/seclabel-dac-none.args | 6 +-
.../seclabel-dynamic-baselabel.args | 6 +-
.../seclabel-dynamic-labelskip.args | 6 +-
.../seclabel-dynamic-override.args | 8 +-
.../seclabel-dynamic-relabel.args | 6 +-
tests/qemuxml2argvdata/seclabel-dynamic.args | 6 +-
tests/qemuxml2argvdata/seclabel-none.args | 6 +-
.../seclabel-static-labelskip.args | 6 +-
.../seclabel-static-relabel.args | 6 +-
tests/qemuxml2argvdata/seclabel-static.args | 6 +-
.../smartcard-controller.args | 8 +-
.../smartcard-host-certificates-database.args | 8 +-
.../smartcard-host-certificates.args | 8 +-
tests/qemuxml2argvdata/smartcard-host.args | 8 +-
.../smartcard-passthrough-spicevmc.args | 10 +-
.../smartcard-passthrough-tcp.args | 8 +-
tests/qemuxml2argvdata/smbios.args | 6 +-
tests/qemuxml2argvdata/smp-dies.args | 4 +-
tests/qemuxml2argvdata/smp.args | 4 +-
.../usb-controller-default-q35.args | 4 +-
.../usb-controller-explicit-q35.args | 4 +-
.../usb-controller-qemu-xhci.args | 4 +-
.../qemuxml2argvdata/usb-controller-xhci.args | 4 +-
tests/qemuxml2argvdata/usb-controller.args | 4 +-
.../usb-hub-autoadd-deluxe.args | 42 ++--
tests/qemuxml2argvdata/usb-hub-autoadd.args | 14 +-
tests/qemuxml2argvdata/usb-hub.args | 6 +-
.../qemuxml2argvdata/usb-ich9-autoassign.args | 22 +-
.../qemuxml2argvdata/usb-ich9-companion.args | 12 +-
.../qemuxml2argvdata/usb-ich9-ehci-addr.args | 28 +--
.../qemuxml2argvdata/usb-long-port-path.args | 12 +-
tests/qemuxml2argvdata/usb-none.args | 4 +-
.../usb-piix3-controller.args | 6 +-
.../qemuxml2argvdata/usb-port-autoassign.args | 14 +-
tests/qemuxml2argvdata/usb-port-missing.args | 10 +-
tests/qemuxml2argvdata/usb-ports.args | 14 +-
tests/qemuxml2argvdata/usb-redir-boot.args | 18 +-
.../usb-redir-filter-version.args | 10 +-
tests/qemuxml2argvdata/usb-redir-filter.args | 18 +-
tests/qemuxml2argvdata/usb-redir.args | 18 +-
.../qemuxml2argvdata/usb-xhci-autoassign.args | 14 +-
tests/qemuxml2argvdata/usb1-usb2.args | 30 +--
.../virtio-input-passthrough.args | 6 +-
tests/qemuxml2argvdata/virtio-input.args | 10 +-
.../qemuxml2argvdata/virtio-rng-default.args | 8 +-
tests/qemuxml2argvdata/virtio-rng-egd.args | 8 +-
.../qemuxml2argvdata/virtio-rng-multiple.args | 12 +-
tests/qemuxml2argvdata/virtio-rng-random.args | 8 +-
tests/qemuxml2argvdata/vmcoreinfo.args | 8 +-
tests/qemuxml2argvtest.c | 17 +-
199 files changed, 1223 insertions(+), 1210 deletions(-)
diff --git a/tests/qemuxml2argvdata/acpi-table.args
b/tests/qemuxml2argvdata/acpi-table.args
index 6819a8573b..88a9c97e79 100644
--- a/tests/qemuxml2argvdata/acpi-table.args
+++ b/tests/qemuxml2argvdata/acpi-table.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
diff --git a/tests/qemuxml2argvdata/autoindex.args
b/tests/qemuxml2argvdata/autoindex.args
index 87d98012e4..3d7bffff7f 100644
--- a/tests/qemuxml2argvdata/autoindex.args
+++ b/tests/qemuxml2argvdata/autoindex.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}'
\
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -25,38 +25,38 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
--device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
--device x3130-upstream,id=pci.4,bus=pci.3,addr=0x0 \
--device xio3130-downstream,port=0,chassis=5,id=pci.5,bus=pci.4,addr=0x0 \
--device xio3130-downstream,port=1,chassis=6,id=pci.6,bus=pci.4,addr=0x1 \
--device xio3130-downstream,port=2,chassis=7,id=pci.7,bus=pci.4,addr=0x2 \
--device xio3130-downstream,port=3,chassis=8,id=pci.8,bus=pci.4,addr=0x3 \
--device xio3130-downstream,port=4,chassis=9,id=pci.9,bus=pci.4,addr=0x4 \
--device xio3130-downstream,port=5,chassis=10,id=pci.10,bus=pci.4,addr=0x5 \
--device xio3130-downstream,port=6,chassis=11,id=pci.11,bus=pci.4,addr=0x6 \
--device xio3130-downstream,port=7,chassis=12,id=pci.12,bus=pci.4,addr=0x7 \
--device xio3130-downstream,port=8,chassis=13,id=pci.13,bus=pci.4,addr=0x8 \
--device xio3130-downstream,port=9,chassis=14,id=pci.14,bus=pci.4,addr=0x9 \
--device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \
--device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d
\
--device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \
--device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \
--device ich9-usb-ehci1,id=usb1,bus=pcie.0,addr=0x1a.0x7 \
--device ich9-usb-uhci1,masterbus=usb1.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1a
\
--device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.2,multifunction=on,addr=0x1
\
--device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.2,addr=0x1.0x1 \
--device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.2,addr=0x1.0x2 \
--device ich9-usb-ehci1,id=usb2,bus=pci.2,addr=0x1.0x7 \
--device nec-usb-xhci,id=usb3,bus=pci.5,addr=0x0 \
--device ich9-usb-uhci1,masterbus=usb4.0,firstport=0,bus=pci.2,multifunction=on,addr=0x2
\
--device ich9-usb-uhci2,masterbus=usb4.0,firstport=2,bus=pci.2,addr=0x2.0x1 \
--device ich9-usb-uhci3,masterbus=usb4.0,firstport=4,bus=pci.2,addr=0x2.0x2 \
--device ich9-usb-ehci1,id=usb4,bus=pci.2,addr=0x2.0x7 \
+-device
'{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}'
\
+-device
'{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1"}'
\
+-device
'{"driver":"x3130-upstream","id":"pci.4","bus":"pci.3","addr":"0x0"}'
\
+-device
'{"driver":"xio3130-downstream","port":0,"chassis":5,"id":"pci.5","bus":"pci.4","addr":"0x0"}'
\
+-device
'{"driver":"xio3130-downstream","port":1,"chassis":6,"id":"pci.6","bus":"pci.4","addr":"0x1"}'
\
+-device
'{"driver":"xio3130-downstream","port":2,"chassis":7,"id":"pci.7","bus":"pci.4","addr":"0x2"}'
\
+-device
'{"driver":"xio3130-downstream","port":3,"chassis":8,"id":"pci.8","bus":"pci.4","addr":"0x3"}'
\
+-device
'{"driver":"xio3130-downstream","port":4,"chassis":9,"id":"pci.9","bus":"pci.4","addr":"0x4"}'
\
+-device
'{"driver":"xio3130-downstream","port":5,"chassis":10,"id":"pci.10","bus":"pci.4","addr":"0x5"}'
\
+-device
'{"driver":"xio3130-downstream","port":6,"chassis":11,"id":"pci.11","bus":"pci.4","addr":"0x6"}'
\
+-device
'{"driver":"xio3130-downstream","port":7,"chassis":12,"id":"pci.12","bus":"pci.4","addr":"0x7"}'
\
+-device
'{"driver":"xio3130-downstream","port":8,"chassis":13,"id":"pci.13","bus":"pci.4","addr":"0x8"}'
\
+-device
'{"driver":"xio3130-downstream","port":9,"chassis":14,"id":"pci.14","bus":"pci.4","addr":"0x9"}'
\
+-device
'{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d.0x7"}'
\
+-device
'{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pcie.0","multifunction":true,"addr":"0x1d"}'
\
+-device
'{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pcie.0","addr":"0x1d.0x1"}'
\
+-device
'{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pcie.0","addr":"0x1d.0x2"}'
\
+-device
'{"driver":"ich9-usb-ehci1","id":"usb1","bus":"pcie.0","addr":"0x1a.0x7"}'
\
+-device
'{"driver":"ich9-usb-uhci1","masterbus":"usb1.0","firstport":0,"bus":"pcie.0","multifunction":true,"addr":"0x1a"}'
\
+-device
'{"driver":"ich9-usb-uhci1","masterbus":"usb2.0","firstport":0,"bus":"pci.2","multifunction":true,"addr":"0x1"}'
\
+-device
'{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bus":"pci.2","addr":"0x1.0x1"}'
\
+-device
'{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bus":"pci.2","addr":"0x1.0x2"}'
\
+-device
'{"driver":"ich9-usb-ehci1","id":"usb2","bus":"pci.2","addr":"0x1.0x7"}'
\
+-device
'{"driver":"nec-usb-xhci","id":"usb3","bus":"pci.5","addr":"0x0"}'
\
+-device
'{"driver":"ich9-usb-uhci1","masterbus":"usb4.0","firstport":0,"bus":"pci.2","multifunction":true,"addr":"0x2"}'
\
+-device
'{"driver":"ich9-usb-uhci2","masterbus":"usb4.0","firstport":2,"bus":"pci.2","addr":"0x2.0x1"}'
\
+-device
'{"driver":"ich9-usb-uhci3","masterbus":"usb4.0","firstport":4,"bus":"pci.2","addr":"0x2.0x2"}'
\
+-device
'{"driver":"ich9-usb-ehci1","id":"usb4","bus":"pci.2","addr":"0x2.0x7"}'
\
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-global ICH9-LPC.noreboot=off \
-watchdog-action reset \
diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args
b/tests/qemuxml2argvdata/balloon-device-auto.args
index 5078429e1b..86af73f198 100644
--- a/tests/qemuxml2argvdata/balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/balloon-device-auto.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
index c1acd2f6b6..dbee8dab7b 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,deflate-on-oom=off,bus=pci.0,addr=0x12 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","deflate-on-oom":false,"bus":"pci.0","addr":"0x12"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args
b/tests/qemuxml2argvdata/balloon-device-deflate.args
index a5017e6657..c7ed5f1698 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,deflate-on-oom=on,bus=pci.0,addr=0x12 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","deflate-on-oom":true,"bus":"pci.0","addr":"0x12"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device-period.args
b/tests/qemuxml2argvdata/balloon-device-period.args
index 517d83feab..5de1090233 100644
--- a/tests/qemuxml2argvdata/balloon-device-period.args
+++ b/tests/qemuxml2argvdata/balloon-device-period.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x12"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device.args
b/tests/qemuxml2argvdata/balloon-device.args
index 517d83feab..5de1090233 100644
--- a/tests/qemuxml2argvdata/balloon-device.args
+++ b/tests/qemuxml2argvdata/balloon-device.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x12"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/blkiotune-device.args
b/tests/qemuxml2argvdata/blkiotune-device.args
index 5078429e1b..86af73f198 100644
--- a/tests/qemuxml2argvdata/blkiotune-device.args
+++ b/tests/qemuxml2argvdata/blkiotune-device.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/blkiotune.args
b/tests/qemuxml2argvdata/blkiotune.args
index 5078429e1b..86af73f198 100644
--- a/tests/qemuxml2argvdata/blkiotune.args
+++ b/tests/qemuxml2argvdata/blkiotune.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args
b/tests/qemuxml2argvdata/channel-guestfwd.args
index bdd413d4bf..147c54348f 100644
--- a/tests/qemuxml2argvdata/channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/channel-guestfwd.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,9 +28,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-chardev pipe,id=charchannel0,path=/tmp/guestfwd \
--netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=channel0 \
+-netdev
'{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4600-chardev:charchannel0"}],"id":"channel0"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args
b/tests/qemuxml2argvdata/channel-spicevmc.args
index da36b815b0..009abf0b09 100644
--- a/tests/qemuxml2argvdata/channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/channel-spicevmc.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -24,15 +24,15 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}'
\
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-chardev spicevmc,id=charchannel0,name=vdagent \
--device
virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=com.redhat.spice.0
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chardev":"charchannel0","id":"channel0","name":"com.redhat.spice.0"}'
\
-audiodev
'{"id":"audio1","driver":"spice"}' \
-spice
port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,seamless-migration=on
\
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args
b/tests/qemuxml2argvdata/channel-virtio-auto.args
index 5bd8e2193c..d86ff6d6a0 100644
--- a/tests/qemuxml2argvdata/channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,25 +25,25 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device virtio-serial-pci,id=virtio-serial0,max_ports=16,vectors=4,bus=pci.0,addr=0x2 \
--device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
--device virtio-serial-pci,id=virtio-serial2,bus=pci.0,addr=0x3 \
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":16,"vectors":4,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}'
\
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial2","bus":"pci.0","addr":"0x3"}'
\
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-chardev pty,id=charchannel0 \
--device
virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.linux-kvm.port.0
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.0"}'
\
-chardev pty,id=charchannel1 \
--device
virtserialport,bus=virtio-serial1.0,nr=1,chardev=charchannel1,id=channel1,name=org.linux-kvm.port.foo
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial1.0","nr":1,"chardev":"charchannel1","id":"channel1","name":"org.linux-kvm.port.foo"}'
\
-chardev pty,id=charchannel2 \
--device
virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel2,id=channel2,name=org.linux-kvm.port.bar
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chardev":"charchannel2","id":"channel2","name":"org.linux-kvm.port.bar"}'
\
-chardev pty,id=charchannel3 \
--device
virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel3,id=channel3,name=org.linux-kvm.port.wizz
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel3","id":"channel3","name":"org.linux-kvm.port.wizz"}'
\
-chardev pty,id=charchannel4 \
--device
virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial1.0","nr":2,"chardev":"charchannel4","id":"channel4","name":"org.linux-kvm.port.ooh"}'
\
-chardev pty,id=charchannel5 \
--device
virtserialport,bus=virtio-serial2.0,nr=1,chardev=charchannel5,id=channel5,name=org.linux-kvm.port.lla
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial2.0","nr":1,"chardev":"charchannel5","id":"channel5","name":"org.linux-kvm.port.lla"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
index df6657f587..d7a32b5b1d 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,24 +25,24 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0,addr=0x2 \
--device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0x3 \
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":4,"vectors":4,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0x3"}'
\
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-chardev pty,id=charchannel0 \
--device
virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.linux-kvm.port.0
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.0"}'
\
-chardev pty,id=charchannel1 \
--device
virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=org.linux-kvm.port.foo
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel1","id":"channel1","name":"org.linux-kvm.port.foo"}'
\
-chardev pty,id=charchannel2 \
--device
virtserialport,bus=virtio-serial0.0,nr=3,chardev=charchannel2,id=channel2,name=org.linux-kvm.port.bar
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chardev":"charchannel2","id":"channel2","name":"org.linux-kvm.port.bar"}'
\
-chardev pty,id=charchannel3 \
--device
virtserialport,bus=virtio-serial1.0,nr=1,chardev=charchannel3,id=channel3,name=org.linux-kvm.port.wizz
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial1.0","nr":1,"chardev":"charchannel3","id":"channel3","name":"org.linux-kvm.port.wizz"}'
\
-chardev pty,id=charchannel4 \
--device
virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial1.0","nr":2,"chardev":"charchannel4","id":"channel4","name":"org.linux-kvm.port.ooh"}'
\
-chardev pty,id=charchannel5 \
--device
virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel5,id=channel5,name=org.linux-kvm.port.lla
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chardev":"charchannel5","id":"channel5","name":"org.linux-kvm.port.lla"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
index b952025101..8ee30c8c2a 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,24 +25,24 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0,addr=0x2 \
--device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial0","max_ports":4,"vectors":4,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}'
\
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-chardev pty,id=charchannel0 \
--device
virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel0,id=channel0,name=org.linux-kvm.port.0
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.0"}'
\
-chardev pty,id=charchannel1 \
--device
virtserialport,bus=virtio-serial0.0,nr=3,chardev=charchannel1,id=channel1,name=org.linux-kvm.port.foo
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chardev":"charchannel1","id":"channel1","name":"org.linux-kvm.port.foo"}'
\
-chardev pty,id=charchannel2 \
--device
virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel2,id=channel2,name=org.linux-kvm.port.bar
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel2","id":"channel2","name":"org.linux-kvm.port.bar"}'
\
-chardev pty,id=charchannel3 \
--device
virtserialport,bus=virtio-serial1.0,nr=1,chardev=charchannel3,id=channel3,name=org.linux-kvm.port.wizz
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial1.0","nr":1,"chardev":"charchannel3","id":"channel3","name":"org.linux-kvm.port.wizz"}'
\
-chardev pty,id=charchannel4 \
--device
virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial1.0","nr":2,"chardev":"charchannel4","id":"channel4","name":"org.linux-kvm.port.ooh"}'
\
-chardev pty,id=charchannel5 \
--device
virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel5,id=channel5,name=org.linux-kvm.port.lla
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chardev":"charchannel5","id":"channel5","name":"org.linux-kvm.port.lla"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args
b/tests/qemuxml2argvdata/channel-virtio-default.args
index 5ff502848d..032938afca 100644
--- a/tests/qemuxml2argvdata/channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/channel-virtio-default.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -24,18 +24,18 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}'
\
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x3"}'
\
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-chardev pty,id=charchannel0 \
--device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0 \
+-device
'{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0"}'
\
-chardev spicevmc,id=charchannel1,name=vdagent \
--device
virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=com.redhat.spice.0
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel1","id":"channel1","name":"com.redhat.spice.0"}'
\
-audiodev
'{"id":"audio1","driver":"spice"}' \
-spice port=0,seamless-migration=on \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
+-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args
b/tests/qemuxml2argvdata/channel-virtio-state.args
index 6d20f431cb..27113716ad 100644
--- a/tests/qemuxml2argvdata/channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/channel-virtio-state.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,17 +25,17 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}'
\
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-chardev pty,id=charchannel0 \
--device
virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=org.linux-kvm.port.foo
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chardev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.foo"}'
\
-chardev pty,id=charchannel1 \
--device
virtserialport,bus=virtio-serial1.0,nr=4,chardev=charchannel1,id=channel1,name=org.linux-kvm.port.foo1
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial1.0","nr":4,"chardev":"charchannel1","id":"channel1","name":"org.linux-kvm.port.foo1"}'
\
-chardev pty,id=charchannel2 \
--device
virtserialport,bus=virtio-serial1.0,nr=5,chardev=charchannel2,id=channel2,name=org.linux-kvm.port.foo2
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial1.0","nr":5,"chardev":"charchannel2","id":"channel2","name":"org.linux-kvm.port.foo2"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args
b/tests/qemuxml2argvdata/channel-virtio-unix.args
index 6e42dc9f41..12ef286573 100644
--- a/tests/qemuxml2argvdata/channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,19 +25,19 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}'
\
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}'
\
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
--device
virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}'
\
-chardev socket,id=charchannel1,fd=1729,server=on,wait=off \
--device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1 \
+-device
'{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel1","id":"channel1"}'
\
-chardev socket,id=charchannel2,fd=1729,server=on,wait=off \
--device
virtserialport,bus=virtio-serial0.0,nr=3,chardev=charchannel2,id=channel2,name=ble \
+-device
'{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chardev":"charchannel2","id":"channel2","name":"ble"}'
\
-chardev socket,id=charchannel3,fd=1729,server=on,wait=off \
--device
virtserialport,bus=virtio-serial0.0,nr=4,chardev=charchannel3,id=channel3,name=fdsa \
+-device
'{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chardev":"charchannel3","id":"channel3","name":"fdsa"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-virtio.args
b/tests/qemuxml2argvdata/channel-virtio.args
index 423c27eb42..11c899376a 100644
--- a/tests/qemuxml2argvdata/channel-virtio.args
+++ b/tests/qemuxml2argvdata/channel-virtio.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,13 +25,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}'
\
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-chardev pty,id=charchannel0 \
--device
virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=org.linux-kvm.port.foo
\
+-device
'{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chardev":"charchannel0","id":"channel0","name":"org.linux-kvm.port.foo"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args
b/tests/qemuxml2argvdata/chardev-reconnect.args
index aae62b8f75..ee84969f73 100644
--- a/tests/qemuxml2argvdata/chardev-reconnect.args
+++ b/tests/qemuxml2argvdata/chardev-reconnect.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,20 +25,20 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}'
\
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}'
\
-usb \
--device usb-ccid,id=ccid0,bus=usb.0,port=1 \
+-device
'{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}'
\
-chardev
socket,id=charsmartcard0,path=/var/lib/libvirt/qemu/channel/target/asdf,reconnect=20 \
--device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
+-device
'{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"smartcard0","bus":"ccid0.0"}'
\
-chardev socket,id=charchannel0,host=localhost,port=1234,reconnect=10 \
--device
virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=asdf \
+-device
'{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"asdf"}'
\
-chardev
socket,id=charchannel1,path=/var/lib/libvirt/qemu/channel/target/fdsa,reconnect=0 \
--device
virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=fdsa \
+-device
'{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel1","id":"channel1","name":"fdsa"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-chardev socket,id=charredir0,host=localhost,port=3456,reconnect=15 \
--device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=2 \
+-device
'{"driver":"usb-redir","chardev":"charredir0","id":"redir0","bus":"usb.0","port":"2"}'
\
-chardev socket,id=charrng0,host=localhost,port=2345,reconnect=5 \
--object rng-egd,id=objrng0,chardev=charrng0 \
--device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x3 \
+-object
'{"qom-type":"rng-egd","id":"objrng0","chardev":"charrng0"}'
\
+-device
'{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci.0","addr":"0x3"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-catchup.args
b/tests/qemuxml2argvdata/clock-catchup.args
index d7ec73ace2..717e39de4b 100644
--- a/tests/qemuxml2argvdata/clock-catchup.args
+++ b/tests/qemuxml2argvdata/clock-catchup.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-france.args
b/tests/qemuxml2argvdata/clock-france.args
index a5664b547d..ebaf3983f2 100644
--- a/tests/qemuxml2argvdata/clock-france.args
+++ b/tests/qemuxml2argvdata/clock-france.args
@@ -10,7 +10,7 @@ TZ=Europe/Paris \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -29,7 +29,7 @@ TZ=Europe/Paris \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args
b/tests/qemuxml2argvdata/clock-hpet-off.args
index b5cb297e92..349685854d 100644
--- a/tests/qemuxml2argvdata/clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/clock-hpet-off.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
index 8fd8f42083..cfb65c94b3 100644
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-localtime.args
b/tests/qemuxml2argvdata/clock-localtime.args
index daf503d3fd..2f27165702 100644
--- a/tests/qemuxml2argvdata/clock-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,6 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
index 5a952a2cf6..629091aba2 100644
--- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu qemu64,hv-time=on \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-utc.args
b/tests/qemuxml2argvdata/clock-utc.args
index 2ebb6cb762..7b0d7e31af 100644
--- a/tests/qemuxml2argvdata/clock-utc.args
+++ b/tests/qemuxml2argvdata/clock-utc.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,6 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-variable.args
b/tests/qemuxml2argvdata/clock-variable.args
index ed42be8dd0..7faefe3464 100644
--- a/tests/qemuxml2argvdata/clock-variable.args
+++ b/tests/qemuxml2argvdata/clock-variable.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-virtio-many.args
b/tests/qemuxml2argvdata/console-virtio-many.args
index bb67eec187..d45a1b4eb0 100644
--- a/tests/qemuxml2argvdata/console-virtio-many.args
+++ b/tests/qemuxml2argvdata/console-virtio-many.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,19 +25,19 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}'
\
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-chardev pty,id=charserial0 \
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-device
'{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}'
\
-chardev pty,id=charconsole1 \
--device virtconsole,chardev=charconsole1,id=console1 \
+-device
'{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}'
\
-chardev pty,id=charconsole2 \
--device virtconsole,chardev=charconsole2,id=console2 \
+-device
'{"driver":"virtconsole","chardev":"charconsole2","id":"console2"}'
\
-chardev pty,id=charconsole3 \
--device virtconsole,chardev=charconsole3,id=console3 \
+-device
'{"driver":"virtconsole","chardev":"charconsole3","id":"console3"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-virtio.args
b/tests/qemuxml2argvdata/console-virtio.args
index 2baa069c04..20a6eb9c45 100644
--- a/tests/qemuxml2argvdata/console-virtio.args
+++ b/tests/qemuxml2argvdata/console-virtio.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,13 +25,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}'
\
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-chardev pty,id=charconsole0 \
--device virtconsole,chardev=charconsole0,id=console0 \
+-device
'{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/controller-order.args
b/tests/qemuxml2argvdata/controller-order.args
index 27a0e01153..58222e601f 100644
--- a/tests/qemuxml2argvdata/controller-order.args
+++ b/tests/qemuxml2argvdata/controller-order.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-fdr/master-key.aes \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m size=4194304k \
@@ -23,30 +23,30 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr/.config \
-rtc base=utc \
-no-shutdown \
-boot menu=off,strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x7 \
--device usb-hub,id=hub0,bus=usb.0,port=1 \
--device usb-ccid,id=ccid0,bus=usb.0,port=1.1 \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x7"}'
\
+-device
'{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}'
\
+-device
'{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1.1"}'
\
-blockdev
'{"driver":"file","filename":"/tmp/fdr.img","aio":"native","node-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"raw","file":"libvirt-2-storage"}'
\
--device
virtio-blk-pci,bus=pci.0,addr=0x5,share-rw=on,drive=libvirt-2-format,id=virtio-disk0,bootindex=1,write-cache=on
\
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","share-rw":true,"drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1,"write-cache":"on"}'
\
-blockdev
'{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-Desktop.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0 \
--netdev user,id=hostnet0 \
--device
virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:4d:4b:19,bootindex=2,bus=pci.0,addr=0x3
\
+-device
'{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0"}'
\
+-netdev '{"type":"user","id":"hostnet0"}'
\
+-device
'{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:4d:4b:19","bootindex":2,"bus":"pci.0","addr":"0x3"}'
\
-chardev spicevmc,id=charsmartcard0,name=smartcard \
--device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
+-device
'{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"smartcard0","bus":"ccid0.0"}'
\
-chardev pty,id=charserial0 \
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-device
'{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}'
\
-chardev spicevmc,id=charchannel0,name=vdagent \
--device
virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=com.redhat.spice.0
\
--device usb-tablet,id=input0,bus=usb.0,port=1.2 \
+-device
'{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"com.redhat.spice.0"}'
\
+-device
'{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1.2"}'
\
-audiodev
'{"id":"audio1","driver":"spice"}' \
-spice port=5901,addr=0.0.0.0,seamless-migration=on \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
--device intel-hda,id=sound0,bus=pci.0,addr=0x4 \
--device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0,audiodev=audio1 \
--device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb.0,port=2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
+-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"intel-hda","id":"sound0","bus":"pci.0","addr":"0x4"}'
\
+-device
'{"driver":"hda-duplex","id":"sound0-codec0","bus":"sound0.0","cad":0,"audiodev":"audio1"}'
\
+-device
'{"driver":"usb-host","hostbus":14,"hostaddr":6,"id":"hostdev0","bus":"usb.0","port":"2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
index dc35ed4a7e..6b4e0aa6cb 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu Haswell-noTSX \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args
b/tests/qemuxml2argvdata/cpu-Haswell.args
index 97eeed5804..c36c67a8b8 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu Haswell \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args
b/tests/qemuxml2argvdata/cpu-Haswell2.args
index c816510613..280d48f76f 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell2.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell2.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu Haswell,hle=off,rtm=off \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args
b/tests/qemuxml2argvdata/cpu-Haswell3.args
index 9d692e3c6c..f66a637bbe 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell3.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell3.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu Haswell,rtm=on,hle=on \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args
b/tests/qemuxml2argvdata/cpu-cache-disable.args
index 7b5d95270d..6bab5d64a5 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu host,host-cache-info=off,l3-cache=off \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args
b/tests/qemuxml2argvdata/cpu-cache-disable3.args
index e4ccdad41c..dd9227de22 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu
core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on,l3-cache=off
\
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
index bcb354433b..38f1d93973 100644
--- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu host,l3-cache=on,host-cache-info=off \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
index cf90428952..4bf1305f16 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu host,host-cache-info=on,l3-cache=off \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args
b/tests/qemuxml2argvdata/cpu-check-default-none.args
index 4ca878576d..65fc3e1bad 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu host \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args
b/tests/qemuxml2argvdata/cpu-check-default-none2.args
index bd056383f6..cd55fad737 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-cpu core2duo \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args
b/tests/qemuxml2argvdata/cpu-check-default-partial.args
index fff3d02cfc..959a421741 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu
core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on
\
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
index de46ed5ae7..48ad817176 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu core2duo \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-check-none.args
b/tests/qemuxml2argvdata/cpu-check-none.args
index de46ed5ae7..48ad817176 100644
--- a/tests/qemuxml2argvdata/cpu-check-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-none.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu core2duo \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-exact1.args
b/tests/qemuxml2argvdata/cpu-exact1.args
index b6dc380ddb..bd452e017e 100644
--- a/tests/qemuxml2argvdata/cpu-exact1.args
+++ b/tests/qemuxml2argvdata/cpu-exact1.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu qemu64,mca=off,pse36=off,clflush=off,syscall=off,nx=off,lm=off,svm=off \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
index 844da9ef3d..2916d10b23 100644
--- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
+++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu
core2duo,ds=on,ht=on,tm=on,ds-cpl=on,xtpr=on,3dnowext=on,lahf-lm=on,nx=off,cx16=off,tm2=off,pbe=off,ss=off,sse4a=off,wdt=off
\
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-exact2.args
b/tests/qemuxml2argvdata/cpu-exact2.args
index 844da9ef3d..2916d10b23 100644
--- a/tests/qemuxml2argvdata/cpu-exact2.args
+++ b/tests/qemuxml2argvdata/cpu-exact2.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu
core2duo,ds=on,ht=on,tm=on,ds-cpl=on,xtpr=on,3dnowext=on,lahf-lm=on,nx=off,cx16=off,tm2=off,pbe=off,ss=off,sse4a=off,wdt=off
\
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-fallback.args
b/tests/qemuxml2argvdata/cpu-fallback.args
index 341e649ce6..ef6c3b29f3 100644
--- a/tests/qemuxml2argvdata/cpu-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-fallback.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu Conroe,cx16=on,sse4.1=off,sse4.2=off,popcnt=off,aes=off \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
index 1e5a3af103..836fe208a0 100644
--- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu host,kvmclock=off \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
index d891dcd73b..97b7b9fda6 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-cpu
Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on
\
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
index c043bba085..8bece6f8da 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-cpu 'core2duo,vendor=Libvirt
QEMU,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on'
\
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
index fba3d076d2..b8e0734d7d 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu host,abm=on,ds=on,invtsc=off \
@@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args
b/tests/qemuxml2argvdata/cpu-host-passthrough.args
index 4ca878576d..65fc3e1bad 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu host \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args
b/tests/qemuxml2argvdata/cpu-kvmclock.args
index 60bc63a2bf..ef469a1e5a 100644
--- a/tests/qemuxml2argvdata/cpu-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-kvmclock.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu core2duo,kvmclock=off \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args
b/tests/qemuxml2argvdata/cpu-minimum1.args
index fff3d02cfc..959a421741 100644
--- a/tests/qemuxml2argvdata/cpu-minimum1.args
+++ b/tests/qemuxml2argvdata/cpu-minimum1.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu
core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on
\
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args
b/tests/qemuxml2argvdata/cpu-minimum2.args
index 632f76f7dd..de2c6f4fe5 100644
--- a/tests/qemuxml2argvdata/cpu-minimum2.args
+++ b/tests/qemuxml2argvdata/cpu-minimum2.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu
core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on,syscall=off,nx=off,lm=off,svm=off
\
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args
b/tests/qemuxml2argvdata/cpu-no-removed-features.args
index de46ed5ae7..48ad817176 100644
--- a/tests/qemuxml2argvdata/cpu-no-removed-features.args
+++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu core2duo \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
index 7ef84e0b2c..5fc82723eb 100644
--- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
+++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -29,5 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args
b/tests/qemuxml2argvdata/cpu-numa-memshared.args
index 47341169d5..fc4c03f1a6 100644
--- a/tests/qemuxml2argvdata/cpu-numa-memshared.args
+++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args
@@ -9,15 +9,15 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
-overcommit mem-lock=off \
-smp 16,sockets=2,cores=4,threads=2 \
--object
memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0,share=on,size=112197632
\
+-object
'{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0","share":true,"size":112197632}'
\
-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
--object
memory-backend-file,id=ram-node1,mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node1,share=off,size=112197632
\
+-object
'{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node1","share":false,"size":112197632}'
\
-numa node,nodeid=1,cpus=8-15,memdev=ram-node1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
@@ -31,5 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
index 741edc4c1c..3cf5b44742 100644
--- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
+++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -29,5 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-numa1.args
b/tests/qemuxml2argvdata/cpu-numa1.args
index 741edc4c1c..3cf5b44742 100644
--- a/tests/qemuxml2argvdata/cpu-numa1.args
+++ b/tests/qemuxml2argvdata/cpu-numa1.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -29,5 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-numa2.args
b/tests/qemuxml2argvdata/cpu-numa2.args
index 741edc4c1c..3cf5b44742 100644
--- a/tests/qemuxml2argvdata/cpu-numa2.args
+++ b/tests/qemuxml2argvdata/cpu-numa2.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -29,5 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args
b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args
index e1823727ae..6710c3edc5 100644
--- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args
+++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu host,phys-bits=42 \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args
b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args
index d8add83283..f4fdaab483 100644
--- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args
+++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu
core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on,phys-bits=42
\
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args
b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args
index 7af943c451..0ae7743b5a 100644
--- a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu host,host-phys-bits=on \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-strict1.args
b/tests/qemuxml2argvdata/cpu-strict1.args
index 69a1405f92..f865d7557a 100644
--- a/tests/qemuxml2argvdata/cpu-strict1.args
+++ b/tests/qemuxml2argvdata/cpu-strict1.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu
core2duo,ds=on,acpi=on,ht=on,tm=on,ds-cpl=on,vmx=on,est=on,xtpr=on,3dnowext=on,lahf-lm=on,nx=off,cx16=off,tm2=off,pbe=off,ss=off,sse4a=off,wdt=off
\
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-topology1.args
b/tests/qemuxml2argvdata/cpu-topology1.args
index 6482bacaf1..52e36d0de5 100644
--- a/tests/qemuxml2argvdata/cpu-topology1.args
+++ b/tests/qemuxml2argvdata/cpu-topology1.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -27,5 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-topology2.args
b/tests/qemuxml2argvdata/cpu-topology2.args
index ff4c85c800..6f8f674859 100644
--- a/tests/qemuxml2argvdata/cpu-topology2.args
+++ b/tests/qemuxml2argvdata/cpu-topology2.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-cpu core2duo \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-topology3.args
b/tests/qemuxml2argvdata/cpu-topology3.args
index 6482bacaf1..52e36d0de5 100644
--- a/tests/qemuxml2argvdata/cpu-topology3.args
+++ b/tests/qemuxml2argvdata/cpu-topology3.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -27,5 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
index f4b7a70ba2..f3a8a62c00 100644
--- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
+++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu
Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on,invtsc=on,tsc-frequency=4567890000
\
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args
b/tests/qemuxml2argvdata/default-kvm-host-arch.args
index 7ae1c7eef1..07ee740065 100644
--- a/tests/qemuxml2argvdata/default-kvm-host-arch.args
+++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-kvm/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=kvm,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-kvm/master-key.aes \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-kvm/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m size=4194304k \
@@ -27,5 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-kvm/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args
b/tests/qemuxml2argvdata/default-qemu-host-arch.args
index cc37778373..a54dc14136 100644
--- a/tests/qemuxml2argvdata/default-qemu-host-arch.args
+++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-qemu-host/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=qemu-host,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-qemu-host/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-qemu-host/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=4194304k \
@@ -27,5 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-qemu-host/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
index 96ab12917e..33ad2bd5da 100644
--- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
+++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
@@ -11,7 +11,7 @@ DISPLAY=:0.1 \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -29,8 +29,8 @@ DISPLAY=:0.1 \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-full-screen \
-display sdl \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/graphics-sdl.args
b/tests/qemuxml2argvdata/graphics-sdl.args
index c7d20d3e1f..bd6f994856 100644
--- a/tests/qemuxml2argvdata/graphics-sdl.args
+++ b/tests/qemuxml2argvdata/graphics-sdl.args
@@ -11,7 +11,7 @@ DISPLAY=:0.1 \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -29,7 +29,7 @@ DISPLAY=:0.1 \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-display sdl \
--device VGA,id=video0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"VGA","id":"video0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
index 7c76cd5d15..8f51127035 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -27,5 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device
vfio-pci,id=hostdev0,sysfsdev=/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc,display=off,bus=pci.0,addr=0x2
\
+-device
'{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"off","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
index 61fe727996..b59083cb3c 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=delete,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-delete/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-delete/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m size=262144k \
@@ -27,8 +27,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device vfio-pci,host=0005:90:01.0,id=hostdev0,bus=pci.0,addr=0x2 \
--device vfio-pci,host=0005:90:01.2,id=hostdev2,bus=pci.0,addr=0x3 \
--device vfio-pci,host=0005:90:01.3,id=hostdev3,bus=pci.0,addr=0x4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \
+-device
'{"driver":"vfio-pci","host":"0005:90:01.0","id":"hostdev0","bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"vfio-pci","host":"0005:90:01.2","id":"hostdev2","bus":"pci.0","addr":"0x3"}'
\
+-device
'{"driver":"vfio-pci","host":"0005:90:01.3","id":"hostdev3","bus":"pci.0","addr":"0x4"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x5"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
index 50d6010429..b0110be8b1 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=delete,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-delete/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-delete/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m size=262144k \
@@ -27,12 +27,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device vfio-pci,host=0005:90:01.0,id=hostdev0,bus=pci.0,addr=0x2 \
--device vfio-pci,host=0001:01:00.1,id=hostdev1,bus=pci.0,addr=0x3 \
--device vfio-pci,host=0001:01:00.0,id=hostdev2,bus=pci.0,addr=0x4 \
--device vfio-pci,host=0005:90:01.2,id=hostdev3,bus=pci.0,addr=0x5 \
--device vfio-pci,host=0005:90:01.3,id=hostdev4,bus=pci.0,addr=0x6 \
--device vfio-pci,host=0000:06:12.1,id=hostdev5,bus=pci.0,addr=0x7 \
--device vfio-pci,host=0000:06:12.2,id=hostdev6,bus=pci.0,addr=0x8 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x9 \
+-device
'{"driver":"vfio-pci","host":"0005:90:01.0","id":"hostdev0","bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"vfio-pci","host":"0001:01:00.1","id":"hostdev1","bus":"pci.0","addr":"0x3"}'
\
+-device
'{"driver":"vfio-pci","host":"0001:01:00.0","id":"hostdev2","bus":"pci.0","addr":"0x4"}'
\
+-device
'{"driver":"vfio-pci","host":"0005:90:01.2","id":"hostdev3","bus":"pci.0","addr":"0x5"}'
\
+-device
'{"driver":"vfio-pci","host":"0005:90:01.3","id":"hostdev4","bus":"pci.0","addr":"0x6"}'
\
+-device
'{"driver":"vfio-pci","host":"0000:06:12.1","id":"hostdev5","bus":"pci.0","addr":"0x7"}'
\
+-device
'{"driver":"vfio-pci","host":"0000:06:12.2","id":"hostdev6","bus":"pci.0","addr":"0x8"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x9"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
index 5f8197e7ed..972a023d5b 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,12 +25,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x3"}'
\
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.0,addr=0x2
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
+-device
'{"driver":"vhost-scsi-pci","wwpn":"naa.5123456789abcde0","vhostfd":"3","id":"hostdev0","bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
index ac9db13ab5..909f65ecae 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,8 +28,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"vfio-pci","host":"0021:de:1f.1","id":"hostdev0","bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args
b/tests/qemuxml2argvdata/hostdev-vfio.args
index 9872d77f17..a52b705099 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,8 +28,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device vfio-pci,host=0000:06:12.1,id=hostdev0,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"vfio-pci","host":"0000:06:12.1","id":"hostdev0","bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hotplug-base.args
b/tests/qemuxml2argvdata/hotplug-base.args
index fd1ff8f36d..030552411e 100644
--- a/tests/qemuxml2argvdata/hotplug-base.args
+++ b/tests/qemuxml2argvdata/hotplug-base.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-hotplug/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=hotplug,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-hotplug/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-hotplug/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m size=4194304k \
@@ -24,8 +24,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-hotplug/.config \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x4 \
+-device
'{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x3"}'
\
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x4"}'
\
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args
b/tests/qemuxml2argvdata/input-usbmouse-addr.args
index 06d31b4605..1d7e8f29aa 100644
--- a/tests/qemuxml2argvdata/input-usbmouse-addr.args
+++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,8 +28,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--device usb-mouse,id=input0,bus=usb.0,port=2 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-device
'{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"2"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/input-usbmouse.args
b/tests/qemuxml2argvdata/input-usbmouse.args
index 3b85615ce2..fdf0cd14c5 100644
--- a/tests/qemuxml2argvdata/input-usbmouse.args
+++ b/tests/qemuxml2argvdata/input-usbmouse.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--device usb-mouse,id=input0,bus=usb.0,port=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-device
'{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/input-usbtablet.args
b/tests/qemuxml2argvdata/input-usbtablet.args
index 95ceafb413..18f484fc0a 100644
--- a/tests/qemuxml2argvdata/input-usbtablet.args
+++ b/tests/qemuxml2argvdata/input-usbtablet.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--device usb-tablet,id=input0,bus=usb.0,port=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-device
'{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args
b/tests/qemuxml2argvdata/kvm-pit-delay.args
index f8234ba1cb..fd7a2b306a 100644
--- a/tests/qemuxml2argvdata/kvm-pit-delay.args
+++ b/tests/qemuxml2argvdata/kvm-pit-delay.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args
b/tests/qemuxml2argvdata/kvm-pit-discard.args
index b75f0945cc..c3cdc71020 100644
--- a/tests/qemuxml2argvdata/kvm-pit-discard.args
+++ b/tests/qemuxml2argvdata/kvm-pit-discard.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args
index bd71be3ec0..df9ab68537 100644
--- a/tests/qemuxml2argvdata/kvmclock.args
+++ b/tests/qemuxml2argvdata/kvmclock.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-cpu qemu64,kvmclock=off \
diff --git a/tests/qemuxml2argvdata/machine-aliases1.args
b/tests/qemuxml2argvdata/machine-aliases1.args
index 5078429e1b..86af73f198 100644
--- a/tests/qemuxml2argvdata/machine-aliases1.args
+++ b/tests/qemuxml2argvdata/machine-aliases1.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aliases2.args
b/tests/qemuxml2argvdata/machine-aliases2.args
index 290a762e91..6501e5e417 100644
--- a/tests/qemuxml2argvdata/machine-aliases2.args
+++ b/tests/qemuxml2argvdata/machine-aliases2.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-core-off.args
b/tests/qemuxml2argvdata/machine-core-off.args
index 2ebb6cb762..7b0d7e31af 100644
--- a/tests/qemuxml2argvdata/machine-core-off.args
+++ b/tests/qemuxml2argvdata/machine-core-off.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,6 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-core-on.args
b/tests/qemuxml2argvdata/machine-core-on.args
index 78dea552bf..a1b9905d5c 100644
--- a/tests/qemuxml2argvdata/machine-core-on.args
+++ b/tests/qemuxml2argvdata/machine-core-on.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=on \
-accel tcg \
-m size=219136k \
@@ -28,6 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args
b/tests/qemuxml2argvdata/machine-vmport-opt.args
index 88eb59d12e..c7cdb0c85f 100644
--- a/tests/qemuxml2argvdata/machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,vmport=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
index 4e45bb059a..b84efa4556 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k,slots=16,maxmem=1099511627776k \
@@ -27,13 +27,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-acpi \
-boot strict=on \
-usb \
--object memory-backend-ram,id=memdimm0,size=536870912 \
--device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \
--object
memory-backend-file,id=memdimm1,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=536870912,host-nodes=1-3,policy=bind
\
--device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \
+-object
'{"qom-type":"memory-backend-ram","id":"memdimm0","size":536870912}'
\
+-device
'{"driver":"pc-dimm","node":0,"memdev":"memdimm0","id":"dimm0","slot":0}'
\
+-object
'{"qom-type":"memory-backend-file","id":"memdimm1","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":536870912,"host-nodes":[1,2,3],"policy":"bind"}'
\
+-device
'{"driver":"pc-dimm","node":0,"memdev":"memdimm1","id":"dimm1","slot":1}'
\
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug.args
b/tests/qemuxml2argvdata/memory-hotplug.args
index 3bd7aaf9e5..62600fefe2 100644
--- a/tests/qemuxml2argvdata/memory-hotplug.args
+++ b/tests/qemuxml2argvdata/memory-hotplug.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k,slots=16,maxmem=1099511627776k \
@@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args
b/tests/qemuxml2argvdata/memtune-unlimited.args
index 5078429e1b..86af73f198 100644
--- a/tests/qemuxml2argvdata/memtune-unlimited.args
+++ b/tests/qemuxml2argvdata/memtune-unlimited.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args
index 5078429e1b..86af73f198 100644
--- a/tests/qemuxml2argvdata/memtune.args
+++ b/tests/qemuxml2argvdata/memtune.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args
index 5078429e1b..86af73f198 100644
--- a/tests/qemuxml2argvdata/minimal.args
+++ b/tests/qemuxml2argvdata/minimal.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-acpi.args
b/tests/qemuxml2argvdata/misc-acpi.args
index 12f2d4e6ae..15343c68b0 100644
--- a/tests/qemuxml2argvdata/misc-acpi.args
+++ b/tests/qemuxml2argvdata/misc-acpi.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -27,6 +27,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args
b/tests/qemuxml2argvdata/misc-disable-s3.args
index d64b9f56ae..3dc66e443e 100644
--- a/tests/qemuxml2argvdata/misc-disable-s3.args
+++ b/tests/qemuxml2argvdata/misc-disable-s3.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -29,6 +29,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args
b/tests/qemuxml2argvdata/misc-disable-suspends.args
index 554620fe24..314612c229 100644
--- a/tests/qemuxml2argvdata/misc-disable-suspends.args
+++ b/tests/qemuxml2argvdata/misc-disable-suspends.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -30,6 +30,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args
b/tests/qemuxml2argvdata/misc-enable-s4.args
index 0734635405..f2e9fcc0a6 100644
--- a/tests/qemuxml2argvdata/misc-enable-s4.args
+++ b/tests/qemuxml2argvdata/misc-enable-s4.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -29,6 +29,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-uuid.args
b/tests/qemuxml2argvdata/misc-uuid.args
index 12f2d4e6ae..15343c68b0 100644
--- a/tests/qemuxml2argvdata/misc-uuid.args
+++ b/tests/qemuxml2argvdata/misc-uuid.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -27,6 +27,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args
b/tests/qemuxml2argvdata/multifunction-pci-device.args
index 40a25fbe7b..40c38dea48 100644
--- a/tests/qemuxml2argvdata/multifunction-pci-device.args
+++ b/tests/qemuxml2argvdata/multifunction-pci-device.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,19 +25,19 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device lsi,id=scsi0,bus=pci.0,multifunction=off,addr=0x3 \
--device lsi,id=scsi1,bus=pci.0,multifunction=on,addr=0x4 \
--device lsi,id=scsi2,bus=pci.0,multifunction=on,addr=0x4.0x1 \
--device lsi,id=scsi3,bus=pci.0,addr=0x4.0x2 \
--device lsi,id=scsi4,bus=pci.0,addr=0x4.0x3 \
--device lsi,id=scsi5,bus=pci.0,addr=0x4.0x4 \
--device lsi,id=scsi6,bus=pci.0,addr=0x4.0x5 \
--device lsi,id=scsi7,bus=pci.0,addr=0x4.0x6 \
--device lsi,id=scsi8,bus=pci.0,addr=0x4.0x7 \
+-device
'{"driver":"lsi","id":"scsi0","bus":"pci.0","multifunction":false,"addr":"0x3"}'
\
+-device
'{"driver":"lsi","id":"scsi1","bus":"pci.0","multifunction":true,"addr":"0x4"}'
\
+-device
'{"driver":"lsi","id":"scsi2","bus":"pci.0","multifunction":true,"addr":"0x4.0x1"}'
\
+-device
'{"driver":"lsi","id":"scsi3","bus":"pci.0","addr":"0x4.0x2"}'
\
+-device
'{"driver":"lsi","id":"scsi4","bus":"pci.0","addr":"0x4.0x3"}'
\
+-device
'{"driver":"lsi","id":"scsi5","bus":"pci.0","addr":"0x4.0x4"}'
\
+-device
'{"driver":"lsi","id":"scsi6","bus":"pci.0","addr":"0x4.0x5"}'
\
+-device
'{"driver":"lsi","id":"scsi7","bus":"pci.0","addr":"0x4.0x6"}'
\
+-device
'{"driver":"lsi","id":"scsi8","bus":"pci.0","addr":"0x4.0x7"}'
\
-usb \
-blockdev
'{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device
scsi-hd,bus=scsi0.0,scsi-id=0,device_id=drive-scsi0-0-0,drive=libvirt-1-format,id=scsi0-0-0,bootindex=1
\
+-device
'{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"drive-scsi0-0-0","drive":"libvirt-1-format","id":"scsi0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/nosharepages.args
b/tests/qemuxml2argvdata/nosharepages.args
index a059b61da4..7bcd073c98 100644
--- a/tests/qemuxml2argvdata/nosharepages.args
+++ b/tests/qemuxml2argvdata/nosharepages.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off,mem-merge=off \
-accel tcg \
-m size=220160k \
@@ -28,6 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
index 951de4194a..d0703d283a 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
index 951de4194a..d0703d283a 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
index 951de4194a..d0703d283a 100644
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
index 951de4194a..d0703d283a 100644
--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args
index 951de4194a..d0703d283a 100644
--- a/tests/qemuxml2argvdata/numad.args
+++ b/tests/qemuxml2argvdata/numad.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
index 951de4194a..d0703d283a 100644
--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args
b/tests/qemuxml2argvdata/numatune-auto-prefer.args
index fd9b839404..5f8db1b479 100644
--- a/tests/qemuxml2argvdata/numatune-auto-prefer.args
+++ b/tests/qemuxml2argvdata/numatune-auto-prefer.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=65536k \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-distances.args
b/tests/qemuxml2argvdata/numatune-distances.args
index d2f240dd96..f349b5639c 100644
--- a/tests/qemuxml2argvdata/numatune-distances.args
+++ b/tests/qemuxml2argvdata/numatune-distances.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=12582912k \
@@ -68,5 +68,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
index b8098cd5a5..efc9bb9476 100644
--- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
@@ -9,15 +9,15 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=65536k \
-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
--object memory-backend-ram,id=ram-node0,size=33554432,host-nodes=3,policy=preferred \
+-object
'{"qom-type":"memory-backend-ram","id":"ram-node0","size":33554432,"host-nodes":[3],"policy":"preferred"}'
\
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
--object memory-backend-ram,id=ram-node1,size=33554432 \
+-object
'{"qom-type":"memory-backend-ram","id":"ram-node1","size":33554432}'
\
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \
-display none \
@@ -31,5 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-memnode.args
b/tests/qemuxml2argvdata/numatune-memnode.args
index f5f6e727a1..163aa530da 100644
--- a/tests/qemuxml2argvdata/numatune-memnode.args
+++ b/tests/qemuxml2argvdata/numatune-memnode.args
@@ -9,17 +9,17 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=24683520k \
-overcommit mem-lock=off \
-smp 32,sockets=32,cores=1,threads=1 \
--object memory-backend-ram,id=ram-node0,size=20971520,host-nodes=3,policy=preferred \
+-object
'{"qom-type":"memory-backend-ram","id":"ram-node0","size":20971520,"host-nodes":[3],"policy":"preferred"}'
\
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
--object memory-backend-ram,id=ram-node1,size=676331520,host-nodes=0-3,policy=bind \
+-object
'{"qom-type":"memory-backend-ram","id":"ram-node1","size":676331520,"host-nodes":[0,1,2,3],"policy":"bind"}'
\
-numa node,nodeid=1,cpus=1-27,cpus=29,memdev=ram-node1 \
--object
memory-backend-ram,id=ram-node2,size=24578621440,host-nodes=0,host-nodes=2,policy=bind \
+-object
'{"qom-type":"memory-backend-ram","id":"ram-node2","size":24578621440,"host-nodes":[0,2],"policy":"bind"}'
\
-numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \
-uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \
-display none \
@@ -33,5 +33,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-memory.args
b/tests/qemuxml2argvdata/numatune-memory.args
index 951de4194a..d0703d283a 100644
--- a/tests/qemuxml2argvdata/numatune-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memory.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args
b/tests/qemuxml2argvdata/pci-autoadd-addr.args
index f1a49702ef..ec75429384 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-addr.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr-br,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -24,18 +24,18 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x3 \
--device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x4 \
--device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.0,addr=0x5 \
--device pci-bridge,chassis_nr=4,id=pci.4,bus=pci.0,addr=0x6 \
--device pci-bridge,chassis_nr=5,id=pci.5,bus=pci.0,addr=0x7 \
--device pci-bridge,chassis_nr=6,id=pci.6,bus=pci.0,addr=0x8 \
--device pci-bridge,chassis_nr=7,id=pci.7,bus=pci.0,addr=0x9 \
+-device
'{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0","addr":"0x3"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0","addr":"0x4"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":3,"id":"pci.3","bus":"pci.0","addr":"0x5"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":4,"id":"pci.4","bus":"pci.0","addr":"0x6"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":5,"id":"pci.5","bus":"pci.0","addr":"0x7"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":6,"id":"pci.6","bus":"pci.0","addr":"0x8"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":7,"id":"pci.7","bus":"pci.0","addr":"0x9"}'
\
-usb \
-blockdev
'{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0 \
+-device
'{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.7,addr=0x6 \
+-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.7","addr":"0x6"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args
b/tests/qemuxml2argvdata/pci-autoadd-idx.args
index aed802a501..5c6377d619 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-idx.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr-br,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -24,19 +24,19 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--device pci-bridge,chassis_nr=8,id=pci.8,bus=pci.0,addr=0x3 \
--device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x4 \
--device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x5 \
--device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.0,addr=0x6 \
--device pci-bridge,chassis_nr=4,id=pci.4,bus=pci.0,addr=0x7 \
--device pci-bridge,chassis_nr=5,id=pci.5,bus=pci.0,addr=0x8 \
--device pci-bridge,chassis_nr=6,id=pci.6,bus=pci.0,addr=0x9 \
--device pci-bridge,chassis_nr=7,id=pci.7,bus=pci.0,addr=0xa \
+-device
'{"driver":"pci-bridge","chassis_nr":8,"id":"pci.8","bus":"pci.0","addr":"0x3"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0","addr":"0x4"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0","addr":"0x5"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":3,"id":"pci.3","bus":"pci.0","addr":"0x6"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":4,"id":"pci.4","bus":"pci.0","addr":"0x7"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":5,"id":"pci.5","bus":"pci.0","addr":"0x8"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":6,"id":"pci.6","bus":"pci.0","addr":"0x9"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":7,"id":"pci.7","bus":"pci.0","addr":"0xa"}'
\
-usb \
-blockdev
'{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0 \
+-device
'{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x6 \
+-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","addr":"0x6"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args
b/tests/qemuxml2argvdata/pci-autofill-addr.args
index 0b9866d00e..f43a1da7ab 100644
--- a/tests/qemuxml2argvdata/pci-autofill-addr.args
+++ b/tests/qemuxml2argvdata/pci-autofill-addr.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr-br,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -28,8 +28,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
-usb \
-blockdev
'{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
--device
virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
+-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
index 6868de7344..7d990296c7 100644
--- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
+++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-lots-of-disks/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=lots-of-disks,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-lots-of-disks/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-lots-of-disks/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-cpu qemu64,kvmclock=off \
@@ -25,324 +25,324 @@
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-lots-of-disks/.config \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x2 \
--device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x3 \
--device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.0,addr=0x4 \
+-device
'{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0","addr":"0x3"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":3,"id":"pci.3","bus":"pci.0","addr":"0x4"}'
\
-usb \
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/test.img","node-name":"libvirt-105-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-105-format","read-only":false,"driver":"raw","file":"libvirt-105-storage"}'
\
--device
virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-105-format,id=virtio-disk0,bootindex=1 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"libvirt-105-format","id":"virtio-disk0","bootindex":1}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-a.img","node-name":"libvirt-104-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-104-format","read-only":false,"driver":"raw","file":"libvirt-104-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x6,drive=libvirt-104-format,id=virtio-disk26 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"libvirt-104-format","id":"virtio-disk26"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-b.img","node-name":"libvirt-103-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-103-format","read-only":false,"driver":"raw","file":"libvirt-103-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=libvirt-103-format,id=virtio-disk27 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"libvirt-103-format","id":"virtio-disk27"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-c.img","node-name":"libvirt-102-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-102-format","read-only":false,"driver":"raw","file":"libvirt-102-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x8,drive=libvirt-102-format,id=virtio-disk28 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x8","drive":"libvirt-102-format","id":"virtio-disk28"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-d.img","node-name":"libvirt-101-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-101-format","read-only":false,"driver":"raw","file":"libvirt-101-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x9,drive=libvirt-101-format,id=virtio-disk29 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x9","drive":"libvirt-101-format","id":"virtio-disk29"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-a.img","node-name":"libvirt-100-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-100-format","read-only":false,"driver":"raw","file":"libvirt-100-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0xa,drive=libvirt-100-format,id=virtio-disk52 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xa","drive":"libvirt-100-format","id":"virtio-disk52"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-b.img","node-name":"libvirt-99-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-99-format","read-only":false,"driver":"raw","file":"libvirt-99-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0xb,drive=libvirt-99-format,id=virtio-disk53 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xb","drive":"libvirt-99-format","id":"virtio-disk53"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-c.img","node-name":"libvirt-98-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-98-format","read-only":false,"driver":"raw","file":"libvirt-98-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0xc,drive=libvirt-98-format,id=virtio-disk54 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xc","drive":"libvirt-98-format","id":"virtio-disk54"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-d.img","node-name":"libvirt-97-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-97-format","read-only":false,"driver":"raw","file":"libvirt-97-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0xd,drive=libvirt-97-format,id=virtio-disk55 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xd","drive":"libvirt-97-format","id":"virtio-disk55"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-a.img","node-name":"libvirt-96-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-96-format","read-only":false,"driver":"raw","file":"libvirt-96-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0xe,drive=libvirt-96-format,id=virtio-disk78 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xe","drive":"libvirt-96-format","id":"virtio-disk78"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-b.img","node-name":"libvirt-95-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-95-format","read-only":false,"driver":"raw","file":"libvirt-95-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0xf,drive=libvirt-95-format,id=virtio-disk79 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xf","drive":"libvirt-95-format","id":"virtio-disk79"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-c.img","node-name":"libvirt-94-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-94-format","read-only":false,"driver":"raw","file":"libvirt-94-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x10,drive=libvirt-94-format,id=virtio-disk80 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x10","drive":"libvirt-94-format","id":"virtio-disk80"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-d.img","node-name":"libvirt-93-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-93-format","read-only":false,"driver":"raw","file":"libvirt-93-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x11,drive=libvirt-93-format,id=virtio-disk81 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x11","drive":"libvirt-93-format","id":"virtio-disk81"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-a.img","node-name":"libvirt-92-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-92-format","read-only":false,"driver":"raw","file":"libvirt-92-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x12,drive=libvirt-92-format,id=virtio-disk104 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x12","drive":"libvirt-92-format","id":"virtio-disk104"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-b.img","node-name":"libvirt-91-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-91-format","read-only":false,"driver":"raw","file":"libvirt-91-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x13,drive=libvirt-91-format,id=virtio-disk105 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x13","drive":"libvirt-91-format","id":"virtio-disk105"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-c.img","node-name":"libvirt-90-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-90-format","read-only":false,"driver":"raw","file":"libvirt-90-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x14,drive=libvirt-90-format,id=virtio-disk106 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x14","drive":"libvirt-90-format","id":"virtio-disk106"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-d.img","node-name":"libvirt-89-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-89-format","read-only":false,"driver":"raw","file":"libvirt-89-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x15,drive=libvirt-89-format,id=virtio-disk107 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x15","drive":"libvirt-89-format","id":"virtio-disk107"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-a.img","node-name":"libvirt-88-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-88-format","read-only":false,"driver":"raw","file":"libvirt-88-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x16,drive=libvirt-88-format,id=virtio-disk130 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x16","drive":"libvirt-88-format","id":"virtio-disk130"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-b.img","node-name":"libvirt-87-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-87-format","read-only":false,"driver":"raw","file":"libvirt-87-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x17,drive=libvirt-87-format,id=virtio-disk131 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x17","drive":"libvirt-87-format","id":"virtio-disk131"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-c.img","node-name":"libvirt-86-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-86-format","read-only":false,"driver":"raw","file":"libvirt-86-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x18,drive=libvirt-86-format,id=virtio-disk132 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x18","drive":"libvirt-86-format","id":"virtio-disk132"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-d.img","node-name":"libvirt-85-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-85-format","read-only":false,"driver":"raw","file":"libvirt-85-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x19,drive=libvirt-85-format,id=virtio-disk133 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x19","drive":"libvirt-85-format","id":"virtio-disk133"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-a.img","node-name":"libvirt-84-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-84-format","read-only":false,"driver":"raw","file":"libvirt-84-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=libvirt-84-format,id=virtio-disk156 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1a","drive":"libvirt-84-format","id":"virtio-disk156"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-b.img","node-name":"libvirt-83-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-83-format","read-only":false,"driver":"raw","file":"libvirt-83-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=libvirt-83-format,id=virtio-disk157 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1b","drive":"libvirt-83-format","id":"virtio-disk157"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-c.img","node-name":"libvirt-82-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-82-format","read-only":false,"driver":"raw","file":"libvirt-82-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=libvirt-82-format,id=virtio-disk158 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1c","drive":"libvirt-82-format","id":"virtio-disk158"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-d.img","node-name":"libvirt-81-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-81-format","read-only":false,"driver":"raw","file":"libvirt-81-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=libvirt-81-format,id=virtio-disk159 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1d","drive":"libvirt-81-format","id":"virtio-disk159"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-a.img","node-name":"libvirt-80-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-80-format","read-only":false,"driver":"raw","file":"libvirt-80-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=libvirt-80-format,id=virtio-disk182 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1e","drive":"libvirt-80-format","id":"virtio-disk182"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-b.img","node-name":"libvirt-79-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-79-format","read-only":false,"driver":"raw","file":"libvirt-79-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=libvirt-79-format,id=virtio-disk183 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1f","drive":"libvirt-79-format","id":"virtio-disk183"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-c.img","node-name":"libvirt-78-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-78-format","read-only":false,"driver":"raw","file":"libvirt-78-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x1,drive=libvirt-78-format,id=virtio-disk184 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1","drive":"libvirt-78-format","id":"virtio-disk184"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-d.img","node-name":"libvirt-77-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-77-format","read-only":false,"driver":"raw","file":"libvirt-77-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x2,drive=libvirt-77-format,id=virtio-disk185 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x2","drive":"libvirt-77-format","id":"virtio-disk185"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-a.img","node-name":"libvirt-76-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-76-format","read-only":false,"driver":"raw","file":"libvirt-76-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x3,drive=libvirt-76-format,id=virtio-disk208 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x3","drive":"libvirt-76-format","id":"virtio-disk208"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-b.img","node-name":"libvirt-75-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-75-format","read-only":false,"driver":"raw","file":"libvirt-75-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x4,drive=libvirt-75-format,id=virtio-disk209 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x4","drive":"libvirt-75-format","id":"virtio-disk209"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-c.img","node-name":"libvirt-74-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-74-format","read-only":false,"driver":"raw","file":"libvirt-74-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x5,drive=libvirt-74-format,id=virtio-disk210 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x5","drive":"libvirt-74-format","id":"virtio-disk210"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-d.img","node-name":"libvirt-73-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-73-format","read-only":false,"driver":"raw","file":"libvirt-73-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x6,drive=libvirt-73-format,id=virtio-disk211 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x6","drive":"libvirt-73-format","id":"virtio-disk211"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-a.img","node-name":"libvirt-72-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-72-format","read-only":false,"driver":"raw","file":"libvirt-72-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x7,drive=libvirt-72-format,id=virtio-disk234 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x7","drive":"libvirt-72-format","id":"virtio-disk234"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-b.img","node-name":"libvirt-71-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-71-format","read-only":false,"driver":"raw","file":"libvirt-71-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x8,drive=libvirt-71-format,id=virtio-disk235 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x8","drive":"libvirt-71-format","id":"virtio-disk235"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-c.img","node-name":"libvirt-70-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-70-format","read-only":false,"driver":"raw","file":"libvirt-70-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x9,drive=libvirt-70-format,id=virtio-disk236 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x9","drive":"libvirt-70-format","id":"virtio-disk236"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-d.img","node-name":"libvirt-69-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-69-format","read-only":false,"driver":"raw","file":"libvirt-69-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0xa,drive=libvirt-69-format,id=virtio-disk237 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xa","drive":"libvirt-69-format","id":"virtio-disk237"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-a.img","node-name":"libvirt-68-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-68-format","read-only":false,"driver":"raw","file":"libvirt-68-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0xb,drive=libvirt-68-format,id=virtio-disk260 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xb","drive":"libvirt-68-format","id":"virtio-disk260"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-b.img","node-name":"libvirt-67-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-67-format","read-only":false,"driver":"raw","file":"libvirt-67-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0xc,drive=libvirt-67-format,id=virtio-disk261 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xc","drive":"libvirt-67-format","id":"virtio-disk261"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-c.img","node-name":"libvirt-66-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-66-format","read-only":false,"driver":"raw","file":"libvirt-66-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0xd,drive=libvirt-66-format,id=virtio-disk262 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xd","drive":"libvirt-66-format","id":"virtio-disk262"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-d.img","node-name":"libvirt-65-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-65-format","read-only":false,"driver":"raw","file":"libvirt-65-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0xe,drive=libvirt-65-format,id=virtio-disk263 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xe","drive":"libvirt-65-format","id":"virtio-disk263"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-a.img","node-name":"libvirt-64-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-64-format","read-only":false,"driver":"raw","file":"libvirt-64-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0xf,drive=libvirt-64-format,id=virtio-disk286 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0xf","drive":"libvirt-64-format","id":"virtio-disk286"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-b.img","node-name":"libvirt-63-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-63-format","read-only":false,"driver":"raw","file":"libvirt-63-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x10,drive=libvirt-63-format,id=virtio-disk287 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x10","drive":"libvirt-63-format","id":"virtio-disk287"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-c.img","node-name":"libvirt-62-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-62-format","read-only":false,"driver":"raw","file":"libvirt-62-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x11,drive=libvirt-62-format,id=virtio-disk288 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x11","drive":"libvirt-62-format","id":"virtio-disk288"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-d.img","node-name":"libvirt-61-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-61-format","read-only":false,"driver":"raw","file":"libvirt-61-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x12,drive=libvirt-61-format,id=virtio-disk289 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x12","drive":"libvirt-61-format","id":"virtio-disk289"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-a.img","node-name":"libvirt-60-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-60-format","read-only":false,"driver":"raw","file":"libvirt-60-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x13,drive=libvirt-60-format,id=virtio-disk312 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x13","drive":"libvirt-60-format","id":"virtio-disk312"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-b.img","node-name":"libvirt-59-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-59-format","read-only":false,"driver":"raw","file":"libvirt-59-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x14,drive=libvirt-59-format,id=virtio-disk313 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x14","drive":"libvirt-59-format","id":"virtio-disk313"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-c.img","node-name":"libvirt-58-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-58-format","read-only":false,"driver":"raw","file":"libvirt-58-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x15,drive=libvirt-58-format,id=virtio-disk314 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x15","drive":"libvirt-58-format","id":"virtio-disk314"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-d.img","node-name":"libvirt-57-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-57-format","read-only":false,"driver":"raw","file":"libvirt-57-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x16,drive=libvirt-57-format,id=virtio-disk315 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x16","drive":"libvirt-57-format","id":"virtio-disk315"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-a.img","node-name":"libvirt-56-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-56-format","read-only":false,"driver":"raw","file":"libvirt-56-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x17,drive=libvirt-56-format,id=virtio-disk338 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x17","drive":"libvirt-56-format","id":"virtio-disk338"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-b.img","node-name":"libvirt-55-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-55-format","read-only":false,"driver":"raw","file":"libvirt-55-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x18,drive=libvirt-55-format,id=virtio-disk339 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x18","drive":"libvirt-55-format","id":"virtio-disk339"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-c.img","node-name":"libvirt-54-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-54-format","read-only":false,"driver":"raw","file":"libvirt-54-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x19,drive=libvirt-54-format,id=virtio-disk340 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x19","drive":"libvirt-54-format","id":"virtio-disk340"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-d.img","node-name":"libvirt-53-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-53-format","read-only":false,"driver":"raw","file":"libvirt-53-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x1a,drive=libvirt-53-format,id=virtio-disk341 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1a","drive":"libvirt-53-format","id":"virtio-disk341"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-a.img","node-name":"libvirt-52-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-52-format","read-only":false,"driver":"raw","file":"libvirt-52-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x1b,drive=libvirt-52-format,id=virtio-disk364 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1b","drive":"libvirt-52-format","id":"virtio-disk364"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-b.img","node-name":"libvirt-51-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-51-format","read-only":false,"driver":"raw","file":"libvirt-51-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x1c,drive=libvirt-51-format,id=virtio-disk365 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1c","drive":"libvirt-51-format","id":"virtio-disk365"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-c.img","node-name":"libvirt-50-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-50-format","read-only":false,"driver":"raw","file":"libvirt-50-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x1d,drive=libvirt-50-format,id=virtio-disk366 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1d","drive":"libvirt-50-format","id":"virtio-disk366"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-d.img","node-name":"libvirt-49-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-49-format","read-only":false,"driver":"raw","file":"libvirt-49-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x1e,drive=libvirt-49-format,id=virtio-disk367 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1e","drive":"libvirt-49-format","id":"virtio-disk367"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-a.img","node-name":"libvirt-48-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-48-format","read-only":false,"driver":"raw","file":"libvirt-48-storage"}'
\
--device virtio-blk-pci,bus=pci.1,addr=0x1f,drive=libvirt-48-format,id=virtio-disk390 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x1f","drive":"libvirt-48-format","id":"virtio-disk390"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-b.img","node-name":"libvirt-47-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-47-format","read-only":false,"driver":"raw","file":"libvirt-47-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x1,drive=libvirt-47-format,id=virtio-disk391 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1","drive":"libvirt-47-format","id":"virtio-disk391"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-c.img","node-name":"libvirt-46-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-46-format","read-only":false,"driver":"raw","file":"libvirt-46-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x2,drive=libvirt-46-format,id=virtio-disk392 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x2","drive":"libvirt-46-format","id":"virtio-disk392"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-d.img","node-name":"libvirt-45-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-45-format","read-only":false,"driver":"raw","file":"libvirt-45-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x3,drive=libvirt-45-format,id=virtio-disk393 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x3","drive":"libvirt-45-format","id":"virtio-disk393"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-a.img","node-name":"libvirt-44-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-44-format","read-only":false,"driver":"raw","file":"libvirt-44-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x4,drive=libvirt-44-format,id=virtio-disk416 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x4","drive":"libvirt-44-format","id":"virtio-disk416"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-b.img","node-name":"libvirt-43-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-43-format","read-only":false,"driver":"raw","file":"libvirt-43-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x5,drive=libvirt-43-format,id=virtio-disk417 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x5","drive":"libvirt-43-format","id":"virtio-disk417"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-c.img","node-name":"libvirt-42-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-42-format","read-only":false,"driver":"raw","file":"libvirt-42-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x6,drive=libvirt-42-format,id=virtio-disk418 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x6","drive":"libvirt-42-format","id":"virtio-disk418"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-d.img","node-name":"libvirt-41-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-41-format","read-only":false,"driver":"raw","file":"libvirt-41-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x7,drive=libvirt-41-format,id=virtio-disk419 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x7","drive":"libvirt-41-format","id":"virtio-disk419"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-a.img","node-name":"libvirt-40-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-40-format","read-only":false,"driver":"raw","file":"libvirt-40-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x8,drive=libvirt-40-format,id=virtio-disk442 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x8","drive":"libvirt-40-format","id":"virtio-disk442"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-b.img","node-name":"libvirt-39-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-39-format","read-only":false,"driver":"raw","file":"libvirt-39-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x9,drive=libvirt-39-format,id=virtio-disk443 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x9","drive":"libvirt-39-format","id":"virtio-disk443"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-c.img","node-name":"libvirt-38-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-38-format","read-only":false,"driver":"raw","file":"libvirt-38-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0xa,drive=libvirt-38-format,id=virtio-disk444 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xa","drive":"libvirt-38-format","id":"virtio-disk444"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-d.img","node-name":"libvirt-37-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-37-format","read-only":false,"driver":"raw","file":"libvirt-37-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0xb,drive=libvirt-37-format,id=virtio-disk445 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xb","drive":"libvirt-37-format","id":"virtio-disk445"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-a.img","node-name":"libvirt-36-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-36-format","read-only":false,"driver":"raw","file":"libvirt-36-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0xc,drive=libvirt-36-format,id=virtio-disk468 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xc","drive":"libvirt-36-format","id":"virtio-disk468"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-b.img","node-name":"libvirt-35-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-35-format","read-only":false,"driver":"raw","file":"libvirt-35-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0xd,drive=libvirt-35-format,id=virtio-disk469 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xd","drive":"libvirt-35-format","id":"virtio-disk469"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-c.img","node-name":"libvirt-34-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-34-format","read-only":false,"driver":"raw","file":"libvirt-34-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0xe,drive=libvirt-34-format,id=virtio-disk470 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xe","drive":"libvirt-34-format","id":"virtio-disk470"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-d.img","node-name":"libvirt-33-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-33-format","read-only":false,"driver":"raw","file":"libvirt-33-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0xf,drive=libvirt-33-format,id=virtio-disk471 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0xf","drive":"libvirt-33-format","id":"virtio-disk471"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-a.img","node-name":"libvirt-32-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-32-format","read-only":false,"driver":"raw","file":"libvirt-32-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x10,drive=libvirt-32-format,id=virtio-disk494 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x10","drive":"libvirt-32-format","id":"virtio-disk494"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-b.img","node-name":"libvirt-31-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-31-format","read-only":false,"driver":"raw","file":"libvirt-31-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x11,drive=libvirt-31-format,id=virtio-disk495 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x11","drive":"libvirt-31-format","id":"virtio-disk495"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-c.img","node-name":"libvirt-30-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-30-format","read-only":false,"driver":"raw","file":"libvirt-30-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x12,drive=libvirt-30-format,id=virtio-disk496 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x12","drive":"libvirt-30-format","id":"virtio-disk496"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-d.img","node-name":"libvirt-29-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-29-format","read-only":false,"driver":"raw","file":"libvirt-29-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x13,drive=libvirt-29-format,id=virtio-disk497 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x13","drive":"libvirt-29-format","id":"virtio-disk497"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-a.img","node-name":"libvirt-28-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-28-format","read-only":false,"driver":"raw","file":"libvirt-28-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x14,drive=libvirt-28-format,id=virtio-disk520 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x14","drive":"libvirt-28-format","id":"virtio-disk520"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-b.img","node-name":"libvirt-27-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-27-format","read-only":false,"driver":"raw","file":"libvirt-27-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x15,drive=libvirt-27-format,id=virtio-disk521 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x15","drive":"libvirt-27-format","id":"virtio-disk521"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-c.img","node-name":"libvirt-26-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-26-format","read-only":false,"driver":"raw","file":"libvirt-26-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x16,drive=libvirt-26-format,id=virtio-disk522 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x16","drive":"libvirt-26-format","id":"virtio-disk522"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-d.img","node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-25-format","read-only":false,"driver":"raw","file":"libvirt-25-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x17,drive=libvirt-25-format,id=virtio-disk523 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x17","drive":"libvirt-25-format","id":"virtio-disk523"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-a.img","node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-24-format","read-only":false,"driver":"raw","file":"libvirt-24-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x18,drive=libvirt-24-format,id=virtio-disk546 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x18","drive":"libvirt-24-format","id":"virtio-disk546"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-b.img","node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-23-format","read-only":false,"driver":"raw","file":"libvirt-23-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x19,drive=libvirt-23-format,id=virtio-disk547 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x19","drive":"libvirt-23-format","id":"virtio-disk547"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-c.img","node-name":"libvirt-22-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-22-format","read-only":false,"driver":"raw","file":"libvirt-22-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x1a,drive=libvirt-22-format,id=virtio-disk548 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1a","drive":"libvirt-22-format","id":"virtio-disk548"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-d.img","node-name":"libvirt-21-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-21-format","read-only":false,"driver":"raw","file":"libvirt-21-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x1b,drive=libvirt-21-format,id=virtio-disk549 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1b","drive":"libvirt-21-format","id":"virtio-disk549"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-a.img","node-name":"libvirt-20-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-20-format","read-only":false,"driver":"raw","file":"libvirt-20-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x1c,drive=libvirt-20-format,id=virtio-disk572 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1c","drive":"libvirt-20-format","id":"virtio-disk572"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-b.img","node-name":"libvirt-19-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-19-format","read-only":false,"driver":"raw","file":"libvirt-19-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x1d,drive=libvirt-19-format,id=virtio-disk573 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1d","drive":"libvirt-19-format","id":"virtio-disk573"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-c.img","node-name":"libvirt-18-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-18-format","read-only":false,"driver":"raw","file":"libvirt-18-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x1e,drive=libvirt-18-format,id=virtio-disk574 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1e","drive":"libvirt-18-format","id":"virtio-disk574"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-d.img","node-name":"libvirt-17-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-17-format","read-only":false,"driver":"raw","file":"libvirt-17-storage"}'
\
--device virtio-blk-pci,bus=pci.2,addr=0x1f,drive=libvirt-17-format,id=virtio-disk575 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x1f","drive":"libvirt-17-format","id":"virtio-disk575"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-a.img","node-name":"libvirt-16-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-16-format","read-only":false,"driver":"raw","file":"libvirt-16-storage"}'
\
--device virtio-blk-pci,bus=pci.3,addr=0x1,drive=libvirt-16-format,id=virtio-disk598 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x1","drive":"libvirt-16-format","id":"virtio-disk598"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-b.img","node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-15-format","read-only":false,"driver":"raw","file":"libvirt-15-storage"}'
\
--device virtio-blk-pci,bus=pci.3,addr=0x2,drive=libvirt-15-format,id=virtio-disk599 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x2","drive":"libvirt-15-format","id":"virtio-disk599"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-c.img","node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-14-format","read-only":false,"driver":"raw","file":"libvirt-14-storage"}'
\
--device virtio-blk-pci,bus=pci.3,addr=0x3,drive=libvirt-14-format,id=virtio-disk600 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x3","drive":"libvirt-14-format","id":"virtio-disk600"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-d.img","node-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-13-format","read-only":false,"driver":"raw","file":"libvirt-13-storage"}'
\
--device virtio-blk-pci,bus=pci.3,addr=0x4,drive=libvirt-13-format,id=virtio-disk601 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x4","drive":"libvirt-13-format","id":"virtio-disk601"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-a.img","node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-12-format","read-only":false,"driver":"raw","file":"libvirt-12-storage"}'
\
--device virtio-blk-pci,bus=pci.3,addr=0x5,drive=libvirt-12-format,id=virtio-disk624 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x5","drive":"libvirt-12-format","id":"virtio-disk624"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-b.img","node-name":"libvirt-11-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-11-format","read-only":false,"driver":"raw","file":"libvirt-11-storage"}'
\
--device virtio-blk-pci,bus=pci.3,addr=0x6,drive=libvirt-11-format,id=virtio-disk625 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x6","drive":"libvirt-11-format","id":"virtio-disk625"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-c.img","node-name":"libvirt-10-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-10-format","read-only":false,"driver":"raw","file":"libvirt-10-storage"}'
\
--device virtio-blk-pci,bus=pci.3,addr=0x7,drive=libvirt-10-format,id=virtio-disk626 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x7","drive":"libvirt-10-format","id":"virtio-disk626"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-d.img","node-name":"libvirt-9-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-9-format","read-only":false,"driver":"raw","file":"libvirt-9-storage"}'
\
--device virtio-blk-pci,bus=pci.3,addr=0x8,drive=libvirt-9-format,id=virtio-disk627 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x8","drive":"libvirt-9-format","id":"virtio-disk627"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-a.img","node-name":"libvirt-8-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-8-format","read-only":false,"driver":"raw","file":"libvirt-8-storage"}'
\
--device virtio-blk-pci,bus=pci.3,addr=0x9,drive=libvirt-8-format,id=virtio-disk650 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x9","drive":"libvirt-8-format","id":"virtio-disk650"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-b.img","node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-7-format","read-only":false,"driver":"raw","file":"libvirt-7-storage"}'
\
--device virtio-blk-pci,bus=pci.3,addr=0xa,drive=libvirt-7-format,id=virtio-disk651 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xa","drive":"libvirt-7-format","id":"virtio-disk651"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-c.img","node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-6-format","read-only":false,"driver":"raw","file":"libvirt-6-storage"}'
\
--device virtio-blk-pci,bus=pci.3,addr=0xb,drive=libvirt-6-format,id=virtio-disk652 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xb","drive":"libvirt-6-format","id":"virtio-disk652"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-d.img","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-5-format","read-only":false,"driver":"raw","file":"libvirt-5-storage"}'
\
--device virtio-blk-pci,bus=pci.3,addr=0xc,drive=libvirt-5-format,id=virtio-disk653 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xc","drive":"libvirt-5-format","id":"virtio-disk653"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-a.img","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-4-format","read-only":false,"driver":"raw","file":"libvirt-4-storage"}'
\
--device virtio-blk-pci,bus=pci.3,addr=0xd,drive=libvirt-4-format,id=virtio-disk676 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xd","drive":"libvirt-4-format","id":"virtio-disk676"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-b.img","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-3-format","read-only":false,"driver":"raw","file":"libvirt-3-storage"}'
\
--device virtio-blk-pci,bus=pci.3,addr=0xe,drive=libvirt-3-format,id=virtio-disk677 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xe","drive":"libvirt-3-format","id":"virtio-disk677"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-c.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
--device virtio-blk-pci,bus=pci.3,addr=0xf,drive=libvirt-2-format,id=virtio-disk678 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0xf","drive":"libvirt-2-format","id":"virtio-disk678"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-d.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device virtio-blk-pci,bus=pci.3,addr=0x10,drive=libvirt-1-format,id=virtio-disk679 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x10","drive":"libvirt-1-format","id":"virtio-disk679"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-bridge.args
b/tests/qemuxml2argvdata/pci-bridge.args
index 0740a887ba..1e1d4c30e2 100644
--- a/tests/qemuxml2argvdata/pci-bridge.args
+++ b/tests/qemuxml2argvdata/pci-bridge.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr-br,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -23,79 +23,79 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x3 \
--device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x4 \
+-device
'{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0","addr":"0x3"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.0","addr":"0x4"}'
\
-usb \
-blockdev
'{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0 \
--netdev user,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:f1:95:51,bus=pci.0,addr=0x5 \
--netdev user,id=hostnet1 \
--device e1000,netdev=hostnet1,id=net1,mac=52:54:00:5c:c6:1a,bus=pci.0,addr=0x7 \
--netdev user,id=hostnet2 \
--device e1000,netdev=hostnet2,id=net2,mac=52:54:00:39:97:ac,bus=pci.0,addr=0x8 \
--netdev user,id=hostnet3 \
--device e1000,netdev=hostnet3,id=net3,mac=52:54:00:45:28:cb,bus=pci.0,addr=0x9 \
--netdev user,id=hostnet4 \
--device e1000,netdev=hostnet4,id=net4,mac=52:54:00:ee:b9:a8,bus=pci.0,addr=0xa \
--netdev user,id=hostnet5 \
--device e1000,netdev=hostnet5,id=net5,mac=52:54:00:a9:f7:17,bus=pci.0,addr=0xb \
--netdev user,id=hostnet6 \
--device e1000,netdev=hostnet6,id=net6,mac=52:54:00:df:2b:f3,bus=pci.0,addr=0xc \
--netdev user,id=hostnet7 \
--device e1000,netdev=hostnet7,id=net7,mac=52:54:00:78:94:b4,bus=pci.0,addr=0xd \
--netdev user,id=hostnet8 \
--device e1000,netdev=hostnet8,id=net8,mac=52:54:00:6b:9b:06,bus=pci.0,addr=0xe \
--netdev user,id=hostnet9 \
--device e1000,netdev=hostnet9,id=net9,mac=52:54:00:17:df:bc,bus=pci.0,addr=0xf \
--netdev user,id=hostnet10 \
--device rtl8139,netdev=hostnet10,id=net10,mac=52:54:00:3b:d0:51,bus=pci.0,addr=0x10 \
--netdev user,id=hostnet11 \
--device e1000,netdev=hostnet11,id=net11,mac=52:54:00:8d:2d:17,bus=pci.0,addr=0x11 \
--netdev user,id=hostnet12 \
--device e1000,netdev=hostnet12,id=net12,mac=52:54:00:a7:66:af,bus=pci.0,addr=0x12 \
--netdev user,id=hostnet13 \
--device e1000,netdev=hostnet13,id=net13,mac=52:54:00:54:ab:d7,bus=pci.0,addr=0x13 \
--netdev user,id=hostnet14 \
--device e1000,netdev=hostnet14,id=net14,mac=52:54:00:1f:99:90,bus=pci.0,addr=0x14 \
--netdev user,id=hostnet15 \
--device e1000,netdev=hostnet15,id=net15,mac=52:54:00:c8:43:87,bus=pci.0,addr=0x15 \
--netdev user,id=hostnet16 \
--device e1000,netdev=hostnet16,id=net16,mac=52:54:00:df:22:b2,bus=pci.0,addr=0x16 \
--netdev user,id=hostnet17 \
--device e1000,netdev=hostnet17,id=net17,mac=52:54:00:d2:9a:47,bus=pci.0,addr=0x17 \
--netdev user,id=hostnet18 \
--device e1000,netdev=hostnet18,id=net18,mac=52:54:00:86:05:e2,bus=pci.0,addr=0x18 \
--netdev user,id=hostnet19 \
--device e1000,netdev=hostnet19,id=net19,mac=52:54:00:8c:1c:c2,bus=pci.0,addr=0x19 \
--netdev user,id=hostnet20 \
--device e1000,netdev=hostnet20,id=net20,mac=52:54:00:48:58:92,bus=pci.0,addr=0x1a \
--netdev user,id=hostnet21 \
--device e1000,netdev=hostnet21,id=net21,mac=52:54:00:99:e5:bf,bus=pci.0,addr=0x1b \
--netdev user,id=hostnet22 \
--device e1000,netdev=hostnet22,id=net22,mac=52:54:00:b1:8c:25,bus=pci.0,addr=0x1c \
--netdev user,id=hostnet23 \
--device e1000,netdev=hostnet23,id=net23,mac=52:54:00:60:e0:d0,bus=pci.0,addr=0x1d \
--netdev user,id=hostnet24 \
--device e1000,netdev=hostnet24,id=net24,mac=52:54:00:37:00:6a,bus=pci.0,addr=0x1e \
--netdev user,id=hostnet25 \
--device e1000,netdev=hostnet25,id=net25,mac=52:54:00:c7:c8:ad,bus=pci.0,addr=0x1f \
--netdev user,id=hostnet26 \
--device e1000,netdev=hostnet26,id=net26,mac=52:54:00:4e:a7:cf,bus=pci.1,addr=0x1 \
--netdev user,id=hostnet27 \
--device e1000,netdev=hostnet27,id=net27,mac=52:54:00:00:79:69,bus=pci.1,addr=0x2 \
--netdev user,id=hostnet28 \
--device e1000,netdev=hostnet28,id=net28,mac=52:54:00:47:00:6f,bus=pci.1,addr=0x3 \
--netdev user,id=hostnet29 \
--device e1000,netdev=hostnet29,id=net29,mac=52:54:00:2a:8c:8b,bus=pci.1,addr=0x4 \
--netdev user,id=hostnet30 \
--device e1000,netdev=hostnet30,id=net30,mac=52:54:00:ec:d5:e3,bus=pci.1,addr=0x5 \
--netdev user,id=hostnet31 \
--device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6e:c8,bus=pci.1,addr=0x6 \
+-device
'{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0"}'
\
+-netdev '{"type":"user","id":"hostnet0"}'
\
+-device
'{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:f1:95:51","bus":"pci.0","addr":"0x5"}'
\
+-netdev '{"type":"user","id":"hostnet1"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet1","id":"net1","mac":"52:54:00:5c:c6:1a","bus":"pci.0","addr":"0x7"}'
\
+-netdev '{"type":"user","id":"hostnet2"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet2","id":"net2","mac":"52:54:00:39:97:ac","bus":"pci.0","addr":"0x8"}'
\
+-netdev '{"type":"user","id":"hostnet3"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet3","id":"net3","mac":"52:54:00:45:28:cb","bus":"pci.0","addr":"0x9"}'
\
+-netdev '{"type":"user","id":"hostnet4"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet4","id":"net4","mac":"52:54:00:ee:b9:a8","bus":"pci.0","addr":"0xa"}'
\
+-netdev '{"type":"user","id":"hostnet5"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet5","id":"net5","mac":"52:54:00:a9:f7:17","bus":"pci.0","addr":"0xb"}'
\
+-netdev '{"type":"user","id":"hostnet6"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet6","id":"net6","mac":"52:54:00:df:2b:f3","bus":"pci.0","addr":"0xc"}'
\
+-netdev '{"type":"user","id":"hostnet7"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet7","id":"net7","mac":"52:54:00:78:94:b4","bus":"pci.0","addr":"0xd"}'
\
+-netdev '{"type":"user","id":"hostnet8"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet8","id":"net8","mac":"52:54:00:6b:9b:06","bus":"pci.0","addr":"0xe"}'
\
+-netdev '{"type":"user","id":"hostnet9"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet9","id":"net9","mac":"52:54:00:17:df:bc","bus":"pci.0","addr":"0xf"}'
\
+-netdev
'{"type":"user","id":"hostnet10"}' \
+-device
'{"driver":"rtl8139","netdev":"hostnet10","id":"net10","mac":"52:54:00:3b:d0:51","bus":"pci.0","addr":"0x10"}'
\
+-netdev
'{"type":"user","id":"hostnet11"}' \
+-device
'{"driver":"e1000","netdev":"hostnet11","id":"net11","mac":"52:54:00:8d:2d:17","bus":"pci.0","addr":"0x11"}'
\
+-netdev
'{"type":"user","id":"hostnet12"}' \
+-device
'{"driver":"e1000","netdev":"hostnet12","id":"net12","mac":"52:54:00:a7:66:af","bus":"pci.0","addr":"0x12"}'
\
+-netdev
'{"type":"user","id":"hostnet13"}' \
+-device
'{"driver":"e1000","netdev":"hostnet13","id":"net13","mac":"52:54:00:54:ab:d7","bus":"pci.0","addr":"0x13"}'
\
+-netdev
'{"type":"user","id":"hostnet14"}' \
+-device
'{"driver":"e1000","netdev":"hostnet14","id":"net14","mac":"52:54:00:1f:99:90","bus":"pci.0","addr":"0x14"}'
\
+-netdev
'{"type":"user","id":"hostnet15"}' \
+-device
'{"driver":"e1000","netdev":"hostnet15","id":"net15","mac":"52:54:00:c8:43:87","bus":"pci.0","addr":"0x15"}'
\
+-netdev
'{"type":"user","id":"hostnet16"}' \
+-device
'{"driver":"e1000","netdev":"hostnet16","id":"net16","mac":"52:54:00:df:22:b2","bus":"pci.0","addr":"0x16"}'
\
+-netdev
'{"type":"user","id":"hostnet17"}' \
+-device
'{"driver":"e1000","netdev":"hostnet17","id":"net17","mac":"52:54:00:d2:9a:47","bus":"pci.0","addr":"0x17"}'
\
+-netdev
'{"type":"user","id":"hostnet18"}' \
+-device
'{"driver":"e1000","netdev":"hostnet18","id":"net18","mac":"52:54:00:86:05:e2","bus":"pci.0","addr":"0x18"}'
\
+-netdev
'{"type":"user","id":"hostnet19"}' \
+-device
'{"driver":"e1000","netdev":"hostnet19","id":"net19","mac":"52:54:00:8c:1c:c2","bus":"pci.0","addr":"0x19"}'
\
+-netdev
'{"type":"user","id":"hostnet20"}' \
+-device
'{"driver":"e1000","netdev":"hostnet20","id":"net20","mac":"52:54:00:48:58:92","bus":"pci.0","addr":"0x1a"}'
\
+-netdev
'{"type":"user","id":"hostnet21"}' \
+-device
'{"driver":"e1000","netdev":"hostnet21","id":"net21","mac":"52:54:00:99:e5:bf","bus":"pci.0","addr":"0x1b"}'
\
+-netdev
'{"type":"user","id":"hostnet22"}' \
+-device
'{"driver":"e1000","netdev":"hostnet22","id":"net22","mac":"52:54:00:b1:8c:25","bus":"pci.0","addr":"0x1c"}'
\
+-netdev
'{"type":"user","id":"hostnet23"}' \
+-device
'{"driver":"e1000","netdev":"hostnet23","id":"net23","mac":"52:54:00:60:e0:d0","bus":"pci.0","addr":"0x1d"}'
\
+-netdev
'{"type":"user","id":"hostnet24"}' \
+-device
'{"driver":"e1000","netdev":"hostnet24","id":"net24","mac":"52:54:00:37:00:6a","bus":"pci.0","addr":"0x1e"}'
\
+-netdev
'{"type":"user","id":"hostnet25"}' \
+-device
'{"driver":"e1000","netdev":"hostnet25","id":"net25","mac":"52:54:00:c7:c8:ad","bus":"pci.0","addr":"0x1f"}'
\
+-netdev
'{"type":"user","id":"hostnet26"}' \
+-device
'{"driver":"e1000","netdev":"hostnet26","id":"net26","mac":"52:54:00:4e:a7:cf","bus":"pci.1","addr":"0x1"}'
\
+-netdev
'{"type":"user","id":"hostnet27"}' \
+-device
'{"driver":"e1000","netdev":"hostnet27","id":"net27","mac":"52:54:00:00:79:69","bus":"pci.1","addr":"0x2"}'
\
+-netdev
'{"type":"user","id":"hostnet28"}' \
+-device
'{"driver":"e1000","netdev":"hostnet28","id":"net28","mac":"52:54:00:47:00:6f","bus":"pci.1","addr":"0x3"}'
\
+-netdev
'{"type":"user","id":"hostnet29"}' \
+-device
'{"driver":"e1000","netdev":"hostnet29","id":"net29","mac":"52:54:00:2a:8c:8b","bus":"pci.1","addr":"0x4"}'
\
+-netdev
'{"type":"user","id":"hostnet30"}' \
+-device
'{"driver":"e1000","netdev":"hostnet30","id":"net30","mac":"52:54:00:ec:d5:e3","bus":"pci.1","addr":"0x5"}'
\
+-netdev
'{"type":"user","id":"hostnet31"}' \
+-device
'{"driver":"e1000","netdev":"hostnet31","id":"net31","mac":"52:54:00:7e:6e:c8","bus":"pci.1","addr":"0x6"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-vnc 127.0.0.1:0,audiodev=audio1 \
-k en-us \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
+-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args
b/tests/qemuxml2argvdata/pci-expander-bus.args
index 16622b8b83..e4c9bfead0 100644
--- a/tests/qemuxml2argvdata/pci-expander-bus.args
+++ b/tests/qemuxml2argvdata/pci-expander-bus.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-expander-test/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=expander-test,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-expander-test/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-expander-test/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -27,72 +27,72 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-expander-test/.config
\
-no-shutdown \
-no-acpi \
-boot strict=on \
--device pxb,bus_nr=254,id=pci.1,numa_node=1,bus=pci.0,addr=0x2 \
--device pxb,bus_nr=252,id=pci.2,bus=pci.0,addr=0x3 \
--netdev user,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:f1:95:51,bus=pci.0,addr=0x4 \
--netdev user,id=hostnet1 \
--device e1000,netdev=hostnet1,id=net1,mac=52:54:00:5c:c6:1a,bus=pci.0,addr=0x5 \
--netdev user,id=hostnet2 \
--device e1000,netdev=hostnet2,id=net2,mac=52:54:00:39:97:ac,bus=pci.0,addr=0x7 \
--netdev user,id=hostnet3 \
--device e1000,netdev=hostnet3,id=net3,mac=52:54:00:45:28:cb,bus=pci.0,addr=0x8 \
--netdev user,id=hostnet4 \
--device e1000,netdev=hostnet4,id=net4,mac=52:54:00:ee:b9:a8,bus=pci.0,addr=0x9 \
--netdev user,id=hostnet5 \
--device e1000,netdev=hostnet5,id=net5,mac=52:54:00:a9:f7:17,bus=pci.0,addr=0xa \
--netdev user,id=hostnet6 \
--device e1000,netdev=hostnet6,id=net6,mac=52:54:00:df:2b:f3,bus=pci.0,addr=0xb \
--netdev user,id=hostnet7 \
--device e1000,netdev=hostnet7,id=net7,mac=52:54:00:78:94:b4,bus=pci.0,addr=0xc \
--netdev user,id=hostnet8 \
--device e1000,netdev=hostnet8,id=net8,mac=52:54:00:6b:9b:06,bus=pci.0,addr=0xd \
--netdev user,id=hostnet9 \
--device e1000,netdev=hostnet9,id=net9,mac=52:54:00:17:df:bc,bus=pci.0,addr=0xe \
--netdev user,id=hostnet10 \
--device e1000,netdev=hostnet10,id=net10,mac=52:54:00:3b:d0:51,bus=pci.0,addr=0xf \
--netdev user,id=hostnet11 \
--device e1000,netdev=hostnet11,id=net11,mac=52:54:00:8d:2d:17,bus=pci.0,addr=0x10 \
--netdev user,id=hostnet12 \
--device e1000,netdev=hostnet12,id=net12,mac=52:54:00:a7:66:af,bus=pci.0,addr=0x11 \
--netdev user,id=hostnet13 \
--device e1000,netdev=hostnet13,id=net13,mac=52:54:00:54:ab:d7,bus=pci.0,addr=0x12 \
--netdev user,id=hostnet14 \
--device e1000,netdev=hostnet14,id=net14,mac=52:54:00:1f:99:90,bus=pci.0,addr=0x13 \
--netdev user,id=hostnet15 \
--device e1000,netdev=hostnet15,id=net15,mac=52:54:00:c8:43:87,bus=pci.0,addr=0x14 \
--netdev user,id=hostnet16 \
--device e1000,netdev=hostnet16,id=net16,mac=52:54:00:df:22:b2,bus=pci.0,addr=0x15 \
--netdev user,id=hostnet17 \
--device e1000,netdev=hostnet17,id=net17,mac=52:54:00:d2:9a:47,bus=pci.0,addr=0x16 \
--netdev user,id=hostnet18 \
--device e1000,netdev=hostnet18,id=net18,mac=52:54:00:86:05:e2,bus=pci.0,addr=0x17 \
--netdev user,id=hostnet19 \
--device e1000,netdev=hostnet19,id=net19,mac=52:54:00:8c:1c:c2,bus=pci.0,addr=0x18 \
--netdev user,id=hostnet20 \
--device e1000,netdev=hostnet20,id=net20,mac=52:54:00:48:58:92,bus=pci.0,addr=0x19 \
--netdev user,id=hostnet21 \
--device e1000,netdev=hostnet21,id=net21,mac=52:54:00:99:e5:bf,bus=pci.0,addr=0x1a \
--netdev user,id=hostnet22 \
--device e1000,netdev=hostnet22,id=net22,mac=52:54:00:b1:8c:25,bus=pci.0,addr=0x1b \
--netdev user,id=hostnet23 \
--device e1000,netdev=hostnet23,id=net23,mac=52:54:00:60:e0:d0,bus=pci.0,addr=0x1c \
--netdev user,id=hostnet24 \
--device e1000,netdev=hostnet24,id=net24,mac=52:54:00:37:00:6a,bus=pci.0,addr=0x1d \
--netdev user,id=hostnet25 \
--device e1000,netdev=hostnet25,id=net25,mac=52:54:00:c7:c8:ad,bus=pci.0,addr=0x1e \
--netdev user,id=hostnet26 \
--device e1000,netdev=hostnet26,id=net26,mac=52:54:00:4e:a7:cf,bus=pci.0,addr=0x1f \
--netdev user,id=hostnet27 \
--device e1000,netdev=hostnet27,id=net27,mac=52:54:00:00:79:69,bus=pci.1,addr=0x0 \
--netdev user,id=hostnet28 \
--device e1000,netdev=hostnet28,id=net28,mac=52:54:00:47:00:6f,bus=pci.1,addr=0x1 \
--netdev user,id=hostnet29 \
--device e1000,netdev=hostnet29,id=net29,mac=52:54:00:2a:8c:8b,bus=pci.1,addr=0x2 \
--netdev user,id=hostnet30 \
--device e1000,netdev=hostnet30,id=net30,mac=52:54:00:ec:d5:e3,bus=pci.1,addr=0x3 \
--netdev user,id=hostnet31 \
--device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6e:c8,bus=pci.1,addr=0x4 \
+-device
'{"driver":"pxb","bus_nr":254,"id":"pci.1","numa_node":1,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"pxb","bus_nr":252,"id":"pci.2","bus":"pci.0","addr":"0x3"}'
\
+-netdev '{"type":"user","id":"hostnet0"}'
\
+-device
'{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:f1:95:51","bus":"pci.0","addr":"0x4"}'
\
+-netdev '{"type":"user","id":"hostnet1"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet1","id":"net1","mac":"52:54:00:5c:c6:1a","bus":"pci.0","addr":"0x5"}'
\
+-netdev '{"type":"user","id":"hostnet2"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet2","id":"net2","mac":"52:54:00:39:97:ac","bus":"pci.0","addr":"0x7"}'
\
+-netdev '{"type":"user","id":"hostnet3"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet3","id":"net3","mac":"52:54:00:45:28:cb","bus":"pci.0","addr":"0x8"}'
\
+-netdev '{"type":"user","id":"hostnet4"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet4","id":"net4","mac":"52:54:00:ee:b9:a8","bus":"pci.0","addr":"0x9"}'
\
+-netdev '{"type":"user","id":"hostnet5"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet5","id":"net5","mac":"52:54:00:a9:f7:17","bus":"pci.0","addr":"0xa"}'
\
+-netdev '{"type":"user","id":"hostnet6"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet6","id":"net6","mac":"52:54:00:df:2b:f3","bus":"pci.0","addr":"0xb"}'
\
+-netdev '{"type":"user","id":"hostnet7"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet7","id":"net7","mac":"52:54:00:78:94:b4","bus":"pci.0","addr":"0xc"}'
\
+-netdev '{"type":"user","id":"hostnet8"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet8","id":"net8","mac":"52:54:00:6b:9b:06","bus":"pci.0","addr":"0xd"}'
\
+-netdev '{"type":"user","id":"hostnet9"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet9","id":"net9","mac":"52:54:00:17:df:bc","bus":"pci.0","addr":"0xe"}'
\
+-netdev
'{"type":"user","id":"hostnet10"}' \
+-device
'{"driver":"e1000","netdev":"hostnet10","id":"net10","mac":"52:54:00:3b:d0:51","bus":"pci.0","addr":"0xf"}'
\
+-netdev
'{"type":"user","id":"hostnet11"}' \
+-device
'{"driver":"e1000","netdev":"hostnet11","id":"net11","mac":"52:54:00:8d:2d:17","bus":"pci.0","addr":"0x10"}'
\
+-netdev
'{"type":"user","id":"hostnet12"}' \
+-device
'{"driver":"e1000","netdev":"hostnet12","id":"net12","mac":"52:54:00:a7:66:af","bus":"pci.0","addr":"0x11"}'
\
+-netdev
'{"type":"user","id":"hostnet13"}' \
+-device
'{"driver":"e1000","netdev":"hostnet13","id":"net13","mac":"52:54:00:54:ab:d7","bus":"pci.0","addr":"0x12"}'
\
+-netdev
'{"type":"user","id":"hostnet14"}' \
+-device
'{"driver":"e1000","netdev":"hostnet14","id":"net14","mac":"52:54:00:1f:99:90","bus":"pci.0","addr":"0x13"}'
\
+-netdev
'{"type":"user","id":"hostnet15"}' \
+-device
'{"driver":"e1000","netdev":"hostnet15","id":"net15","mac":"52:54:00:c8:43:87","bus":"pci.0","addr":"0x14"}'
\
+-netdev
'{"type":"user","id":"hostnet16"}' \
+-device
'{"driver":"e1000","netdev":"hostnet16","id":"net16","mac":"52:54:00:df:22:b2","bus":"pci.0","addr":"0x15"}'
\
+-netdev
'{"type":"user","id":"hostnet17"}' \
+-device
'{"driver":"e1000","netdev":"hostnet17","id":"net17","mac":"52:54:00:d2:9a:47","bus":"pci.0","addr":"0x16"}'
\
+-netdev
'{"type":"user","id":"hostnet18"}' \
+-device
'{"driver":"e1000","netdev":"hostnet18","id":"net18","mac":"52:54:00:86:05:e2","bus":"pci.0","addr":"0x17"}'
\
+-netdev
'{"type":"user","id":"hostnet19"}' \
+-device
'{"driver":"e1000","netdev":"hostnet19","id":"net19","mac":"52:54:00:8c:1c:c2","bus":"pci.0","addr":"0x18"}'
\
+-netdev
'{"type":"user","id":"hostnet20"}' \
+-device
'{"driver":"e1000","netdev":"hostnet20","id":"net20","mac":"52:54:00:48:58:92","bus":"pci.0","addr":"0x19"}'
\
+-netdev
'{"type":"user","id":"hostnet21"}' \
+-device
'{"driver":"e1000","netdev":"hostnet21","id":"net21","mac":"52:54:00:99:e5:bf","bus":"pci.0","addr":"0x1a"}'
\
+-netdev
'{"type":"user","id":"hostnet22"}' \
+-device
'{"driver":"e1000","netdev":"hostnet22","id":"net22","mac":"52:54:00:b1:8c:25","bus":"pci.0","addr":"0x1b"}'
\
+-netdev
'{"type":"user","id":"hostnet23"}' \
+-device
'{"driver":"e1000","netdev":"hostnet23","id":"net23","mac":"52:54:00:60:e0:d0","bus":"pci.0","addr":"0x1c"}'
\
+-netdev
'{"type":"user","id":"hostnet24"}' \
+-device
'{"driver":"e1000","netdev":"hostnet24","id":"net24","mac":"52:54:00:37:00:6a","bus":"pci.0","addr":"0x1d"}'
\
+-netdev
'{"type":"user","id":"hostnet25"}' \
+-device
'{"driver":"e1000","netdev":"hostnet25","id":"net25","mac":"52:54:00:c7:c8:ad","bus":"pci.0","addr":"0x1e"}'
\
+-netdev
'{"type":"user","id":"hostnet26"}' \
+-device
'{"driver":"e1000","netdev":"hostnet26","id":"net26","mac":"52:54:00:4e:a7:cf","bus":"pci.0","addr":"0x1f"}'
\
+-netdev
'{"type":"user","id":"hostnet27"}' \
+-device
'{"driver":"e1000","netdev":"hostnet27","id":"net27","mac":"52:54:00:00:79:69","bus":"pci.1","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet28"}' \
+-device
'{"driver":"e1000","netdev":"hostnet28","id":"net28","mac":"52:54:00:47:00:6f","bus":"pci.1","addr":"0x1"}'
\
+-netdev
'{"type":"user","id":"hostnet29"}' \
+-device
'{"driver":"e1000","netdev":"hostnet29","id":"net29","mac":"52:54:00:2a:8c:8b","bus":"pci.1","addr":"0x2"}'
\
+-netdev
'{"type":"user","id":"hostnet30"}' \
+-device
'{"driver":"e1000","netdev":"hostnet30","id":"net30","mac":"52:54:00:ec:d5:e3","bus":"pci.1","addr":"0x3"}'
\
+-netdev
'{"type":"user","id":"hostnet31"}' \
+-device
'{"driver":"e1000","netdev":"hostnet31","id":"net31","mac":"52:54:00:7e:6e:c8","bus":"pci.1","addr":"0x4"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args
index 494451423d..028f4bf278 100644
--- a/tests/qemuxml2argvdata/pci-many.args
+++ b/tests/qemuxml2argvdata/pci-many.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr-br,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-fdr-br/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -27,92 +27,92 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
-usb \
-blockdev
'{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-29-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-29-format","read-only":true,"driver":"raw","file":"libvirt-29-storage"}'
\
--device ide-cd,bus=ide.1,unit=0,drive=libvirt-29-format,id=ide0-1-0 \
+-device
'{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-29-format","id":"ide0-1-0"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/test.img","node-name":"libvirt-28-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-28-format","read-only":false,"driver":"raw","file":"libvirt-28-storage"}'
\
--device
virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-28-format,id=virtio-disk0,bootindex=1 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"libvirt-28-format","id":"virtio-disk0","bootindex":1}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/test1.img","node-name":"libvirt-27-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-27-format","read-only":false,"driver":"raw","file":"libvirt-27-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-27-format,id=virtio-disk1 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"libvirt-27-format","id":"virtio-disk1"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-a.img","node-name":"libvirt-26-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-26-format","read-only":false,"driver":"raw","file":"libvirt-26-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-26-format,id=virtio-disk26 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"libvirt-26-format","id":"virtio-disk26"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-b.img","node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-25-format","read-only":false,"driver":"raw","file":"libvirt-25-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=libvirt-25-format,id=virtio-disk27 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"libvirt-25-format","id":"virtio-disk27"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-c.img","node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-24-format","read-only":false,"driver":"raw","file":"libvirt-24-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x8,drive=libvirt-24-format,id=virtio-disk28 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x8","drive":"libvirt-24-format","id":"virtio-disk28"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-d.img","node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-23-format","read-only":false,"driver":"raw","file":"libvirt-23-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x9,drive=libvirt-23-format,id=virtio-disk29 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x9","drive":"libvirt-23-format","id":"virtio-disk29"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-a.img","node-name":"libvirt-22-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-22-format","read-only":false,"driver":"raw","file":"libvirt-22-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0xa,drive=libvirt-22-format,id=virtio-disk52 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xa","drive":"libvirt-22-format","id":"virtio-disk52"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-b.img","node-name":"libvirt-21-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-21-format","read-only":false,"driver":"raw","file":"libvirt-21-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0xb,drive=libvirt-21-format,id=virtio-disk53 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xb","drive":"libvirt-21-format","id":"virtio-disk53"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-c.img","node-name":"libvirt-20-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-20-format","read-only":false,"driver":"raw","file":"libvirt-20-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0xc,drive=libvirt-20-format,id=virtio-disk54 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xc","drive":"libvirt-20-format","id":"virtio-disk54"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-d.img","node-name":"libvirt-19-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-19-format","read-only":false,"driver":"raw","file":"libvirt-19-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0xd,drive=libvirt-19-format,id=virtio-disk55 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xd","drive":"libvirt-19-format","id":"virtio-disk55"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-a.img","node-name":"libvirt-18-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-18-format","read-only":false,"driver":"raw","file":"libvirt-18-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0xe,drive=libvirt-18-format,id=virtio-disk78 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xe","drive":"libvirt-18-format","id":"virtio-disk78"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-b.img","node-name":"libvirt-17-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-17-format","read-only":false,"driver":"raw","file":"libvirt-17-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0xf,drive=libvirt-17-format,id=virtio-disk79 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xf","drive":"libvirt-17-format","id":"virtio-disk79"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-c.img","node-name":"libvirt-16-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-16-format","read-only":false,"driver":"raw","file":"libvirt-16-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x10,drive=libvirt-16-format,id=virtio-disk80 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x10","drive":"libvirt-16-format","id":"virtio-disk80"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-d.img","node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-15-format","read-only":false,"driver":"raw","file":"libvirt-15-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x11,drive=libvirt-15-format,id=virtio-disk81 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x11","drive":"libvirt-15-format","id":"virtio-disk81"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-a.img","node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-14-format","read-only":false,"driver":"raw","file":"libvirt-14-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x12,drive=libvirt-14-format,id=virtio-disk104 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x12","drive":"libvirt-14-format","id":"virtio-disk104"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-b.img","node-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-13-format","read-only":false,"driver":"raw","file":"libvirt-13-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x13,drive=libvirt-13-format,id=virtio-disk105 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x13","drive":"libvirt-13-format","id":"virtio-disk105"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-c.img","node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-12-format","read-only":false,"driver":"raw","file":"libvirt-12-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x14,drive=libvirt-12-format,id=virtio-disk106 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x14","drive":"libvirt-12-format","id":"virtio-disk106"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-d.img","node-name":"libvirt-11-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-11-format","read-only":false,"driver":"raw","file":"libvirt-11-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x15,drive=libvirt-11-format,id=virtio-disk107 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x15","drive":"libvirt-11-format","id":"virtio-disk107"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-a.img","node-name":"libvirt-10-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-10-format","read-only":false,"driver":"raw","file":"libvirt-10-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x16,drive=libvirt-10-format,id=virtio-disk130 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x16","drive":"libvirt-10-format","id":"virtio-disk130"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-b.img","node-name":"libvirt-9-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-9-format","read-only":false,"driver":"raw","file":"libvirt-9-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x17,drive=libvirt-9-format,id=virtio-disk131 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x17","drive":"libvirt-9-format","id":"virtio-disk131"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-c.img","node-name":"libvirt-8-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-8-format","read-only":false,"driver":"raw","file":"libvirt-8-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x18,drive=libvirt-8-format,id=virtio-disk132 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x18","drive":"libvirt-8-format","id":"virtio-disk132"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-d.img","node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-7-format","read-only":false,"driver":"raw","file":"libvirt-7-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x19,drive=libvirt-7-format,id=virtio-disk133 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x19","drive":"libvirt-7-format","id":"virtio-disk133"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-a.img","node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-6-format","read-only":false,"driver":"raw","file":"libvirt-6-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=libvirt-6-format,id=virtio-disk156 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1a","drive":"libvirt-6-format","id":"virtio-disk156"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-b.img","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-5-format","read-only":false,"driver":"raw","file":"libvirt-5-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=libvirt-5-format,id=virtio-disk157 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1b","drive":"libvirt-5-format","id":"virtio-disk157"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-c.img","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-4-format","read-only":false,"driver":"raw","file":"libvirt-4-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=libvirt-4-format,id=virtio-disk158 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1c","drive":"libvirt-4-format","id":"virtio-disk158"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-d.img","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-3-format","read-only":false,"driver":"raw","file":"libvirt-3-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=libvirt-3-format,id=virtio-disk159 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1d","drive":"libvirt-3-format","id":"virtio-disk159"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-a.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=libvirt-2-format,id=virtio-disk182 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1e","drive":"libvirt-2-format","id":"virtio-disk182"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-b.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=libvirt-1-format,id=virtio-disk183 \
+-device
'{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x1f","drive":"libvirt-1-format","id":"virtio-disk183"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
+-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args
b/tests/qemuxml2argvdata/pci-rom-disabled.args
index ecf638e182..2ddb190c66 100644
--- a/tests/qemuxml2argvdata/pci-rom-disabled.args
+++ b/tests/qemuxml2argvdata/pci-rom-disabled.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=guest,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-guest/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--netdev user,id=hostnet0 \
--device
virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x2,romfile=
\
+-netdev '{"type":"user","id":"hostnet0"}'
\
+-device
'{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:24:a5:9f","bus":"pci.0","addr":"0x2","romfile":""}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args
index 886862eb98..cbc3fc950c 100644
--- a/tests/qemuxml2argvdata/pci-rom.args
+++ b/tests/qemuxml2argvdata/pci-rom.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,13 +28,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev user,id=hostnet0 \
--device
virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x2,rombar=1
\
--netdev user,id=hostnet1 \
--device
virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:24:a5:9e,bus=pci.0,addr=0x3,romfile=/etc/fake/bootrom.bin
\
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-netdev '{"type":"user","id":"hostnet0"}'
\
+-device
'{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:24:a5:9f","bus":"pci.0","addr":"0x2","rombar":1}'
\
+-netdev '{"type":"user","id":"hostnet1"}'
\
+-device
'{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":"52:54:00:24:a5:9e","bus":"pci.0","addr":"0x3","romfile":"/etc/fake/bootrom.bin"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x4,rombar=0 \
--device
vfio-pci,host=0000:06:12.6,id=hostdev1,bus=pci.0,addr=0x5,rombar=1,romfile=/etc/fake/bootrom.bin
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
+-device
'{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","bus":"pci.0","addr":"0x4","rombar":0}'
\
+-device
'{"driver":"vfio-pci","host":"0000:06:12.6","id":"hostdev1","bus":"pci.0","addr":"0x5","rombar":1,"romfile":"/etc/fake/bootrom.bin"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args
b/tests/qemuxml2argvdata/pcie-expander-bus.args
index e8f4dc1292..4cb85a0999 100644
--- a/tests/qemuxml2argvdata/pcie-expander-bus.args
+++ b/tests/qemuxml2argvdata/pcie-expander-bus.args
@@ -9,7 +9,7 @@
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=pcie-expander-bus-test,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/master-key.aes"}'
\
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -27,108 +27,108 @@
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device pxb-pcie,bus_nr=254,id=pci.1,numa_node=0,bus=pcie.0,addr=0x4 \
--device ioh3420,port=0,chassis=2,id=pci.2,bus=pci.1,addr=0x0 \
--device x3130-upstream,id=pci.3,bus=pci.2,addr=0x0 \
--device xio3130-downstream,port=0,chassis=4,id=pci.4,bus=pci.3,addr=0x0 \
--device xio3130-downstream,port=1,chassis=5,id=pci.5,bus=pci.3,addr=0x1 \
--device xio3130-downstream,port=2,chassis=6,id=pci.6,bus=pci.3,addr=0x2 \
--device xio3130-downstream,port=3,chassis=7,id=pci.7,bus=pci.3,addr=0x3 \
--device xio3130-downstream,port=4,chassis=8,id=pci.8,bus=pci.3,addr=0x4 \
--device xio3130-downstream,port=5,chassis=9,id=pci.9,bus=pci.3,addr=0x5 \
--device xio3130-downstream,port=6,chassis=10,id=pci.10,bus=pci.3,addr=0x6 \
--device xio3130-downstream,port=7,chassis=11,id=pci.11,bus=pci.3,addr=0x7 \
--device xio3130-downstream,port=8,chassis=12,id=pci.12,bus=pci.3,addr=0x8 \
--device xio3130-downstream,port=9,chassis=13,id=pci.13,bus=pci.3,addr=0x9 \
--device xio3130-downstream,port=10,chassis=14,id=pci.14,bus=pci.3,addr=0xa \
--device xio3130-downstream,port=11,chassis=15,id=pci.15,bus=pci.3,addr=0xb \
--device xio3130-downstream,port=12,chassis=16,id=pci.16,bus=pci.3,addr=0xc \
--device xio3130-downstream,port=13,chassis=17,id=pci.17,bus=pci.3,addr=0xd \
--device xio3130-downstream,port=14,chassis=18,id=pci.18,bus=pci.3,addr=0xe \
--device xio3130-downstream,port=15,chassis=19,id=pci.19,bus=pci.3,addr=0xf \
--device xio3130-downstream,port=16,chassis=20,id=pci.20,bus=pci.3,addr=0x10 \
--device xio3130-downstream,port=17,chassis=21,id=pci.21,bus=pci.3,addr=0x11 \
--device xio3130-downstream,port=18,chassis=22,id=pci.22,bus=pci.3,addr=0x12 \
--device xio3130-downstream,port=19,chassis=23,id=pci.23,bus=pci.3,addr=0x13 \
--device xio3130-downstream,port=20,chassis=24,id=pci.24,bus=pci.3,addr=0x14 \
--device xio3130-downstream,port=21,chassis=25,id=pci.25,bus=pci.3,addr=0x15 \
--device xio3130-downstream,port=22,chassis=26,id=pci.26,bus=pci.3,addr=0x16 \
--device xio3130-downstream,port=23,chassis=27,id=pci.27,bus=pci.3,addr=0x17 \
--device xio3130-downstream,port=24,chassis=28,id=pci.28,bus=pci.3,addr=0x18 \
--device xio3130-downstream,port=25,chassis=29,id=pci.29,bus=pci.3,addr=0x19 \
--device xio3130-downstream,port=26,chassis=30,id=pci.30,bus=pci.3,addr=0x1a \
--device xio3130-downstream,port=27,chassis=31,id=pci.31,bus=pci.3,addr=0x1b \
--device xio3130-downstream,port=28,chassis=32,id=pci.32,bus=pci.3,addr=0x1c \
--device xio3130-downstream,port=29,chassis=33,id=pci.33,bus=pci.3,addr=0x1d \
--device xio3130-downstream,port=30,chassis=34,id=pci.34,bus=pci.3,addr=0x1e \
--device xio3130-downstream,port=31,chassis=35,id=pci.35,bus=pci.3,addr=0x1f \
+-device
'{"driver":"pxb-pcie","bus_nr":254,"id":"pci.1","numa_node":0,"bus":"pcie.0","addr":"0x4"}'
\
+-device
'{"driver":"ioh3420","port":0,"chassis":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}'
\
+-device
'{"driver":"x3130-upstream","id":"pci.3","bus":"pci.2","addr":"0x0"}'
\
+-device
'{"driver":"xio3130-downstream","port":0,"chassis":4,"id":"pci.4","bus":"pci.3","addr":"0x0"}'
\
+-device
'{"driver":"xio3130-downstream","port":1,"chassis":5,"id":"pci.5","bus":"pci.3","addr":"0x1"}'
\
+-device
'{"driver":"xio3130-downstream","port":2,"chassis":6,"id":"pci.6","bus":"pci.3","addr":"0x2"}'
\
+-device
'{"driver":"xio3130-downstream","port":3,"chassis":7,"id":"pci.7","bus":"pci.3","addr":"0x3"}'
\
+-device
'{"driver":"xio3130-downstream","port":4,"chassis":8,"id":"pci.8","bus":"pci.3","addr":"0x4"}'
\
+-device
'{"driver":"xio3130-downstream","port":5,"chassis":9,"id":"pci.9","bus":"pci.3","addr":"0x5"}'
\
+-device
'{"driver":"xio3130-downstream","port":6,"chassis":10,"id":"pci.10","bus":"pci.3","addr":"0x6"}'
\
+-device
'{"driver":"xio3130-downstream","port":7,"chassis":11,"id":"pci.11","bus":"pci.3","addr":"0x7"}'
\
+-device
'{"driver":"xio3130-downstream","port":8,"chassis":12,"id":"pci.12","bus":"pci.3","addr":"0x8"}'
\
+-device
'{"driver":"xio3130-downstream","port":9,"chassis":13,"id":"pci.13","bus":"pci.3","addr":"0x9"}'
\
+-device
'{"driver":"xio3130-downstream","port":10,"chassis":14,"id":"pci.14","bus":"pci.3","addr":"0xa"}'
\
+-device
'{"driver":"xio3130-downstream","port":11,"chassis":15,"id":"pci.15","bus":"pci.3","addr":"0xb"}'
\
+-device
'{"driver":"xio3130-downstream","port":12,"chassis":16,"id":"pci.16","bus":"pci.3","addr":"0xc"}'
\
+-device
'{"driver":"xio3130-downstream","port":13,"chassis":17,"id":"pci.17","bus":"pci.3","addr":"0xd"}'
\
+-device
'{"driver":"xio3130-downstream","port":14,"chassis":18,"id":"pci.18","bus":"pci.3","addr":"0xe"}'
\
+-device
'{"driver":"xio3130-downstream","port":15,"chassis":19,"id":"pci.19","bus":"pci.3","addr":"0xf"}'
\
+-device
'{"driver":"xio3130-downstream","port":16,"chassis":20,"id":"pci.20","bus":"pci.3","addr":"0x10"}'
\
+-device
'{"driver":"xio3130-downstream","port":17,"chassis":21,"id":"pci.21","bus":"pci.3","addr":"0x11"}'
\
+-device
'{"driver":"xio3130-downstream","port":18,"chassis":22,"id":"pci.22","bus":"pci.3","addr":"0x12"}'
\
+-device
'{"driver":"xio3130-downstream","port":19,"chassis":23,"id":"pci.23","bus":"pci.3","addr":"0x13"}'
\
+-device
'{"driver":"xio3130-downstream","port":20,"chassis":24,"id":"pci.24","bus":"pci.3","addr":"0x14"}'
\
+-device
'{"driver":"xio3130-downstream","port":21,"chassis":25,"id":"pci.25","bus":"pci.3","addr":"0x15"}'
\
+-device
'{"driver":"xio3130-downstream","port":22,"chassis":26,"id":"pci.26","bus":"pci.3","addr":"0x16"}'
\
+-device
'{"driver":"xio3130-downstream","port":23,"chassis":27,"id":"pci.27","bus":"pci.3","addr":"0x17"}'
\
+-device
'{"driver":"xio3130-downstream","port":24,"chassis":28,"id":"pci.28","bus":"pci.3","addr":"0x18"}'
\
+-device
'{"driver":"xio3130-downstream","port":25,"chassis":29,"id":"pci.29","bus":"pci.3","addr":"0x19"}'
\
+-device
'{"driver":"xio3130-downstream","port":26,"chassis":30,"id":"pci.30","bus":"pci.3","addr":"0x1a"}'
\
+-device
'{"driver":"xio3130-downstream","port":27,"chassis":31,"id":"pci.31","bus":"pci.3","addr":"0x1b"}'
\
+-device
'{"driver":"xio3130-downstream","port":28,"chassis":32,"id":"pci.32","bus":"pci.3","addr":"0x1c"}'
\
+-device
'{"driver":"xio3130-downstream","port":29,"chassis":33,"id":"pci.33","bus":"pci.3","addr":"0x1d"}'
\
+-device
'{"driver":"xio3130-downstream","port":30,"chassis":34,"id":"pci.34","bus":"pci.3","addr":"0x1e"}'
\
+-device
'{"driver":"xio3130-downstream","port":31,"chassis":35,"id":"pci.35","bus":"pci.3","addr":"0x1f"}'
\
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
--netdev user,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:f1:95:51,bus=pci.4,addr=0x0 \
--netdev user,id=hostnet1 \
--device e1000,netdev=hostnet1,id=net1,mac=52:54:00:5c:c6:1a,bus=pci.5,addr=0x0 \
--netdev user,id=hostnet2 \
--device e1000,netdev=hostnet2,id=net2,mac=52:54:00:39:97:ac,bus=pci.6,addr=0x0 \
--netdev user,id=hostnet3 \
--device e1000,netdev=hostnet3,id=net3,mac=52:54:00:ee:b9:a8,bus=pci.7,addr=0x0 \
--netdev user,id=hostnet4 \
--device e1000,netdev=hostnet4,id=net4,mac=52:54:00:a9:f7:17,bus=pci.8,addr=0x0 \
--netdev user,id=hostnet5 \
--device e1000,netdev=hostnet5,id=net5,mac=52:54:00:df:2b:f3,bus=pci.9,addr=0x0 \
--netdev user,id=hostnet6 \
--device e1000,netdev=hostnet6,id=net6,mac=52:54:00:78:94:b4,bus=pci.10,addr=0x0 \
--netdev user,id=hostnet7 \
--device e1000,netdev=hostnet7,id=net7,mac=52:54:00:6b:9b:06,bus=pci.11,addr=0x0 \
--netdev user,id=hostnet8 \
--device e1000,netdev=hostnet8,id=net8,mac=52:54:00:17:df:bc,bus=pci.12,addr=0x0 \
--netdev user,id=hostnet9 \
--device e1000,netdev=hostnet9,id=net9,mac=52:54:00:3b:d0:51,bus=pci.13,addr=0x0 \
--netdev user,id=hostnet10 \
--device e1000,netdev=hostnet10,id=net10,mac=52:54:00:8d:2d:17,bus=pci.14,addr=0x0 \
--netdev user,id=hostnet11 \
--device e1000,netdev=hostnet11,id=net11,mac=52:54:00:a7:66:af,bus=pci.15,addr=0x0 \
--netdev user,id=hostnet12 \
--device e1000,netdev=hostnet12,id=net12,mac=52:54:00:54:ab:d7,bus=pci.16,addr=0x0 \
--netdev user,id=hostnet13 \
--device e1000,netdev=hostnet13,id=net13,mac=52:54:00:1f:99:90,bus=pci.17,addr=0x0 \
--netdev user,id=hostnet14 \
--device e1000,netdev=hostnet14,id=net14,mac=52:54:00:c8:43:87,bus=pci.18,addr=0x0 \
--netdev user,id=hostnet15 \
--device e1000,netdev=hostnet15,id=net15,mac=52:54:00:df:22:b2,bus=pci.19,addr=0x0 \
--netdev user,id=hostnet16 \
--device e1000,netdev=hostnet16,id=net16,mac=52:54:00:d2:9a:47,bus=pci.20,addr=0x0 \
--netdev user,id=hostnet17 \
--device e1000,netdev=hostnet17,id=net17,mac=52:54:00:86:05:e2,bus=pci.21,addr=0x0 \
--netdev user,id=hostnet18 \
--device e1000,netdev=hostnet18,id=net18,mac=52:54:00:8c:1c:c2,bus=pci.22,addr=0x0 \
--netdev user,id=hostnet19 \
--device e1000,netdev=hostnet19,id=net19,mac=52:54:00:48:58:92,bus=pci.23,addr=0x0 \
--netdev user,id=hostnet20 \
--device e1000,netdev=hostnet20,id=net20,mac=52:54:00:99:e5:bf,bus=pci.24,addr=0x0 \
--netdev user,id=hostnet21 \
--device e1000,netdev=hostnet21,id=net21,mac=52:54:00:b1:8c:25,bus=pci.25,addr=0x0 \
--netdev user,id=hostnet22 \
--device e1000,netdev=hostnet22,id=net22,mac=52:54:00:60:e0:d0,bus=pci.26,addr=0x0 \
--netdev user,id=hostnet23 \
--device e1000,netdev=hostnet23,id=net23,mac=52:54:00:37:00:6a,bus=pci.27,addr=0x0 \
--netdev user,id=hostnet24 \
--device e1000,netdev=hostnet24,id=net24,mac=52:54:00:c7:c8:ad,bus=pci.28,addr=0x0 \
--netdev user,id=hostnet25 \
--device e1000,netdev=hostnet25,id=net25,mac=52:54:00:4e:a7:cf,bus=pci.29,addr=0x0 \
--netdev user,id=hostnet26 \
--device e1000,netdev=hostnet26,id=net26,mac=52:54:00:00:79:69,bus=pci.30,addr=0x0 \
--netdev user,id=hostnet27 \
--device e1000,netdev=hostnet27,id=net27,mac=52:54:00:47:00:6f,bus=pci.31,addr=0x0 \
--netdev user,id=hostnet28 \
--device e1000,netdev=hostnet28,id=net28,mac=52:54:00:2a:8c:8b,bus=pci.32,addr=0x0 \
--netdev user,id=hostnet29 \
--device e1000,netdev=hostnet29,id=net29,mac=52:54:00:ec:d5:e3,bus=pci.33,addr=0x0 \
--netdev user,id=hostnet30 \
--device e1000,netdev=hostnet30,id=net30,mac=52:54:00:7e:6e:c8,bus=pci.34,addr=0x0 \
--netdev user,id=hostnet31 \
--device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6d:c9,bus=pci.35,addr=0x0 \
+-device
'{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}'
\
+-netdev '{"type":"user","id":"hostnet0"}'
\
+-device
'{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:f1:95:51","bus":"pci.4","addr":"0x0"}'
\
+-netdev '{"type":"user","id":"hostnet1"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet1","id":"net1","mac":"52:54:00:5c:c6:1a","bus":"pci.5","addr":"0x0"}'
\
+-netdev '{"type":"user","id":"hostnet2"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet2","id":"net2","mac":"52:54:00:39:97:ac","bus":"pci.6","addr":"0x0"}'
\
+-netdev '{"type":"user","id":"hostnet3"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet3","id":"net3","mac":"52:54:00:ee:b9:a8","bus":"pci.7","addr":"0x0"}'
\
+-netdev '{"type":"user","id":"hostnet4"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet4","id":"net4","mac":"52:54:00:a9:f7:17","bus":"pci.8","addr":"0x0"}'
\
+-netdev '{"type":"user","id":"hostnet5"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet5","id":"net5","mac":"52:54:00:df:2b:f3","bus":"pci.9","addr":"0x0"}'
\
+-netdev '{"type":"user","id":"hostnet6"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet6","id":"net6","mac":"52:54:00:78:94:b4","bus":"pci.10","addr":"0x0"}'
\
+-netdev '{"type":"user","id":"hostnet7"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet7","id":"net7","mac":"52:54:00:6b:9b:06","bus":"pci.11","addr":"0x0"}'
\
+-netdev '{"type":"user","id":"hostnet8"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet8","id":"net8","mac":"52:54:00:17:df:bc","bus":"pci.12","addr":"0x0"}'
\
+-netdev '{"type":"user","id":"hostnet9"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet9","id":"net9","mac":"52:54:00:3b:d0:51","bus":"pci.13","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet10"}' \
+-device
'{"driver":"e1000","netdev":"hostnet10","id":"net10","mac":"52:54:00:8d:2d:17","bus":"pci.14","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet11"}' \
+-device
'{"driver":"e1000","netdev":"hostnet11","id":"net11","mac":"52:54:00:a7:66:af","bus":"pci.15","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet12"}' \
+-device
'{"driver":"e1000","netdev":"hostnet12","id":"net12","mac":"52:54:00:54:ab:d7","bus":"pci.16","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet13"}' \
+-device
'{"driver":"e1000","netdev":"hostnet13","id":"net13","mac":"52:54:00:1f:99:90","bus":"pci.17","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet14"}' \
+-device
'{"driver":"e1000","netdev":"hostnet14","id":"net14","mac":"52:54:00:c8:43:87","bus":"pci.18","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet15"}' \
+-device
'{"driver":"e1000","netdev":"hostnet15","id":"net15","mac":"52:54:00:df:22:b2","bus":"pci.19","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet16"}' \
+-device
'{"driver":"e1000","netdev":"hostnet16","id":"net16","mac":"52:54:00:d2:9a:47","bus":"pci.20","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet17"}' \
+-device
'{"driver":"e1000","netdev":"hostnet17","id":"net17","mac":"52:54:00:86:05:e2","bus":"pci.21","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet18"}' \
+-device
'{"driver":"e1000","netdev":"hostnet18","id":"net18","mac":"52:54:00:8c:1c:c2","bus":"pci.22","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet19"}' \
+-device
'{"driver":"e1000","netdev":"hostnet19","id":"net19","mac":"52:54:00:48:58:92","bus":"pci.23","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet20"}' \
+-device
'{"driver":"e1000","netdev":"hostnet20","id":"net20","mac":"52:54:00:99:e5:bf","bus":"pci.24","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet21"}' \
+-device
'{"driver":"e1000","netdev":"hostnet21","id":"net21","mac":"52:54:00:b1:8c:25","bus":"pci.25","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet22"}' \
+-device
'{"driver":"e1000","netdev":"hostnet22","id":"net22","mac":"52:54:00:60:e0:d0","bus":"pci.26","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet23"}' \
+-device
'{"driver":"e1000","netdev":"hostnet23","id":"net23","mac":"52:54:00:37:00:6a","bus":"pci.27","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet24"}' \
+-device
'{"driver":"e1000","netdev":"hostnet24","id":"net24","mac":"52:54:00:c7:c8:ad","bus":"pci.28","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet25"}' \
+-device
'{"driver":"e1000","netdev":"hostnet25","id":"net25","mac":"52:54:00:4e:a7:cf","bus":"pci.29","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet26"}' \
+-device
'{"driver":"e1000","netdev":"hostnet26","id":"net26","mac":"52:54:00:00:79:69","bus":"pci.30","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet27"}' \
+-device
'{"driver":"e1000","netdev":"hostnet27","id":"net27","mac":"52:54:00:47:00:6f","bus":"pci.31","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet28"}' \
+-device
'{"driver":"e1000","netdev":"hostnet28","id":"net28","mac":"52:54:00:2a:8c:8b","bus":"pci.32","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet29"}' \
+-device
'{"driver":"e1000","netdev":"hostnet29","id":"net29","mac":"52:54:00:ec:d5:e3","bus":"pci.33","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet30"}' \
+-device
'{"driver":"e1000","netdev":"hostnet30","id":"net30","mac":"52:54:00:7e:6e:c8","bus":"pci.34","addr":"0x0"}'
\
+-netdev
'{"type":"user","id":"hostnet31"}' \
+-device
'{"driver":"e1000","netdev":"hostnet31","id":"net31","mac":"52:54:00:7e:6d:c9","bus":"pci.35","addr":"0x0"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-global ICH9-LPC.noreboot=off \
-watchdog-action reset \
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
index bd90434aaa..aa8c171594 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=guest,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-guest/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}'
\
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -25,9 +25,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
--device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
--device ioh3420,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
+-device
'{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}'
\
+-device
'{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}'
\
+-device
'{"driver":"ioh3420","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-global ICH9-LPC.noreboot=off \
-watchdog-action reset \
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
index 3a353dc59a..fc5e591733 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=guest,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-guest/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}'
\
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -25,8 +25,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device ioh3420,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
--device ioh3420,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
+-device
'{"driver":"ioh3420","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}'
\
+-device
'{"driver":"ioh3420","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-global ICH9-LPC.noreboot=off \
-watchdog-action reset \
diff --git a/tests/qemuxml2argvdata/pcie-root-port.args
b/tests/qemuxml2argvdata/pcie-root-port.args
index b8f1de42a1..a5342e8b70 100644
--- a/tests/qemuxml2argvdata/pcie-root-port.args
+++ b/tests/qemuxml2argvdata/pcie-root-port.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}'
\
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -25,13 +25,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device ioh3420,port=16,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
--device ioh3420,port=26,chassis=40,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
+-device
'{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}'
\
+-device
'{"driver":"ioh3420","port":26,"chassis":40,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}'
\
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1
\
+-device
'{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}'
\
-global ICH9-LPC.noreboot=off \
-watchdog-action reset \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-root.args
b/tests/qemuxml2argvdata/pcie-root.args
index 5a27ae86b0..169e73608b 100644
--- a/tests/qemuxml2argvdata/pcie-root.args
+++ b/tests/qemuxml2argvdata/pcie-root.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}'
\
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
index f2f22c155b..0c3da6bd1a 100644
--- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}'
\
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -25,21 +25,21 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device ioh3420,port=16,chassis=1,id=pci.1,bus=pcie.0,addr=0x2 \
--device x3130-upstream,id=pci.2,bus=pci.1,addr=0x0 \
--device xio3130-downstream,port=0,chassis=3,id=pci.3,bus=pci.2,addr=0x0 \
--device xio3130-downstream,port=1,chassis=4,id=pci.4,bus=pci.2,addr=0x1 \
--device xio3130-downstream,port=2,chassis=5,id=pci.5,bus=pci.2,addr=0x2 \
--device xio3130-downstream,port=39,chassis=30,id=pci.6,bus=pci.2,addr=0x3 \
--device x3130-upstream,id=pci.7,bus=pci.3,addr=0x0 \
--device xio3130-downstream,port=4,chassis=8,id=pci.8,bus=pci.2,addr=0x4 \
--device xio3130-downstream,port=5,chassis=9,id=pci.9,bus=pci.2,addr=0x5 \
--device xio3130-downstream,port=6,chassis=10,id=pci.10,bus=pci.2,addr=0x6 \
+-device
'{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","addr":"0x2"}'
\
+-device
'{"driver":"x3130-upstream","id":"pci.2","bus":"pci.1","addr":"0x0"}'
\
+-device
'{"driver":"xio3130-downstream","port":0,"chassis":3,"id":"pci.3","bus":"pci.2","addr":"0x0"}'
\
+-device
'{"driver":"xio3130-downstream","port":1,"chassis":4,"id":"pci.4","bus":"pci.2","addr":"0x1"}'
\
+-device
'{"driver":"xio3130-downstream","port":2,"chassis":5,"id":"pci.5","bus":"pci.2","addr":"0x2"}'
\
+-device
'{"driver":"xio3130-downstream","port":39,"chassis":30,"id":"pci.6","bus":"pci.2","addr":"0x3"}'
\
+-device
'{"driver":"x3130-upstream","id":"pci.7","bus":"pci.3","addr":"0x0"}'
\
+-device
'{"driver":"xio3130-downstream","port":4,"chassis":8,"id":"pci.8","bus":"pci.2","addr":"0x4"}'
\
+-device
'{"driver":"xio3130-downstream","port":5,"chassis":9,"id":"pci.9","bus":"pci.2","addr":"0x5"}'
\
+-device
'{"driver":"xio3130-downstream","port":6,"chassis":10,"id":"pci.10","bus":"pci.2","addr":"0x6"}'
\
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1
\
+-device
'{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}'
\
-global ICH9-LPC.noreboot=off \
-watchdog-action reset \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
index 6bdfba9fb5..aaae74d377 100644
--- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}'
\
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -25,15 +25,15 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device ioh3420,port=16,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
--device ioh3420,port=17,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
--device x3130-upstream,id=pci.3,bus=pci.1,addr=0x0 \
--device x3130-upstream,id=pci.4,bus=pci.2,addr=0x0 \
+-device
'{"driver":"ioh3420","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}'
\
+-device
'{"driver":"ioh3420","port":17,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}'
\
+-device
'{"driver":"x3130-upstream","id":"pci.3","bus":"pci.1","addr":"0x0"}'
\
+-device
'{"driver":"x3130-upstream","id":"pci.4","bus":"pci.2","addr":"0x0"}'
\
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1
\
+-device
'{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}'
\
-global ICH9-LPC.noreboot=off \
-watchdog-action reset \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args
b/tests/qemuxml2argvdata/pcihole64-q35.args
index e9d84d935e..86e5778b35 100644
--- a/tests/qemuxml2argvdata/pcihole64-q35.args
+++ b/tests/qemuxml2argvdata/pcihole64-q35.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}'
\
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -28,9 +28,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-global q35-pcihost.pci-hole64-size=1048576K \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1
\
+-device
'{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}'
\
-global ICH9-LPC.noreboot=off \
-watchdog-action reset \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcihole64.args
b/tests/qemuxml2argvdata/pcihole64.args
index 224363f81d..43f5a6dbf0 100644
--- a/tests/qemuxml2argvdata/pcihole64.args
+++ b/tests/qemuxml2argvdata/pcihole64.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-foo/master-key.aes \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -28,5 +28,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
-global i440FX-pcihost.pci-hole64-size=1048576K \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args
b/tests/qemuxml2argvdata/pmu-feature-off.args
index 4af05c4d9a..80d0ebb925 100644
--- a/tests/qemuxml2argvdata/pmu-feature-off.args
+++ b/tests/qemuxml2argvdata/pmu-feature-off.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-cpu qemu64,pmu=off \
diff --git a/tests/qemuxml2argvdata/pmu-feature.args
b/tests/qemuxml2argvdata/pmu-feature.args
index 26296caedb..3531746845 100644
--- a/tests/qemuxml2argvdata/pmu-feature.args
+++ b/tests/qemuxml2argvdata/pmu-feature.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-cpu qemu64,pmu=on \
diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args
b/tests/qemuxml2argvdata/q35-pci-force-address.args
index d3d04b1467..2c7b88f0d0 100644
--- a/tests/qemuxml2argvdata/q35-pci-force-address.args
+++ b/tests/qemuxml2argvdata/q35-pci-force-address.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}'
\
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -25,14 +25,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
--device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
--netdev user,id=hostnet0 \
--device e1000e,netdev=hostnet0,id=net0,mac=52:54:00:aa:bf:ef,bus=pci.2,addr=0x1 \
+-device
'{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}'
\
+-device
'{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1"}'
\
+-netdev '{"type":"user","id":"hostnet0"}'
\
+-device
'{"driver":"e1000e","netdev":"hostnet0","id":"net0","mac":"52:54:00:aa:bf:ef","bus":"pci.2","addr":"0x1"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device intel-hda,id=sound0,bus=pci.3,addr=0x0 \
--device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0,audiodev=audio1 \
+-device
'{"driver":"intel-hda","id":"sound0","bus":"pci.3","addr":"0x0"}'
\
+-device
'{"driver":"hda-duplex","id":"sound0-codec0","bus":"sound0.0","cad":0,"audiodev":"audio1"}'
\
-global ICH9-LPC.noreboot=off \
-watchdog-action reset \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args
b/tests/qemuxml2argvdata/q35-usb2-multi.args
index bcaf3236f0..be6f4bbc5d 100644
--- a/tests/qemuxml2argvdata/q35-usb2-multi.args
+++ b/tests/qemuxml2argvdata/q35-usb2-multi.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}'
\
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -25,25 +25,25 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
--device pci-bridge,chassis_nr=56,id=pci.2,bus=pci.1,addr=0x0 \
--device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \
--device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d
\
--device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \
--device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \
--device ich9-usb-ehci1,id=usb1,bus=pcie.0,addr=0x1a.0x7 \
--device ich9-usb-uhci1,masterbus=usb1.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1a
\
--device ich9-usb-uhci2,masterbus=usb1.0,firstport=2,bus=pcie.0,addr=0x1a.0x1 \
--device ich9-usb-uhci3,masterbus=usb1.0,firstport=4,bus=pcie.0,addr=0x1a.0x2 \
--device ich9-usb-ehci1,id=usb2,bus=pci.2,addr=0x1.0x7 \
--device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.2,multifunction=on,addr=0x1
\
--device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.2,addr=0x1.0x1 \
--device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.2,addr=0x1.0x2 \
+-device
'{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":56,"id":"pci.2","bus":"pci.1","addr":"0x0"}'
\
+-device
'{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d.0x7"}'
\
+-device
'{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pcie.0","multifunction":true,"addr":"0x1d"}'
\
+-device
'{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pcie.0","addr":"0x1d.0x1"}'
\
+-device
'{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pcie.0","addr":"0x1d.0x2"}'
\
+-device
'{"driver":"ich9-usb-ehci1","id":"usb1","bus":"pcie.0","addr":"0x1a.0x7"}'
\
+-device
'{"driver":"ich9-usb-uhci1","masterbus":"usb1.0","firstport":0,"bus":"pcie.0","multifunction":true,"addr":"0x1a"}'
\
+-device
'{"driver":"ich9-usb-uhci2","masterbus":"usb1.0","firstport":2,"bus":"pcie.0","addr":"0x1a.0x1"}'
\
+-device
'{"driver":"ich9-usb-uhci3","masterbus":"usb1.0","firstport":4,"bus":"pcie.0","addr":"0x1a.0x2"}'
\
+-device
'{"driver":"ich9-usb-ehci1","id":"usb2","bus":"pci.2","addr":"0x1.0x7"}'
\
+-device
'{"driver":"ich9-usb-uhci1","masterbus":"usb2.0","firstport":0,"bus":"pci.2","multifunction":true,"addr":"0x1"}'
\
+-device
'{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bus":"pci.2","addr":"0x1.0x1"}'
\
+-device
'{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bus":"pci.2","addr":"0x1.0x2"}'
\
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1
\
+-device
'{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}'
\
-global ICH9-LPC.noreboot=off \
-watchdog-action reset \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args
b/tests/qemuxml2argvdata/q35-usb2-reorder.args
index 6236cb8a98..f0f32c80ed 100644
--- a/tests/qemuxml2argvdata/q35-usb2-reorder.args
+++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}'
\
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -25,25 +25,25 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
--device pci-bridge,chassis_nr=56,id=pci.2,bus=pci.1,addr=0x0 \
--device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \
--device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d
\
--device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \
--device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \
--device ich9-usb-ehci1,id=usb1,bus=pcie.0,addr=0x1a.0x7 \
--device ich9-usb-uhci1,masterbus=usb1.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1a
\
--device ich9-usb-uhci3,masterbus=usb1.0,firstport=4,bus=pcie.0,addr=0x1a.0x2 \
--device ich9-usb-uhci2,masterbus=usb1.0,firstport=2,bus=pcie.0,addr=0x1a.0x1 \
--device ich9-usb-ehci1,id=usb2,bus=pci.2,addr=0x1.0x7 \
--device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.2,addr=0x1.0x2 \
--device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.2,addr=0x1.0x1 \
--device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.2,multifunction=on,addr=0x1
\
+-device
'{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":56,"id":"pci.2","bus":"pci.1","addr":"0x0"}'
\
+-device
'{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d.0x7"}'
\
+-device
'{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pcie.0","multifunction":true,"addr":"0x1d"}'
\
+-device
'{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pcie.0","addr":"0x1d.0x1"}'
\
+-device
'{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pcie.0","addr":"0x1d.0x2"}'
\
+-device
'{"driver":"ich9-usb-ehci1","id":"usb1","bus":"pcie.0","addr":"0x1a.0x7"}'
\
+-device
'{"driver":"ich9-usb-uhci1","masterbus":"usb1.0","firstport":0,"bus":"pcie.0","multifunction":true,"addr":"0x1a"}'
\
+-device
'{"driver":"ich9-usb-uhci3","masterbus":"usb1.0","firstport":4,"bus":"pcie.0","addr":"0x1a.0x2"}'
\
+-device
'{"driver":"ich9-usb-uhci2","masterbus":"usb1.0","firstport":2,"bus":"pcie.0","addr":"0x1a.0x1"}'
\
+-device
'{"driver":"ich9-usb-ehci1","id":"usb2","bus":"pci.2","addr":"0x1.0x7"}'
\
+-device
'{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bus":"pci.2","addr":"0x1.0x2"}'
\
+-device
'{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bus":"pci.2","addr":"0x1.0x1"}'
\
+-device
'{"driver":"ich9-usb-uhci1","masterbus":"usb2.0","firstport":0,"bus":"pci.2","multifunction":true,"addr":"0x1"}'
\
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1
\
+-device
'{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}'
\
-global ICH9-LPC.noreboot=off \
-watchdog-action reset \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args
index 3e24c0760d..4b7d83ba51 100644
--- a/tests/qemuxml2argvdata/q35-usb2.args
+++ b/tests/qemuxml2argvdata/q35-usb2.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}'
\
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -25,17 +25,17 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
--device pci-bridge,chassis_nr=56,id=pci.2,bus=pci.1,addr=0x0 \
--device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \
--device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d
\
--device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \
--device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \
+-device
'{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}'
\
+-device
'{"driver":"pci-bridge","chassis_nr":56,"id":"pci.2","bus":"pci.1","addr":"0x0"}'
\
+-device
'{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d.0x7"}'
\
+-device
'{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pcie.0","multifunction":true,"addr":"0x1d"}'
\
+-device
'{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pcie.0","addr":"0x1d.0x1"}'
\
+-device
'{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pcie.0","addr":"0x1d.0x2"}'
\
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1
\
+-device
'{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}'
\
-global ICH9-LPC.noreboot=off \
-watchdog-action reset \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args
index 638c79d45f..3d4c93038c 100644
--- a/tests/qemuxml2argvdata/q35.args
+++ b/tests/qemuxml2argvdata/q35.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}'
\
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -27,15 +27,15 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-global ICH9-LPC.disable_s3=1 \
-global ICH9-LPC.disable_s4=0 \
-boot strict=on \
--device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \
--device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d
\
--device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \
--device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \
+-device
'{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d.0x7"}'
\
+-device
'{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pcie.0","multifunction":true,"addr":"0x1d"}'
\
+-device
'{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pcie.0","addr":"0x1d.0x1"}'
\
+-device
'{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pcie.0","addr":"0x1d.0x2"}'
\
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1
\
+-device
'{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"bus":"pcie.0","addr":"0x1"}'
\
-global ICH9-LPC.noreboot=off \
-watchdog-action reset \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args
b/tests/qemuxml2argvdata/qemu-ns-alt.args
index 0af708dfe0..9eec4d266e 100644
--- a/tests/qemuxml2argvdata/qemu-ns-alt.args
+++ b/tests/qemuxml2argvdata/qemu-ns-alt.args
@@ -11,7 +11,7 @@ BAR='' \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -30,8 +30,8 @@ BAR='' \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-unknown parameter \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
index 1f4ef13cc3..75d46d2b6d 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
ARGUMENT \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
index 1f4ef13cc3..75d46d2b6d 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
ARGUMENT \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args
b/tests/qemuxml2argvdata/qemu-ns-commandline.args
index 1f4ef13cc3..75d46d2b6d 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
ARGUMENT \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
index 1f4ef13cc3..75d46d2b6d 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
ARGUMENT \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
index 1f4ef13cc3..75d46d2b6d 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
ARGUMENT \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
index 1f4ef13cc3..75d46d2b6d 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
ARGUMENT \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args
b/tests/qemuxml2argvdata/qemu-ns-no-env.args
index 11a2a9b480..9f06ef5a80 100644
--- a/tests/qemuxml2argvdata/qemu-ns-no-env.args
+++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-unknown parameter \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
index 9dfd4cad5c..43150e9e15 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
index ce3712cdbc..c123cd9dce 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args
b/tests/qemuxml2argvdata/seclabel-dac-none.args
index 5078429e1b..86af73f198 100644
--- a/tests/qemuxml2argvdata/seclabel-dac-none.args
+++ b/tests/qemuxml2argvdata/seclabel-dac-none.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
index 5078429e1b..86af73f198 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
index 5078429e1b..86af73f198 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
index 1f41c61f72..b417f976af 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,10 +28,10 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-2-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-format","id":"ide0-0-0","bootindex":1}'
\
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=1,drive=libvirt-1-format,id=ide0-0-1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-format","id":"ide0-0-1"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
index 5078429e1b..86af73f198 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args
b/tests/qemuxml2argvdata/seclabel-dynamic.args
index 5078429e1b..86af73f198 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-none.args
b/tests/qemuxml2argvdata/seclabel-none.args
index 5078429e1b..86af73f198 100644
--- a/tests/qemuxml2argvdata/seclabel-none.args
+++ b/tests/qemuxml2argvdata/seclabel-none.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
index 5078429e1b..86af73f198 100644
--- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args
b/tests/qemuxml2argvdata/seclabel-static-relabel.args
index 5078429e1b..86af73f198 100644
--- a/tests/qemuxml2argvdata/seclabel-static-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-static.args
b/tests/qemuxml2argvdata/seclabel-static.args
index 5078429e1b..86af73f198 100644
--- a/tests/qemuxml2argvdata/seclabel-static.args
+++ b/tests/qemuxml2argvdata/seclabel-static.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smartcard-controller.args
b/tests/qemuxml2argvdata/smartcard-controller.args
index 5127fd07d5..6ff6005c39 100644
--- a/tests/qemuxml2argvdata/smartcard-controller.args
+++ b/tests/qemuxml2argvdata/smartcard-controller.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -26,8 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-acpi \
-boot strict=on \
-usb \
--device usb-ccid,id=ccid0,bus=usb.0,port=1 \
--device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \
+-device
'{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}'
\
+-device
'{"driver":"ccid-card-emulated","backend":"nss-emulated","id":"smartcard0","bus":"ccid0.0"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
index 4e7be2c3dc..f7261da7fe 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -26,8 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-acpi \
-boot strict=on \
-usb \
--device usb-ccid,id=ccid0,bus=usb.0,port=1 \
--device
ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,cert3=cert3,db=/tmp/foo,id=smartcard0,bus=ccid0.0
\
+-device
'{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}'
\
+-device
'{"driver":"ccid-card-emulated","backend":"certificates","cert1":"cert1","cert2":"cert2","cert3":"cert3","db":"/tmp/foo","id":"smartcard0","bus":"ccid0.0"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args
b/tests/qemuxml2argvdata/smartcard-host-certificates.args
index 3e1c0d4267..fcbeebb8fe 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -26,8 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-acpi \
-boot strict=on \
-usb \
--device usb-ccid,id=ccid0,bus=usb.0,port=1 \
--device
ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,cert3=cert3,db=/etc/pki/nssdb,id=smartcard0,bus=ccid0.0
\
+-device
'{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}'
\
+-device
'{"driver":"ccid-card-emulated","backend":"certificates","cert1":"cert1","cert2":"cert2","cert3":"cert3","db":"/etc/pki/nssdb","id":"smartcard0","bus":"ccid0.0"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smartcard-host.args
b/tests/qemuxml2argvdata/smartcard-host.args
index 5127fd07d5..6ff6005c39 100644
--- a/tests/qemuxml2argvdata/smartcard-host.args
+++ b/tests/qemuxml2argvdata/smartcard-host.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -26,8 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-acpi \
-boot strict=on \
-usb \
--device usb-ccid,id=ccid0,bus=usb.0,port=1 \
--device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \
+-device
'{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}'
\
+-device
'{"driver":"ccid-card-emulated","backend":"nss-emulated","id":"smartcard0","bus":"ccid0.0"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
index 8f4da0c94b..6d74ded58c 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,11 +25,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-acpi \
-boot strict=on \
-usb \
--device usb-ccid,id=ccid0,bus=usb.0,port=1 \
+-device
'{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}'
\
-chardev spicevmc,id=charsmartcard0,name=smartcard \
--device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
+-device
'{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"smartcard0","bus":"ccid0.0"}'
\
-audiodev
'{"id":"audio1","driver":"spice"}' \
-spice port=0,seamless-migration=on \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
index 53074a41e8..f9991c0a6b 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -26,9 +26,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-acpi \
-boot strict=on \
-usb \
--device usb-ccid,id=ccid0,bus=usb.0,port=1 \
+-device
'{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}'
\
-chardev socket,id=charsmartcard0,host=127.0.0.1,port=2001,server=on,wait=off \
--device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
+-device
'{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"smartcard0","bus":"ccid0.0"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args
index 54c7c361be..d510624693 100644
--- a/tests/qemuxml2argvdata/smbios.args
+++ b/tests/qemuxml2argvdata/smbios.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -33,7 +33,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/smp-dies.args
index 1b73feb8a2..95f018af2e 100644
--- a/tests/qemuxml2argvdata/smp-dies.args
+++ b/tests/qemuxml2argvdata/smp-dies.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,6 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args
index 1b090e9dbe..91c4a1eacc 100644
--- a/tests/qemuxml2argvdata/smp.args
+++ b/tests/qemuxml2argvdata/smp.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -28,6 +28,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args
b/tests/qemuxml2argvdata/usb-controller-default-q35.args
index 22a6d4d20a..41110fc0d0 100644
--- a/tests/qemuxml2argvdata/usb-controller-default-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}'
\
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pcie.0,addr=0x1 \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pcie.0","addr":"0x1"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-global ICH9-LPC.noreboot=off \
-watchdog-action reset \
diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
index 9fd3065308..ad421f5eb3 100644
--- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}'
\
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m size=2097152k \
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device nec-usb-xhci,id=usb,bus=pcie.0,addr=0x1 \
+-device
'{"driver":"nec-usb-xhci","id":"usb","bus":"pcie.0","addr":"0x1"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-global ICH9-LPC.noreboot=off \
-watchdog-action reset \
diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
index 2f4bd5df0d..001af94982 100644
--- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,6 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device qemu-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x2 \
+-device
'{"driver":"qemu-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","addr":"0x2"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args
b/tests/qemuxml2argvdata/usb-controller-xhci.args
index ca0b40ff28..2a39d7cdd3 100644
--- a/tests/qemuxml2argvdata/usb-controller-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-xhci.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,6 +25,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device nec-usb-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x2 \
+-device
'{"driver":"nec-usb-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","addr":"0x2"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-controller.args
b/tests/qemuxml2argvdata/usb-controller.args
index 4a49b33727..738e28c155 100644
--- a/tests/qemuxml2argvdata/usb-controller.args
+++ b/tests/qemuxml2argvdata/usb-controller.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -27,5 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-boot strict=on \
-usb \
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
index c1ce4d5327..da0a967d1e 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -26,25 +26,25 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-acpi \
-boot strict=on \
-usb \
--device usb-hub,id=hub0,bus=usb.0,port=1 \
--device usb-hub,id=hub1,bus=usb.0,port=2 \
--device usb-hub,id=hub2,bus=usb.0,port=1.1 \
--device usb-mouse,id=input0,bus=usb.0,port=1.2 \
--device usb-mouse,id=input1,bus=usb.0,port=1.3 \
--device usb-mouse,id=input2,bus=usb.0,port=1.4 \
--device usb-tablet,id=input3,bus=usb.0,port=1.5 \
--device usb-tablet,id=input4,bus=usb.0,port=1.6 \
--device usb-tablet,id=input5,bus=usb.0,port=1.7 \
--device usb-tablet,id=input6,bus=usb.0,port=1.8 \
--device usb-tablet,id=input7,bus=usb.0,port=1.1.1 \
--device usb-tablet,id=input8,bus=usb.0,port=1.1.2 \
--device usb-tablet,id=input9,bus=usb.0,port=1.1.3 \
--device usb-tablet,id=input10,bus=usb.0,port=1.1.4 \
--device usb-tablet,id=input11,bus=usb.0,port=1.1.5 \
--device usb-tablet,id=input12,bus=usb.0,port=1.1.6 \
--device usb-tablet,id=input13,bus=usb.0,port=1.1.7 \
--device usb-tablet,id=input14,bus=usb.0,port=1.1.8 \
--device usb-tablet,id=input15,bus=usb.0,port=2.1 \
+-device
'{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}'
\
+-device
'{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"2"}'
\
+-device
'{"driver":"usb-hub","id":"hub2","bus":"usb.0","port":"1.1"}'
\
+-device
'{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1.2"}'
\
+-device
'{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"1.3"}'
\
+-device
'{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"1.4"}'
\
+-device
'{"driver":"usb-tablet","id":"input3","bus":"usb.0","port":"1.5"}'
\
+-device
'{"driver":"usb-tablet","id":"input4","bus":"usb.0","port":"1.6"}'
\
+-device
'{"driver":"usb-tablet","id":"input5","bus":"usb.0","port":"1.7"}'
\
+-device
'{"driver":"usb-tablet","id":"input6","bus":"usb.0","port":"1.8"}'
\
+-device
'{"driver":"usb-tablet","id":"input7","bus":"usb.0","port":"1.1.1"}'
\
+-device
'{"driver":"usb-tablet","id":"input8","bus":"usb.0","port":"1.1.2"}'
\
+-device
'{"driver":"usb-tablet","id":"input9","bus":"usb.0","port":"1.1.3"}'
\
+-device
'{"driver":"usb-tablet","id":"input10","bus":"usb.0","port":"1.1.4"}'
\
+-device
'{"driver":"usb-tablet","id":"input11","bus":"usb.0","port":"1.1.5"}'
\
+-device
'{"driver":"usb-tablet","id":"input12","bus":"usb.0","port":"1.1.6"}'
\
+-device
'{"driver":"usb-tablet","id":"input13","bus":"usb.0","port":"1.1.7"}'
\
+-device
'{"driver":"usb-tablet","id":"input14","bus":"usb.0","port":"1.1.8"}'
\
+-device
'{"driver":"usb-tablet","id":"input15","bus":"usb.0","port":"2.1"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args
b/tests/qemuxml2argvdata/usb-hub-autoadd.args
index 72a969ffff..ebbc82df50 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -26,11 +26,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-acpi \
-boot strict=on \
-usb \
--device usb-hub,id=hub0,bus=usb.0,port=1 \
--device usb-mouse,id=input0,bus=usb.0,port=2 \
--device usb-mouse,id=input1,bus=usb.0,port=1.1 \
--device usb-mouse,id=input2,bus=usb.0,port=1.2 \
--device usb-tablet,id=input3,bus=usb.0,port=1.3 \
+-device
'{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}'
\
+-device
'{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"2"}'
\
+-device
'{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"1.1"}'
\
+-device
'{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"1.2"}'
\
+-device
'{"driver":"usb-tablet","id":"input3","bus":"usb.0","port":"1.3"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args
index df6912ecf8..c8614ed8de 100644
--- a/tests/qemuxml2argvdata/usb-hub.args
+++ b/tests/qemuxml2argvdata/usb-hub.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-acpi \
-boot strict=on \
-usb \
--device usb-hub,id=hub0,bus=usb.0,port=1 \
+-device
'{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
index b30ef04710..263f645f67 100644
--- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,15 +25,15 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \
--device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
--device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
--device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
--device usb-hub,id=hub0,bus=usb.0,port=1 \
--device usb-hub,id=hub1,bus=usb.0,port=2 \
--device usb-mouse,id=input0,bus=usb.0,port=3 \
--device usb-mouse,id=input1,bus=usb.0,port=4 \
--device usb-mouse,id=input2,bus=usb.0,port=5 \
+-device
'{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0x7"}'
\
+-device
'{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}'
\
+-device
'{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pci.0","addr":"0x4.0x1"}'
\
+-device
'{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pci.0","addr":"0x4.0x2"}'
\
+-device
'{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}'
\
+-device
'{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"2"}'
\
+-device
'{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"3"}'
\
+-device
'{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"4"}'
\
+-device
'{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"5"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args
b/tests/qemuxml2argvdata/usb-ich9-companion.args
index 03c5a04492..75c1c82600 100644
--- a/tests/qemuxml2argvdata/usb-ich9-companion.args
+++ b/tests/qemuxml2argvdata/usb-ich9-companion.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,10 +25,10 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \
--device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
--device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
--device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
+-device
'{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0x7"}'
\
+-device
'{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}'
\
+-device
'{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus":"pci.0","addr":"0x4.0x1"}'
\
+-device
'{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pci.0","addr":"0x4.0x2"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
index 70b8cc7a3b..661e086c37 100644
--- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
+++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k \
@@ -25,18 +25,18 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x2.0x7 \
--device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x2 \
--device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x2.0x2 \
--device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x2.0x1 \
--device ich9-usb-ehci1,id=usb1,bus=pci.0,addr=0x3.0x7 \
--device ich9-usb-uhci1,masterbus=usb1.0,firstport=0,bus=pci.0,multifunction=on,addr=0x3
\
--device ich9-usb-uhci3,masterbus=usb1.0,firstport=4,bus=pci.0,addr=0x3.0x2 \
--device ich9-usb-uhci2,masterbus=usb1.0,firstport=2,bus=pci.0,addr=0x3.0x1 \
--device ich9-usb-ehci1,id=usb2,bus=pci.0,addr=0x4.0x7 \
--device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4
\
--device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
--device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
+-device
'{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x2.0x7"}'
\
+-device
'{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x2"}'
\
+-device
'{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus":"pci.0","addr":"0x2.0x2"}'
\
+-device
'{"driver":"ich9-usb-uhci2","masterbus&q