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@xxxxxxxxxx>
---
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":"usb.0","firstport":2,"bus":"pci.0","addr":"0x2.0x1"}' \
+-device '{"driver":"ich9-usb-ehci1","id":"usb1","bus":"pci.0","addr":"0x3.0x7"}' \
+-device '{"driver":"ich9-usb-uhci1","masterbus":"usb1.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x3"}' \
+-device '{"driver":"ich9-usb-uhci3","masterbus":"usb1.0","firstport":4,"bus":"pci.0","addr":"0x3.0x2"}' \
+-device '{"driver":"ich9-usb-uhci2","masterbus":"usb1.0","firstport":2,"bus":"pci.0","addr":"0x3.0x1"}' \
+-device '{"driver":"ich9-usb-ehci1","id":"usb2","bus":"pci.0","addr":"0x4.0x7"}' \
+-device '{"driver":"ich9-usb-uhci1","masterbus":"usb2.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}' \
+-device '{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bus":"pci.0","addr":"0x4.0x2"}' \
+-device '{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bus":"pci.0","addr":"0x4.0x1"}' \
-audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x5"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml2argvdata/usb-long-port-path.args
index 210a82bc9b..8f29017c8e 100644
--- a/tests/qemuxml2argvdata/usb-long-port-path.args
+++ b/tests/qemuxml2argvdata/usb-long-port-path.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,10 +26,10 @@ 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=1.1 \
--device usb-hub,id=hub2,bus=usb.0,port=1.1.1 \
--device usb-hub,id=hub3,bus=usb.0,port=1.1.1.1 \
+-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \
+-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"1.1"}' \
+-device '{"driver":"usb-hub","id":"hub2","bus":"usb.0","port":"1.1.1"}' \
+-device '{"driver":"usb-hub","id":"hub3","bus":"usb.0","port":"1.1.1.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-none.args b/tests/qemuxml2argvdata/usb-none.args
index 755b7fcace..00470d4396 100644
--- a/tests/qemuxml2argvdata/usb-none.args
+++ b/tests/qemuxml2argvdata/usb-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 \
@@ -26,5 +26,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-acpi \
-boot strict=on \
-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-piix3-controller.args b/tests/qemuxml2argvdata/usb-piix3-controller.args
index fa2643e2fa..857577af38 100644
--- a/tests/qemuxml2argvdata/usb-piix3-controller.args
+++ b/tests/qemuxml2argvdata/usb-piix3-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 \
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-device '{"driver":"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 \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxml2argvdata/usb-port-autoassign.args
index 2fbef8d060..4703a94715 100644
--- a/tests/qemuxml2argvdata/usb-port-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-port-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 \
@@ -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-hub,id=hub1,bus=usb.0,port=2 \
--device usb-mouse,id=input0,bus=usb.0,port=1.1 \
--device usb-mouse,id=input1,bus=usb.0,port=1.2 \
--device usb-mouse,id=input2,bus=usb.0,port=1.3 \
+-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":"1.1"}' \
+-device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"1.2"}' \
+-device '{"driver":"usb-mouse","id":"input2","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-port-missing.args b/tests/qemuxml2argvdata/usb-port-missing.args
index 80713b27e4..4280ecef26 100644
--- a/tests/qemuxml2argvdata/usb-port-missing.args
+++ b/tests/qemuxml2argvdata/usb-port-missing.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-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=1.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-mouse","id":"input0","bus":"usb.0","port":"1.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-ports.args b/tests/qemuxml2argvdata/usb-ports.args
index e3e5cb73ca..905d2fe4da 100644
--- a/tests/qemuxml2argvdata/usb-ports.args
+++ b/tests/qemuxml2argvdata/usb-ports.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-hub,id=hub1,bus=usb.0,port=1.2 \
--device usb-mouse,id=input0,bus=usb.0,port=1.1 \
--device usb-mouse,id=input1,bus=usb.0,port=1.2.1 \
--device usb-mouse,id=input2,bus=usb.0,port=1.2.2 \
+-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \
+-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"1.2"}' \
+-device '{"driver":"usb-mouse","id":"input0","bus":"usb.0","port":"1.1"}' \
+-device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"1.2.1"}' \
+-device '{"driver":"usb-mouse","id":"input2","bus":"usb.0","port":"1.2.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/usb-redir-boot.args b/tests/qemuxml2argvdata/usb-redir-boot.args
index 150e3c5008..9cc1f16529 100644
--- a/tests/qemuxml2argvdata/usb-redir-boot.args
+++ b/tests/qemuxml2argvdata/usb-redir-boot.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,16 +24,16 @@ 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":"spice"}' \
-spice port=0,seamless-migration=on \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
+-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \
-chardev socket,id=charredir0,host=localhost,port=4000 \
--device usb-redir,chardev=charredir0,id=redir0,bootindex=1,bus=usb.0,port=1 \
+-device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","bootindex":1,"bus":"usb.0","port":"1"}' \
-chardev spicevmc,id=charredir1,name=usbredir \
--device usb-redir,chardev=charredir1,id=redir1,bootindex=2,bus=usb.0,port=4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bootindex":2,"bus":"usb.0","port":"4"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/qemuxml2argvdata/usb-redir-filter-version.args
index 904c6f7842..3d9f9f7951 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter-version.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter-version.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,10 +27,10 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-usb \
-audiodev '{"id":"audio1","driver":"spice"}' \
-spice port=0,seamless-migration=on \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
+-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \
-chardev spicevmc,id=charredir0,name=usbredir \
--device 'usb-redir,chardev=charredir0,id=redir0,filter=0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0,bus=usb.0,port=1' \
+-device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","filter":"0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0","bus":"usb.0","port":"1"}' \
-chardev spicevmc,id=charredir1,name=usbredir \
--device 'usb-redir,chardev=charredir1,id=redir1,filter=0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0,bus=usb.0,port=2' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","filter":"0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0","bus":"usb.0","port":"2"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2argvdata/usb-redir-filter.args
index aba04c7485..92616b6e2d 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter.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,16 +24,16 @@ 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":"spice"}' \
-spice port=0,seamless-migration=on \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
+-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \
-chardev spicevmc,id=charredir0,name=usbredir \
--device 'usb-redir,chardev=charredir0,id=redir0,filter=0x08:0x15E1:0x2007:0x0110:1|-1:-1:-1:-1:0,bus=usb.0,port=4' \
+-device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","filter":"0x08:0x15E1:0x2007:0x0110:1|-1:-1:-1:-1:0","bus":"usb.0","port":"4"}' \
-chardev spicevmc,id=charredir1,name=usbredir \
--device 'usb-redir,chardev=charredir1,id=redir1,filter=0x08:0x15E1:0x2007:0x0110:1|-1:-1:-1:-1:0,bus=usb.0,port=5' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","filter":"0x08:0x15E1:0x2007:0x0110:1|-1:-1:-1:-1:0","bus":"usb.0","port":"5"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata/usb-redir.args
index 2729c7d8d1..20055947b0 100644
--- a/tests/qemuxml2argvdata/usb-redir.args
+++ b/tests/qemuxml2argvdata/usb-redir.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,16 +24,16 @@ 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":"spice"}' \
-spice port=0,seamless-migration=on \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
+-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \
-chardev socket,id=charredir0,host=localhost,port=4000 \
--device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=1 \
+-device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","bus":"usb.0","port":"1"}' \
-chardev spicevmc,id=charredir1,name=usbredir \
--device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bus":"usb.0","port":"4"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
index 3f7720237a..43116f06f7 100644
--- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-xhci-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,11 +25,11 @@ 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 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":"nec-usb-xhci","p2":8,"p3":8,"id":"usb","bus":"pci.0","addr":"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"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata/usb1-usb2.args
index 56d0c52e06..caecedde68 100644
--- a/tests/qemuxml2argvdata/usb1-usb2.args
+++ b/tests/qemuxml2argvdata/usb1-usb2.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 piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device ich9-usb-ehci1,id=usb1,bus=pci.0,addr=0x4.0x7 \
--device ich9-usb-uhci1,masterbus=usb1.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
--device ich9-usb-uhci2,masterbus=usb1.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
--device ich9-usb-uhci3,masterbus=usb1.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
--device ich9-usb-ehci1,id=usb2,bus=pci.0,addr=0x5.0x7 \
--device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.0,multifunction=on,addr=0x5 \
--device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.0,addr=0x5.0x1 \
--device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.0,addr=0x5.0x2 \
--device usb-hub,id=hub0,bus=usb1.0,port=1 \
--device usb-tablet,id=input0,bus=usb.0,port=2 \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-device '{"driver":"ich9-usb-ehci1","id":"usb1","bus":"pci.0","addr":"0x4.0x7"}' \
+-device '{"driver":"ich9-usb-uhci1","masterbus":"usb1.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}' \
+-device '{"driver":"ich9-usb-uhci2","masterbus":"usb1.0","firstport":2,"bus":"pci.0","addr":"0x4.0x1"}' \
+-device '{"driver":"ich9-usb-uhci3","masterbus":"usb1.0","firstport":4,"bus":"pci.0","addr":"0x4.0x2"}' \
+-device '{"driver":"ich9-usb-ehci1","id":"usb2","bus":"pci.0","addr":"0x5.0x7"}' \
+-device '{"driver":"ich9-usb-uhci1","masterbus":"usb2.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x5"}' \
+-device '{"driver":"ich9-usb-uhci2","masterbus":"usb2.0","firstport":2,"bus":"pci.0","addr":"0x5.0x1"}' \
+-device '{"driver":"ich9-usb-uhci3","masterbus":"usb2.0","firstport":4,"bus":"pci.0","addr":"0x5.0x2"}' \
+-device '{"driver":"usb-hub","id":"hub0","bus":"usb1.0","port":"1"}' \
+-device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"2"}' \
-audiodev '{"id":"audio1","driver":"none"}' \
--device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb2.0,port=1 \
--device usb-host,hostbus=14,hostaddr=7,id=hostdev1,bus=usb2.0,port=2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device '{"driver":"usb-host","hostbus":14,"hostaddr":6,"id":"hostdev0","bus":"usb2.0","port":"1"}' \
+-device '{"driver":"usb-host","hostbus":14,"hostaddr":7,"id":"hostdev1","bus":"usb2.0","port":"2"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/qemuxml2argvdata/virtio-input-passthrough.args
index ba4ba35f50..a00ee57660 100644
--- a/tests/qemuxml2argvdata/virtio-input-passthrough.args
+++ b/tests/qemuxml2argvdata/virtio-input-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 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 virtio-input-host-pci,id=input0,evdev=/dev/input/event1234,bus=pci.0,addr=0x3 \
+-device '{"driver":"virtio-input-host-pci","id":"input0","evdev":"/dev/input/event1234","bus":"pci.0","addr":"0x3"}' \
-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/virtio-input.args b/tests/qemuxml2argvdata/virtio-input.args
index 4aa488a101..dc6aa53d9c 100644
--- a/tests/qemuxml2argvdata/virtio-input.args
+++ b/tests/qemuxml2argvdata/virtio-input.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 virtio-mouse-pci,id=input0,bus=pci.0,addr=0x3 \
--device virtio-keyboard-pci,id=input1,bus=pci.0,addr=0xa \
--device virtio-tablet-pci,id=input2,bus=pci.0,addr=0x4 \
+-device '{"driver":"virtio-mouse-pci","id":"input0","bus":"pci.0","addr":"0x3"}' \
+-device '{"driver":"virtio-keyboard-pci","id":"input1","bus":"pci.0","addr":"0xa"}' \
+-device '{"driver":"virtio-tablet-pci","id":"input2","bus":"pci.0","addr":"0x4"}' \
-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/virtio-rng-default.args b/tests/qemuxml2argvdata/virtio-rng-default.args
index a3a33be54f..5e035afeb9 100644
--- a/tests/qemuxml2argvdata/virtio-rng-default.args
+++ b/tests/qemuxml2argvdata/virtio-rng-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 \
@@ -27,7 +27,7 @@ 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 \
--object rng-random,id=objrng0,filename=/dev/random \
--device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x7 \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}' \
+-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci.0","addr":"0x7"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2argvdata/virtio-rng-egd.args
index befc02c6e4..02c5bb0e66 100644
--- a/tests/qemuxml2argvdata/virtio-rng-egd.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd.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,8 +27,8 @@ 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"}' \
-chardev socket,id=charrng0,host=1.2.3.4,port=1234 \
--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/virtio-rng-multiple.args b/tests/qemuxml2argvdata/virtio-rng-multiple.args
index 3dc689d25c..beb8a32c31 100644
--- a/tests/qemuxml2argvdata/virtio-rng-multiple.args
+++ b/tests/qemuxml2argvdata/virtio-rng-multiple.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,10 +27,10 @@ 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 \
--object rng-random,id=objrng0,filename=/dev/random \
--device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x7 \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}' \
+-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci.0","addr":"0x7"}' \
-chardev socket,id=charrng1,host=1.2.3.4,port=1234 \
--object rng-egd,id=objrng1,chardev=charrng1 \
--device virtio-rng-pci,rng=objrng1,id=rng1,bus=pci.0,addr=0x3 \
+-object '{"qom-type":"rng-egd","id":"objrng1","chardev":"charrng1"}' \
+-device '{"driver":"virtio-rng-pci","rng":"objrng1","id":"rng1","bus":"pci.0","addr":"0x3"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2argvdata/virtio-rng-random.args
index e4c87f9b86..f3473129e0 100644
--- a/tests/qemuxml2argvdata/virtio-rng-random.args
+++ b/tests/qemuxml2argvdata/virtio-rng-random.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,7 +27,7 @@ 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 \
--object rng-random,id=objrng0,filename=/dev/urandom \
--device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.0,addr=0x3 \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"}' \
+-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","max-bytes":123,"period":1234,"bus":"pci.0","addr":"0x3"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.args
index e9f0ec94e1..1e96abf12d 100644
--- a/tests/qemuxml2argvdata/vmcoreinfo.args
+++ b/tests/qemuxml2argvdata/vmcoreinfo.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 '{"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 vmcoreinfo \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+-device '{"driver":"vmcoreinfo"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index a6a1646efb..0a217949b8 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -856,9 +856,22 @@ mymain(void)
* at the end of the argument list, or the NONE placeholder.
* */
# define DO_TEST(name, ...) \
- DO_TEST_FULL(name, "", ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END)
+ DO_TEST_FULL(name, "", \
+ ARG_QEMU_CAPS, \
+ QEMU_CAPS_DEVICE_JSON, \
+ QEMU_CAPS_OBJECT_JSON, \
+ QEMU_CAPS_NETDEV_JSON, \
+ __VA_ARGS__, \
+ QEMU_CAPS_LAST, \
+ ARG_END)
# define DO_TEST_NOCAPS(name) \
- DO_TEST_FULL(name, "", ARG_END)
+ DO_TEST_FULL(name, "", \
+ ARG_QEMU_CAPS, \
+ QEMU_CAPS_DEVICE_JSON, \
+ QEMU_CAPS_OBJECT_JSON, \
+ QEMU_CAPS_NETDEV_JSON, \
+ QEMU_CAPS_LAST, \
+ ARG_END)
# define DO_TEST_GIC(name, ver, gic) \
DO_TEST_CAPS_ARCH_VER_FULL(name, "aarch64", ver, ARG_GIC, gic, ARG_END)
--
2.41.0
