6:41 a.m.
The series prepares and then converts all tests in qemuxml2xmltest to
real capabilities. Along some tests are converted even in
qemuxml2argvtest as the xml2xmltest output files were symlinks into the
qemuxml2argvdata directory.
Peter Krempa (24):
qemuxml2argvtest: Drop 'master-key' test case
qemuxml2(argv|xml)test: Modernize 'net-many-models' case
qemuxml2argvdata: Replace 'qemu-system-i386' by 'qemu-system-x86_64'
in most test files
qemuxml2(argv|xml)test: Convert certain tests to DO_TEST_CAPS_LATEST
qemuxml2argvdata: Convert 'cpu' test cases to use 'x86_64'
testutilsqemu: Drop fake data for VIR_ARCH_I686
qemuxml2xmltest: Modernize all 'DO_TEST_NOCAPS' tests
qemuxml2xmloutdata: Workaround wrong detection of
'disk-cdrom-empty-network-invalid' in virschematest
virschematest: Improve detection of 'invalid' XMLs
qemuxml2xmltest: Use real caps for 'vxhs' disk tests
qemuxml2xmltest: Convert rest of 'DO_TEST_NOCAPS' cases to
'DO_TEST_CAPS_LATEST'
qemuxml2(argv|xml)test: Modernize 'graphics-dbus*' tests
qemuxml2(argv|xml)test: Sanitize testing of default video type on
x86_64
qemuValidateDomainVCpuTopology: Remove misconfiguration warning
qemuValidateDomainVCpuTopology: Always validate vcpu count against
topology
qemuxml2(argv|xml)test: Modernize 'fd-memory*' test cases
qemuxml2(argv|xml)test: Modernize 'shmem' test cases
qemu: Retire 'ivshmem' device
qemu: capabilities: Retire unused QEMU_CAPS_DEVICE_IVSHMEM
qemuxml2argvtest: Moderinze 'video-*' cases
qemuxml2xmltest: Modernize all 'video-*' cases
qemuxml2argvtest: Modernize 'net-*'
qemuxml2xmltest: Modernize all 'net-' tests
qemuxml2xmltest: Modernize all remaining fake capability tests
src/qemu/qemu_capabilities.c | 3 +-
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 40 +-
src/qemu/qemu_hotplug.c | 14 +-
src/qemu/qemu_migration.c | 5 -
src/qemu/qemu_validate.c | 60 +-
.../440fx-ide-address-conflict.xml | 4 +-
tests/qemuxml2argvdata/440fx-wrong-root.xml | 4 +-
.../qemuxml2argvdata/balloon-device-auto.args | 2 +-
.../qemuxml2argvdata/balloon-device-auto.xml | 4 +-
.../balloon-device-deflate-off.args | 2 +-
.../balloon-device-deflate-off.xml | 4 +-
.../balloon-device-deflate.args | 2 +-
.../balloon-device-deflate.xml | 4 +-
.../balloon-device-period.args | 2 +-
.../balloon-device-period.xml | 4 +-
tests/qemuxml2argvdata/balloon-device.args | 2 +-
tests/qemuxml2argvdata/balloon-device.xml | 4 +-
tests/qemuxml2argvdata/blkiotune-device.args | 2 +-
tests/qemuxml2argvdata/blkiotune-device.xml | 4 +-
tests/qemuxml2argvdata/blkiotune.args | 2 +-
tests/qemuxml2argvdata/blkiotune.xml | 4 +-
tests/qemuxml2argvdata/boot-floppy-q35.xml | 16 +
tests/qemuxml2argvdata/channel-guestfwd.args | 2 +-
tests/qemuxml2argvdata/channel-guestfwd.xml | 4 +-
tests/qemuxml2argvdata/channel-spicevmc.args | 2 +-
tests/qemuxml2argvdata/channel-spicevmc.xml | 4 +-
.../qemuxml2argvdata/channel-virtio-auto.args | 2 +-
.../qemuxml2argvdata/channel-virtio-auto.xml | 4 +-
.../channel-virtio-autoadd.args | 2 +-
.../channel-virtio-autoadd.xml | 4 +-
.../channel-virtio-autoassign.args | 2 +-
.../channel-virtio-autoassign.xml | 4 +-
.../channel-virtio-default.args | 2 +-
.../channel-virtio-default.xml | 4 +-
.../channel-virtio-state.args | 2 +-
.../qemuxml2argvdata/channel-virtio-state.xml | 4 +-
.../qemuxml2argvdata/channel-virtio-unix.args | 2 +-
.../qemuxml2argvdata/channel-virtio-unix.xml | 4 +-
tests/qemuxml2argvdata/channel-virtio.args | 2 +-
tests/qemuxml2argvdata/channel-virtio.xml | 4 +-
.../chardev-reconnect-generated-path.xml | 4 +-
.../chardev-reconnect-invalid-timeout.xml | 4 +-
tests/qemuxml2argvdata/chardev-reconnect.args | 2 +-
tests/qemuxml2argvdata/chardev-reconnect.xml | 4 +-
tests/qemuxml2argvdata/clock-catchup.args | 2 +-
tests/qemuxml2argvdata/clock-catchup.xml | 4 +-
tests/qemuxml2argvdata/clock-france.args | 2 +-
tests/qemuxml2argvdata/clock-france.xml | 4 +-
tests/qemuxml2argvdata/clock-hpet-off.args | 2 +-
tests/qemuxml2argvdata/clock-hpet-off.xml | 4 +-
.../clock-localtime-basis-localtime.args | 2 +-
.../clock-localtime-basis-localtime.xml | 4 +-
tests/qemuxml2argvdata/clock-localtime.args | 2 +-
tests/qemuxml2argvdata/clock-localtime.xml | 4 +-
tests/qemuxml2argvdata/clock-realtime.args | 34 -
...args => clock-realtime.x86_64-latest.args} | 20 +-
tests/qemuxml2argvdata/clock-realtime.xml | 9 +-
.../clock-timer-hyperv-rtc.args | 4 +-
.../clock-timer-hyperv-rtc.xml | 4 +-
tests/qemuxml2argvdata/clock-utc.args | 2 +-
tests/qemuxml2argvdata/clock-utc.xml | 4 +-
tests/qemuxml2argvdata/clock-variable.args | 2 +-
tests/qemuxml2argvdata/clock-variable.xml | 4 +-
tests/qemuxml2argvdata/console-compat2.xml | 4 +-
.../qemuxml2argvdata/console-virtio-many.args | 2 +-
.../qemuxml2argvdata/console-virtio-many.xml | 4 +-
tests/qemuxml2argvdata/console-virtio.args | 2 +-
tests/qemuxml2argvdata/console-virtio.xml | 4 +-
.../cpu-host-model-features.xml | 4 +-
.../cpu-host-passthrough-features.args | 2 +-
.../cpu-host-passthrough-features.xml | 4 +-
tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +-
tests/qemuxml2argvdata/cpu-kvmclock.xml | 4 +-
tests/qemuxml2argvdata/cpu-minimum1.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum1.xml | 4 +-
.../cputune-iothreadsched-toomuch.xml | 4 +-
.../cputune-vcpusched-overlap.xml | 4 +-
.../default-video-type-x86_64-caps-test-0.err | 1 -
.../default-video-type-x86_64-caps-test-1.xml | 16 -
...fault-video-type-x86_64.x86_64-latest.args | 32 +
...st-0.xml => default-video-type-x86_64.xml} | 0
tests/qemuxml2argvdata/disk-active-commit.xml | 4 +-
tests/qemuxml2argvdata/disk-mirror-old.xml | 4 +-
tests/qemuxml2argvdata/disk-mirror.xml | 4 +-
.../disk-virtio-scsi-reservations.xml | 5 +-
...emory-no-numa-topology.x86_64-latest.args} | 16 +-
.../fd-memory-no-numa-topology.xml | 5 +-
...d-memory-numa-topology.x86_64-latest.args} | 15 +-
.../fd-memory-numa-topology.xml | 5 +-
...-memory-numa-topology2.x86_64-latest.args} | 17 +-
.../fd-memory-numa-topology2.xml | 7 +-
.../fd-memory-numa-topology3.args | 37 -
...d-memory-numa-topology3.x86_64-latest.args | 38 +
.../fd-memory-numa-topology3.xml | 7 +-
... graphics-dbus-address.x86_64-latest.args} | 14 +-
.../graphics-dbus-address.xml | 9 +-
...=> graphics-dbus-audio.x86_64-latest.args} | 16 +-
.../qemuxml2argvdata/graphics-dbus-audio.xml | 9 +-
... graphics-dbus-chardev.x86_64-latest.args} | 16 +-
.../graphics-dbus-chardev.xml | 9 +-
tests/qemuxml2argvdata/graphics-dbus-p2p.args | 30 -
...s => graphics-dbus-p2p.x86_64-latest.args} | 18 +-
tests/qemuxml2argvdata/graphics-dbus-p2p.xml | 9 +-
.../graphics-dbus-usbredir.x86_64-latest.args | 36 +
.../graphics-dbus-usbredir.xml | 4 +-
....args => graphics-dbus.x86_64-latest.args} | 14 +-
tests/qemuxml2argvdata/graphics-dbus.xml | 9 +-
.../graphics-listen-network.xml | 4 +-
.../graphics-listen-network2.xml | 4 +-
.../graphics-sdl-fullscreen.args | 2 +-
.../graphics-sdl-fullscreen.xml | 4 +-
tests/qemuxml2argvdata/graphics-sdl.args | 2 +-
tests/qemuxml2argvdata/graphics-sdl.xml | 4 +-
.../hostdev-mdev-display-missing-graphics.xml | 4 +-
.../qemuxml2argvdata/hostdev-mdev-display.xml | 4 +-
.../hostdev-mdev-duplicate.xml | 4 +-
.../hostdev-mdev-invalid-target-address.xml | 4 +-
.../hostdev-mdev-precreated.args | 2 +-
.../hostdev-mdev-precreated.xml | 4 +-
.../hostdev-mdev-src-address-invalid.xml | 4 +-
.../hostdev-pci-duplicate.xml | 4 +-
.../hostdev-scsi-autogen-address.xml | 4 +-
.../hostdev-scsi-duplicate.xml | 4 +-
.../hostdev-scsi-large-unit.xml | 4 +-
.../hostdev-scsi-shareable.xml | 4 +-
.../hostdev-scsi-vhost-scsi-pci.args | 2 +-
.../hostdev-scsi-vhost-scsi-pci.xml | 4 +-
.../hostdev-usb-duplicate.xml | 4 +-
.../hostdev-vfio-multidomain.args | 2 +-
.../hostdev-vfio-multidomain.xml | 4 +-
.../hostdev-vfio-zpci-wrong-arch.xml | 4 +-
tests/qemuxml2argvdata/hostdev-vfio.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio.xml | 4 +-
.../hugepages-default-1G-nodeset-2M.xml | 4 +-
.../hugepages-memaccess-invalid.xml | 4 +-
.../qemuxml2argvdata/input-usbmouse-addr.args | 2 +-
.../qemuxml2argvdata/input-usbmouse-addr.xml | 4 +-
tests/qemuxml2argvdata/input-usbmouse.args | 2 +-
tests/qemuxml2argvdata/input-usbmouse.xml | 4 +-
tests/qemuxml2argvdata/input-usbtablet.args | 2 +-
tests/qemuxml2argvdata/input-usbtablet.xml | 4 +-
...gs => kvm-features-off.x86_64-latest.args} | 12 +-
tests/qemuxml2argvdata/kvm-features-off.xml | 6 +-
...s.args => kvm-features.x86_64-latest.args} | 12 +-
tests/qemuxml2argvdata/kvm-features.xml | 6 +-
tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-delay.xml | 4 +-
tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-discard.xml | 4 +-
tests/qemuxml2argvdata/kvmclock.args | 4 +-
tests/qemuxml2argvdata/kvmclock.xml | 4 +-
tests/qemuxml2argvdata/lease.xml | 4 +-
tests/qemuxml2argvdata/machine-core-off.args | 2 +-
tests/qemuxml2argvdata/machine-core-off.xml | 4 +-
tests/qemuxml2argvdata/machine-core-on.args | 2 +-
tests/qemuxml2argvdata/machine-core-on.xml | 4 +-
.../qemuxml2argvdata/machine-vmport-opt.args | 2 +-
tests/qemuxml2argvdata/machine-vmport-opt.xml | 4 +-
tests/qemuxml2argvdata/master-key.args | 33 -
tests/qemuxml2argvdata/master-key.xml | 30 -
tests/qemuxml2argvdata/memory-align-fail.xml | 4 +-
.../qemuxml2argvdata/memory-hotplug-dimm.args | 2 +-
.../qemuxml2argvdata/memory-hotplug-dimm.xml | 4 +-
.../memory-hotplug-nonuma.xml | 4 +-
.../memory-hotplug-nvdimm-access.xml | 5 +-
.../memory-hotplug-nvdimm-align.xml | 5 +-
.../memory-hotplug-nvdimm-label.xml | 5 +-
.../memory-hotplug-nvdimm-pmem.xml | 5 +-
.../memory-hotplug-nvdimm-readonly.xml | 5 +-
.../memory-hotplug-nvdimm.xml | 5 +-
tests/qemuxml2argvdata/memory-hotplug.args | 2 +-
tests/qemuxml2argvdata/memory-hotplug.xml | 4 +-
tests/qemuxml2argvdata/memorybacking-set.xml | 4 +-
.../qemuxml2argvdata/memorybacking-unset.xml | 4 +-
tests/qemuxml2argvdata/memtune-unlimited.args | 2 +-
tests/qemuxml2argvdata/memtune-unlimited.xml | 4 +-
tests/qemuxml2argvdata/memtune.args | 2 +-
tests/qemuxml2argvdata/memtune.xml | 4 +-
tests/qemuxml2argvdata/metadata-duplicate.xml | 4 +-
tests/qemuxml2argvdata/metadata.xml | 4 +-
tests/qemuxml2argvdata/migrate.args | 2 +-
tests/qemuxml2argvdata/migrate.xml | 4 +-
tests/qemuxml2argvdata/minimal-no-memory.xml | 4 +-
tests/qemuxml2argvdata/minimal.args | 2 +-
tests/qemuxml2argvdata/minimal.xml | 4 +-
tests/qemuxml2argvdata/misc-acpi.args | 2 +-
tests/qemuxml2argvdata/misc-acpi.xml | 4 +-
tests/qemuxml2argvdata/misc-disable-s3.args | 2 +-
tests/qemuxml2argvdata/misc-disable-s3.xml | 4 +-
.../misc-disable-suspends.args | 2 +-
.../misc-disable-suspends.xml | 4 +-
tests/qemuxml2argvdata/misc-enable-s4.args | 2 +-
tests/qemuxml2argvdata/misc-enable-s4.xml | 4 +-
tests/qemuxml2argvdata/misc-uuid.args | 2 +-
tests/qemuxml2argvdata/misc-uuid.xml | 4 +-
tests/qemuxml2argvdata/monitor-json.args | 2 +-
tests/qemuxml2argvdata/monitor-json.xml | 4 +-
.../multifunction-pci-device.args | 2 +-
.../multifunction-pci-device.xml | 4 +-
.../net-client.x86_64-latest.args | 38 +
tests/qemuxml2argvdata/net-client.xml | 4 +-
...args => net-eth-hostip.x86_64-latest.args} | 19 +-
tests/qemuxml2argvdata/net-eth-hostip.xml | 4 +-
tests/qemuxml2argvdata/net-eth-ifname.args | 35 -
.../net-eth-ifname.x86_64-latest.args | 37 +
tests/qemuxml2argvdata/net-eth-ifname.xml | 4 +-
tests/qemuxml2argvdata/net-eth-names.args | 38 -
.../net-eth-names.x86_64-latest.args | 40 +
tests/qemuxml2argvdata/net-eth-names.xml | 4 +-
.../net-eth-unmanaged-tap.args | 35 -
.../net-eth-unmanaged-tap.x86_64-latest.args | 37 +
.../net-eth-unmanaged-tap.xml | 4 +-
tests/qemuxml2argvdata/net-eth.args | 35 -
.../net-eth.x86_64-latest.args | 37 +
tests/qemuxml2argvdata/net-eth.xml | 4 +-
.../net-hostdev-bootorder.args | 34 -
... net-hostdev-bootorder.x86_64-latest.args} | 15 +-
.../net-hostdev-bootorder.xml | 4 +-
...err => net-hostdev-fail.x86_64-latest.err} | 0
tests/qemuxml2argvdata/net-hostdev-fail.xml | 4 +-
.../net-hostdev-multidomain.args | 35 -
...net-hostdev-multidomain.x86_64-latest.args | 37 +
.../net-hostdev-multidomain.xml | 4 +-
.../net-hostdev-vfio-multidomain.args | 35 -
...ostdev-vfio-multidomain.x86_64-latest.args | 37 +
.../net-hostdev-vfio-multidomain.xml | 4 +-
tests/qemuxml2argvdata/net-hostdev-vfio.args | 35 -
.../net-hostdev-vfio.x86_64-latest.args | 37 +
tests/qemuxml2argvdata/net-hostdev-vfio.xml | 4 +-
tests/qemuxml2argvdata/net-hostdev.args | 35 -
.../net-hostdev.x86_64-latest.args | 37 +
tests/qemuxml2argvdata/net-hostdev.xml | 4 +-
tests/qemuxml2argvdata/net-many-models.args | 41 -
.../net-many-models.x86_64-latest.args | 43 +
tests/qemuxml2argvdata/net-many-models.xml | 2 +-
tests/qemuxml2argvdata/net-mcast.args | 36 -
.../net-mcast.x86_64-latest.args | 38 +
tests/qemuxml2argvdata/net-mcast.xml | 4 +-
tests/qemuxml2argvdata/net-midonet.xml | 4 +-
tests/qemuxml2argvdata/net-mtu.xml | 5 +-
tests/qemuxml2argvdata/net-openvswitch.xml | 4 +-
tests/qemuxml2argvdata/net-server.args | 36 -
.../net-server.x86_64-latest.args | 38 +
tests/qemuxml2argvdata/net-server.xml | 4 +-
tests/qemuxml2argvdata/net-udp.args | 36 -
.../net-udp.x86_64-latest.args | 38 +
tests/qemuxml2argvdata/net-udp.xml | 4 +-
tests/qemuxml2argvdata/net-user-addr.args | 35 -
.../net-user-addr.x86_64-latest.args | 37 +
tests/qemuxml2argvdata/net-user-addr.xml | 9 +-
...r => net-vhostuser-fail.x86_64-latest.err} | 0
tests/qemuxml2argvdata/net-vhostuser-fail.xml | 4 +-
.../net-vhostuser-multiq.args | 47 -
.../net-vhostuser-multiq.x86_64-latest.args | 49 ++
.../qemuxml2argvdata/net-vhostuser-multiq.xml | 4 +-
tests/qemuxml2argvdata/net-vhostuser.args | 38 -
tests/qemuxml2argvdata/net-virtio-device.args | 36 -
.../net-virtio-device.x86_64-latest.args | 38 +
tests/qemuxml2argvdata/net-virtio-device.xml | 4 +-
.../net-virtio-disable-offloads.args | 36 -
...virtio-disable-offloads.x86_64-latest.args | 38 +
.../net-virtio-disable-offloads.xml | 4 +-
tests/qemuxml2argvdata/net-virtio-netdev.args | 36 -
.../net-virtio-netdev.x86_64-latest.args | 38 +
tests/qemuxml2argvdata/net-virtio-netdev.xml | 4 +-
.../net-virtio-network-portgroup.xml | 4 +-
...xqueuesize-invalid-size.x86_64-latest.err} | 0
.../net-virtio-rxqueuesize-invalid-size.xml | 4 +-
.../net-virtio-rxtxqueuesize.args | 36 -
...et-virtio-rxtxqueuesize.x86_64-latest.args | 38 +
.../net-virtio-rxtxqueuesize.xml | 4 +-
.../net-virtio-teaming-hostdev.args | 40 -
...-virtio-teaming-hostdev.x86_64-latest.args | 42 +
.../net-virtio-teaming-hostdev.xml | 9 +-
.../net-virtio-teaming-network.xml | 4 +-
.../qemuxml2argvdata/net-virtio-teaming.args | 40 -
.../net-virtio-teaming.x86_64-latest.args | 42 +
tests/qemuxml2argvdata/net-virtio-teaming.xml | 4 +-
tests/qemuxml2argvdata/net-virtio.args | 35 -
...tip.args => net-virtio.x86_64-latest.args} | 18 +-
tests/qemuxml2argvdata/net-virtio.xml | 4 +-
tests/qemuxml2argvdata/nosharepages.args | 2 +-
tests/qemuxml2argvdata/nosharepages.xml | 4 +-
.../numad-auto-memory-vcpu-cpuset.args | 2 +-
.../numad-auto-memory-vcpu-cpuset.xml | 4 +-
...o-memory-vcpu-no-cpuset-and-placement.args | 2 +-
...to-memory-vcpu-no-cpuset-and-placement.xml | 4 +-
.../numad-auto-vcpu-no-numatune.xml | 4 +-
...d-auto-vcpu-static-numatune-no-nodeset.xml | 4 +-
.../numad-auto-vcpu-static-numatune.args | 2 +-
.../numad-auto-vcpu-static-numatune.xml | 4 +-
.../numad-static-memory-auto-vcpu.args | 2 +-
.../numad-static-memory-auto-vcpu.xml | 4 +-
.../numad-static-vcpu-no-numatune.xml | 4 +-
tests/qemuxml2argvdata/numad.args | 2 +-
tests/qemuxml2argvdata/numad.xml | 4 +-
.../numatune-auto-nodeset-invalid.args | 2 +-
.../numatune-auto-nodeset-invalid.xml | 4 +-
tests/qemuxml2argvdata/numatune-hmat.xml | 5 +-
.../numatune-memory-invalid-nodeset.xml | 4 +-
tests/qemuxml2argvdata/numatune-memory.args | 2 +-
tests/qemuxml2argvdata/numatune-memory.xml | 4 +-
tests/qemuxml2argvdata/numatune-no-vcpu.args | 36 -
.../numatune-no-vcpu.x86_64-latest.args | 44 +
tests/qemuxml2argvdata/numatune-no-vcpu.xml | 5 +-
...umatune-static-nodeset-exceed-hostnode.xml | 4 +-
tests/qemuxml2argvdata/pages-discard.xml | 5 +-
tests/qemuxml2argvdata/pci-bus-invalid.xml | 4 +-
tests/qemuxml2argvdata/pci-domain-invalid.xml | 4 +-
.../qemuxml2argvdata/pci-function-invalid.xml | 4 +-
tests/qemuxml2argvdata/pci-rom.args | 2 +-
tests/qemuxml2argvdata/pci-rom.xml | 4 +-
tests/qemuxml2argvdata/pci-slot-invalid.xml | 4 +-
tests/qemuxml2argvdata/pmu-feature-off.args | 4 +-
tests/qemuxml2argvdata/pmu-feature-off.xml | 4 +-
tests/qemuxml2argvdata/pmu-feature.args | 4 +-
tests/qemuxml2argvdata/pmu-feature.xml | 4 +-
tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-alt.xml | 4 +-
.../qemu-ns-commandline-ns0.args | 2 +-
.../qemu-ns-commandline-ns0.xml | 4 +-
.../qemu-ns-commandline-ns1.args | 2 +-
.../qemu-ns-commandline-ns1.xml | 4 +-
.../qemuxml2argvdata/qemu-ns-commandline.args | 2 +-
.../qemuxml2argvdata/qemu-ns-commandline.xml | 4 +-
.../qemu-ns-domain-commandline-ns0.args | 2 +-
.../qemu-ns-domain-commandline-ns0.xml | 4 +-
.../qemu-ns-domain-commandline.args | 2 +-
.../qemu-ns-domain-commandline.xml | 4 +-
.../qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml | 4 +-
tests/qemuxml2argvdata/qemu-ns-no-env.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-no-env.xml | 4 +-
.../reboot-timeout-disabled.args | 2 +-
.../reboot-timeout-disabled.xml | 4 +-
.../reboot-timeout-enabled.args | 2 +-
.../reboot-timeout-enabled.xml | 4 +-
tests/qemuxml2argvdata/restore-v2-fd.args | 2 +-
tests/qemuxml2argvdata/restore-v2-fd.xml | 4 +-
tests/qemuxml2argvdata/restore-v2.args | 2 +-
tests/qemuxml2argvdata/restore-v2.xml | 4 +-
tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +-
tests/qemuxml2argvdata/seclabel-dac-none.xml | 4 +-
.../seclabel-device-duplicates.xml | 4 +-
.../seclabel-device-multiple.xml | 4 +-
.../seclabel-device-relabel-invalid.xml | 4 +-
.../seclabel-dynamic-baselabel.args | 2 +-
.../seclabel-dynamic-baselabel.xml | 4 +-
.../seclabel-dynamic-labelskip.args | 2 +-
.../seclabel-dynamic-labelskip.xml | 4 +-
.../seclabel-dynamic-none.xml | 4 +-
.../seclabel-dynamic-override.args | 2 +-
.../seclabel-dynamic-override.xml | 4 +-
.../seclabel-dynamic-relabel.args | 2 +-
.../seclabel-dynamic-relabel.xml | 4 +-
tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic.xml | 4 +-
tests/qemuxml2argvdata/seclabel-multiple.xml | 4 +-
tests/qemuxml2argvdata/seclabel-none.args | 2 +-
tests/qemuxml2argvdata/seclabel-none.xml | 4 +-
.../seclabel-static-labelskip.args | 2 +-
.../seclabel-static-labelskip.xml | 4 +-
.../seclabel-static-relabel.args | 2 +-
.../seclabel-static-relabel.xml | 4 +-
tests/qemuxml2argvdata/seclabel-static.args | 2 +-
tests/qemuxml2argvdata/seclabel-static.xml | 4 +-
.../serial-target-port-auto.xml | 4 +-
.../serial-tcp-tlsx509-chardev-notls.xml | 5 +-
...> shmem-invalid-address.x86_64-latest.err} | 0
.../shmem-invalid-address.xml | 5 +-
...r => shmem-invalid-size.x86_64-latest.err} | 0
tests/qemuxml2argvdata/shmem-invalid-size.xml | 5 +-
...y.err => shmem-msi-only.x86_64-latest.err} | 0
tests/qemuxml2argvdata/shmem-msi-only.xml | 5 +-
.../shmem-plain-doorbell.args | 46 -
.../shmem-plain-doorbell.x86_64-latest.args | 48 ++
.../qemuxml2argvdata/shmem-plain-doorbell.xml | 4 +-
...err => shmem-small-size.x86_64-latest.err} | 0
tests/qemuxml2argvdata/shmem-small-size.xml | 5 +-
tests/qemuxml2argvdata/shmem.args | 43 -
tests/qemuxml2argvdata/shmem.err | 1 -
tests/qemuxml2argvdata/shmem.xml | 56 --
.../smartcard-controller.args | 2 +-
.../qemuxml2argvdata/smartcard-controller.xml | 4 +-
.../smartcard-host-certificates-database.args | 2 +-
.../smartcard-host-certificates-database.xml | 4 +-
.../smartcard-host-certificates.args | 2 +-
.../smartcard-host-certificates.xml | 4 +-
tests/qemuxml2argvdata/smartcard-host.args | 2 +-
tests/qemuxml2argvdata/smartcard-host.xml | 4 +-
.../smartcard-passthrough-spicevmc.args | 2 +-
.../smartcard-passthrough-spicevmc.xml | 4 +-
.../smartcard-passthrough-tcp.args | 2 +-
.../smartcard-passthrough-tcp.xml | 4 +-
tests/qemuxml2argvdata/smbios-date.xml | 4 +-
.../smbios-multiple-type2.xml | 4 +-
...s => smbios-type-fwcfg.x86_64-latest.args} | 16 +-
tests/qemuxml2argvdata/smbios-type-fwcfg.xml | 9 +-
tests/qemuxml2argvdata/smbios-uuid-match.xml | 4 +-
tests/qemuxml2argvdata/smbios.args | 2 +-
tests/qemuxml2argvdata/smbios.xml | 4 +-
tests/qemuxml2argvdata/smp-dies.args | 2 +-
tests/qemuxml2argvdata/smp-dies.xml | 4 +-
tests/qemuxml2argvdata/smp.args | 2 +-
tests/qemuxml2argvdata/smp.xml | 4 +-
tests/qemuxml2argvdata/usb-bus-missing.xml | 4 +-
.../usb-controller-xhci-limit.xml | 4 +-
.../qemuxml2argvdata/usb-controller-xhci.args | 2 +-
.../qemuxml2argvdata/usb-controller-xhci.xml | 4 +-
tests/qemuxml2argvdata/usb-controller.args | 2 +-
tests/qemuxml2argvdata/usb-controller.xml | 4 +-
.../usb-hub-autoadd-deluxe.args | 2 +-
.../usb-hub-autoadd-deluxe.xml | 4 +-
tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +-
tests/qemuxml2argvdata/usb-hub-autoadd.xml | 4 +-
tests/qemuxml2argvdata/usb-hub-conflict.xml | 4 +-
.../qemuxml2argvdata/usb-hub-nonexistent.xml | 4 +-
tests/qemuxml2argvdata/usb-hub.args | 2 +-
tests/qemuxml2argvdata/usb-hub.xml | 4 +-
.../qemuxml2argvdata/usb-ich9-autoassign.args | 2 +-
.../qemuxml2argvdata/usb-ich9-autoassign.xml | 4 +-
.../qemuxml2argvdata/usb-ich9-companion.args | 2 +-
tests/qemuxml2argvdata/usb-ich9-companion.xml | 4 +-
.../qemuxml2argvdata/usb-ich9-ehci-addr.args | 2 +-
tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml | 4 +-
.../usb-ich9-no-companion.xml | 4 +-
.../qemuxml2argvdata/usb-long-port-path.args | 2 +-
tests/qemuxml2argvdata/usb-long-port-path.xml | 4 +-
tests/qemuxml2argvdata/usb-none-hub.xml | 4 +-
tests/qemuxml2argvdata/usb-none-other.xml | 4 +-
tests/qemuxml2argvdata/usb-none-usbtablet.xml | 4 +-
tests/qemuxml2argvdata/usb-none.args | 2 +-
tests/qemuxml2argvdata/usb-none.xml | 4 +-
.../usb-piix3-controller.args | 2 +-
.../qemuxml2argvdata/usb-piix3-controller.xml | 4 +-
.../qemuxml2argvdata/usb-port-autoassign.args | 2 +-
.../qemuxml2argvdata/usb-port-autoassign.xml | 4 +-
tests/qemuxml2argvdata/usb-port-missing.args | 2 +-
tests/qemuxml2argvdata/usb-port-missing.xml | 4 +-
.../usb-ports-out-of-range.xml | 4 +-
tests/qemuxml2argvdata/usb-ports.args | 2 +-
tests/qemuxml2argvdata/usb-ports.xml | 4 +-
tests/qemuxml2argvdata/usb-redir-boot.args | 2 +-
tests/qemuxml2argvdata/usb-redir-boot.xml | 4 +-
.../usb-redir-filter-version.args | 2 +-
.../usb-redir-filter-version.xml | 4 +-
tests/qemuxml2argvdata/usb-redir-filter.args | 2 +-
tests/qemuxml2argvdata/usb-redir-filter.xml | 4 +-
tests/qemuxml2argvdata/usb-redir.args | 2 +-
tests/qemuxml2argvdata/usb-redir.xml | 4 +-
.../usb-too-long-port-path-invalid.xml | 4 +-
.../qemuxml2argvdata/usb-xhci-autoassign.args | 2 +-
.../qemuxml2argvdata/usb-xhci-autoassign.xml | 4 +-
tests/qemuxml2argvdata/usb1-usb2.args | 2 +-
tests/qemuxml2argvdata/usb1-usb2.xml | 4 +-
.../video-device-pciaddr-default.args | 37 -
...-device-pciaddr-default.x86_64-latest.args | 39 +
...nvalid-multiple-devices.x86_64-latest.err} | 0
.../video-invalid-multiple-devices.xml | 4 +-
...ideo-multiple-primaries.x86_64-latest.err} | 0
.../video-multiple-primaries.xml | 4 +-
...s => video-none-device.x86_64-latest.args} | 16 +-
tests/qemuxml2argvdata/video-none-device.xml | 4 +-
...video-qxl-device-vgamem.x86_64-latest.args | 37 +
.../video-qxl-device-vgamem.xml | 4 +-
.../video-qxl-device.x86_64-latest.args | 37 +
tests/qemuxml2argvdata/video-qxl-device.xml | 4 +-
tests/qemuxml2argvdata/video-qxl-heads.args | 37 -
.../video-qxl-heads.x86_64-latest.args | 39 +
tests/qemuxml2argvdata/video-qxl-heads.xml | 4 +-
tests/qemuxml2argvdata/video-qxl-noheads.args | 35 -
.../video-qxl-noheads.x86_64-latest.args | 37 +
tests/qemuxml2argvdata/video-qxl-noheads.xml | 4 +-
.../video-qxl-resolution.args | 35 -
.../video-qxl-resolution.x86_64-latest.args | 37 +
.../qemuxml2argvdata/video-qxl-resolution.xml | 9 +-
...o-qxl-sec-device-vgamem.x86_64-latest.args | 38 +
.../video-qxl-sec-device-vgamem.xml | 4 +-
.../video-qxl-sec-device.x86_64-latest.args | 38 +
.../qemuxml2argvdata/video-qxl-sec-device.xml | 4 +-
.../video-vga-device-vgamem.args | 35 -
...ideo-vga-device-vgamem.x86_64-latest.args} | 18 +-
.../video-vga-device-vgamem.xml | 4 +-
tests/qemuxml2argvdata/video-vga-device.args | 35 -
...gs => video-vga-device.x86_64-latest.args} | 18 +-
tests/qemuxml2argvdata/video-vga-device.xml | 4 +-
.../qemuxml2argvdata/video-vga-qxl-heads.args | 37 -
.../video-vga-qxl-heads.x86_64-latest.args | 39 +
.../qemuxml2argvdata/video-vga-qxl-heads.xml | 4 +-
.../video-virtio-gpu-device.args | 35 -
...ideo-virtio-gpu-device.x86_64-latest.args} | 19 +-
.../video-virtio-gpu-device.xml | 4 +-
...ideo-virtio-gpu-sdl-gl.x86_64-latest.args} | 18 +-
.../video-virtio-gpu-sdl-gl.xml | 4 +-
...o-virtio-gpu-secondary.x86_64-latest.args} | 16 +-
...eo-virtio-gpu-spice-gl.x86_64-latest.args} | 18 +-
.../video-virtio-gpu-spice-gl.xml | 4 +-
.../video-virtio-gpu-virgl.args | 35 -
.../video-virtio-gpu-virgl.x86_64-latest.args | 37 +
.../video-virtio-gpu-virgl.xml | 4 +-
tests/qemuxml2argvdata/video-virtio-vga.args | 35 -
...gs => video-virtio-vga.x86_64-latest.args} | 19 +-
tests/qemuxml2argvdata/video-virtio-vga.xml | 4 +-
.../virtio-input-passthrough.args | 2 +-
.../virtio-input-passthrough.xml | 4 +-
tests/qemuxml2argvdata/virtio-input.args | 2 +-
tests/qemuxml2argvdata/virtio-input.xml | 4 +-
.../qemuxml2argvdata/virtio-rng-default.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-default.xml | 4 +-
.../qemuxml2argvdata/virtio-rng-egd-crash.xml | 4 +-
tests/qemuxml2argvdata/virtio-rng-egd.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-egd.xml | 4 +-
.../qemuxml2argvdata/virtio-rng-multiple.args | 2 +-
.../qemuxml2argvdata/virtio-rng-multiple.xml | 4 +-
tests/qemuxml2argvdata/virtio-rng-random.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-random.xml | 4 +-
tests/qemuxml2argvdata/vmcoreinfo.args | 2 +-
tests/qemuxml2argvdata/vmcoreinfo.xml | 4 +-
tests/qemuxml2argvtest.c | 196 ++---
...table.xml => acpi-table.x86_64-latest.xml} | 5 +-
...oindex.xml => autoindex.x86_64-latest.xml} | 5 +-
.../balloon-device-auto.x86_64-latest.xml | 40 +
.../balloon-device-auto.xml | 37 -
...> balloon-device-period.x86_64-latest.xml} | 9 +-
...xml => blkiotune-device.x86_64-latest.xml} | 9 +-
...iotune.xml => blkiotune.x86_64-latest.xml} | 9 +-
...cdrom.xml => boot-cdrom.x86_64-latest.xml} | 5 +-
....xml => boot-floppy-q35.x86_64-latest.xml} | 0
...oppy.xml => boot-floppy.x86_64-latest.xml} | 5 +-
...nu-disable-with-timeout.x86_64-latest.xml} | 5 +-
...ml => boot-menu-disable.x86_64-latest.xml} | 5 +-
...enu-enable-with-timeout.x86_64-latest.xml} | 5 +-
...multi.xml => boot-multi.x86_64-latest.xml} | 5 +-
...ork.xml => boot-network.x86_64-latest.xml} | 5 +-
...order.xml => boot-order.x86_64-latest.xml} | 5 +-
...xml => channel-guestfwd.x86_64-latest.xml} | 9 +-
...unix-source-path-active.x86_64-latest.xml} | 5 +-
...ix-source-path-inactive.x86_64-latest.xml} | 5 +-
... => channel-virtio-auto.x86_64-latest.xml} | 9 +-
...nel-virtio-state-active.x86_64-latest.xml} | 9 +-
...l-virtio-state-inactive.x86_64-latest.xml} | 9 +-
...o.xml => channel-virtio.x86_64-latest.xml} | 9 +-
...el.xml => chardev-label.x86_64-latest.xml} | 5 +-
...up.xml => clock-catchup.x86_64-latest.xml} | 9 +-
.../clock-localtime.x86_64-latest.xml | 38 +
tests/qemuxml2xmloutdata/clock-localtime.xml | 35 -
...e.xml => clock-realtime.x86_64-latest.xml} | 0
.../clock-timer-hyperv-rtc.x86_64-latest.xml | 36 +
.../clock-timer-hyperv-rtc.xml | 33 -
.../clock-utc.x86_64-latest.xml | 38 +
tests/qemuxml2xmloutdata/clock-utc.xml | 35 -
... => console-compat-auto.x86_64-latest.xml} | 5 +-
...t.xml => console-compat.x86_64-latest.xml} | 5 +-
....xml => console-compat2.x86_64-latest.xml} | 9 +-
... => console-virtio-many.x86_64-latest.xml} | 9 +-
...o.xml => console-virtio.x86_64-latest.xml} | 9 +-
... controller-virtio-scsi.x86_64-latest.xml} | 5 +-
... cpu-check-default-none.x86_64-latest.xml} | 4 +-
...cpu-check-default-none2.x86_64-latest.xml} | 2 +-
...u-check-default-partial.x86_64-latest.xml} | 2 +-
...-check-default-partial2.x86_64-latest.xml} | 2 +-
...l.xml => cpu-check-full.x86_64-latest.xml} | 2 +-
...e.xml => cpu-check-none.x86_64-latest.xml} | 2 +-
...ml => cpu-check-partial.x86_64-latest.xml} | 2 +-
...-empty.xml => cpu-empty.x86_64-latest.xml} | 5 +-
...xml => cpu-eoi-disabled.x86_64-latest.xml} | 2 +-
....xml => cpu-eoi-enabled.x86_64-latest.xml} | 2 +-
...ml => cpu-host-kvmclock.x86_64-latest.xml} | 4 +-
...cpu-host-model-features.x86_64-latest.xml} | 6 +-
...> cpu-host-model-vendor.x86_64-latest.xml} | 2 +-
...st-passthrough-features.x86_64-latest.xml} | 8 +-
...ock.xml => cpu-kvmclock.x86_64-latest.xml} | 6 +-
...ml => cpu-numa-disjoint.x86_64-latest.xml} | 5 +-
... => cpu-numa-disordered.x86_64-latest.xml} | 5 +-
...l => cpu-numa-memshared.x86_64-latest.xml} | 5 +-
...-numa-no-memory-element.x86_64-latest.xml} | 5 +-
...-numa1.xml => cpu-numa1.x86_64-latest.xml} | 5 +-
...lement.xml => cpu-numa2.x86_64-latest.xml} | 5 +-
...> default-kvm-host-arch.x86_64-latest.xml} | 7 +-
... default-qemu-host-arch.x86_64-latest.xml} | 7 +-
.../default-video-type-x86_64-caps-test-0.xml | 31 -
...fault-video-type-x86_64.x86_64-latest.xml} | 3 +
...sk-active-commit-active.x86_64-latest.xml} | 9 +-
...-active-commit-inactive.x86_64-latest.xml} | 9 +-
...isk-aio.xml => disk-aio.x86_64-latest.xml} | 5 +-
...ing-chains-index-active.x86_64-latest.xml} | 5 +-
...g-chains-index-inactive.x86_64-latest.xml} | 5 +-
...-backing-chains-noindex.x86_64-latest.xml} | 5 +-
....xml => disk-boot-cdrom.x86_64-latest.xml} | 5 +-
...k.xml => disk-boot-disk.x86_64-latest.xml} | 5 +-
...=> disk-cdrom-bus-other.x86_64-latest.xml} | 5 +-
...-network-invalid-active.x86_64-latest.xml} | 0
...network-invalid-inactive.x86_64-latest.xml | 1 +
...cdrom.xml => disk-cdrom.x86_64-latest.xml} | 5 +-
...ml => disk-copy_on_read.x86_64-latest.xml} | 5 +-
...ml => disk-error-policy.x86_64-latest.xml} | 5 +-
...oppy.xml => disk-floppy.x86_64-latest.xml} | 5 +-
...ow.xml => disk-fmt-qcow.x86_64-latest.xml} | 5 +-
...l => disk-mirror-active.x86_64-latest.xml} | 9 +-
...=> disk-mirror-inactive.x86_64-latest.xml} | 9 +-
... disk-mirror-old-active.x86_64-latest.xml} | 9 +-
...isk-mirror-old-inactive.x86_64-latest.xml} | 9 +-
...=> disk-network-gluster.x86_64-latest.xml} | 5 +-
...l => disk-network-iscsi.x86_64-latest.xml} | 5 +-
...xml => disk-network-nbd.x86_64-latest.xml} | 5 +-
...xml => disk-network-rbd.x86_64-latest.xml} | 5 +-
...> disk-network-sheepdog.x86_64-latest.xml} | 5 +-
...isk-network-source-auth.x86_64-latest.xml} | 5 +-
...isk-network-tlsx509-nbd.x86_64-latest.xml} | 5 +-
...isk-network-tlsx509-vxhs.x86_64-5.0.0.xml} | 7 +-
...xml => disk-network-vxhs.x86_64-5.0.0.xml} | 7 +-
...> disk-scsi-device-auto.x86_64-latest.xml} | 5 +-
...l => disk-scsi-disk-vpd.x86_64-latest.xml} | 5 +-
...rial.xml => disk-serial.x86_64-latest.xml} | 5 +-
...> disk-source-pool-mode.x86_64-latest.xml} | 5 +-
...xml => disk-source-pool.x86_64-latest.xml} | 5 +-
....xml => disk-usb-device.x86_64-latest.xml} | 5 +-
...irtio-scsi-reservations.x86_64-latest.xml} | 0
...rtio.xml => disk-virtio.x86_64-latest.xml} | 5 +-
...cript.xml => downscript.x86_64-latest.xml} | 0
...led.xml => eoi-disabled.x86_64-latest.xml} | 5 +-
...bled.xml => eoi-enabled.x86_64-latest.xml} | 5 +-
...nt_idx.xml => event_idx.x86_64-latest.xml} | 5 +-
...memory-no-numa-topology.x86_64-latest.xml} | 0
...fd-memory-numa-topology.x86_64-latest.xml} | 0
...d-memory-numa-topology2.x86_64-latest.xml} | 0
...d-memory-numa-topology3.x86_64-latest.xml} | 0
...xml => floppy-drive-fat.x86_64-latest.xml} | 5 +-
...> graphics-dbus-address.x86_64-latest.xml} | 0
... => graphics-dbus-audio.x86_64-latest.xml} | 0
...> graphics-dbus-chardev.x86_64-latest.xml} | 0
...ml => graphics-dbus-p2p.x86_64-latest.xml} | 0
...us.xml => graphics-dbus.x86_64-latest.xml} | 0
...egl-headless-rendernode.x86_64-latest.xml} | 5 +-
...graphics-listen-network.x86_64-latest.xml} | 9 +-
...raphics-listen-network2.x86_64-latest.xml} | 9 +-
...graphics-sdl-fullscreen.x86_64-latest.xml} | 9 +-
...sdl.xml => graphics-sdl.x86_64-latest.xml} | 9 +-
...ics-vnc-auto-socket-cfg.x86_64-latest.xml} | 5 +-
...raphics-vnc-auto-socket.x86_64-latest.xml} | 5 +-
...aphics-vnc-egl-headless.x86_64-latest.xml} | 5 +-
...hics-vnc-no-listen-attr.x86_64-latest.xml} | 5 +-
...generated-socket-active.x86_64-latest.xml} | 5 +-
...nerated-socket-inactive.x86_64-latest.xml} | 5 +-
...ml => graphics-vnc-sasl.x86_64-latest.xml} | 5 +-
... => graphics-vnc-socket.x86_64-latest.xml} | 5 +-
...xml => graphics-vnc-tls.x86_64-latest.xml} | 5 +-
... graphics-vnc-websocket.x86_64-latest.xml} | 5 +-
...ttr.xml => graphics-vnc.x86_64-latest.xml} | 5 +-
...=> hostdev-mdev-display.x86_64-latest.xml} | 9 +-
...hostdev-mdev-precreated.x86_64-latest.xml} | 11 +-
...-pci-address-unassigned.x86_64-latest.xml} | 5 +-
...stdev-pci-multifunction.x86_64-latest.xml} | 5 +-
...ev-scsi-autogen-address.x86_64-latest.xml} | 9 +-
...hostdev-scsi-large-unit.x86_64-latest.xml} | 9 +-
...xml => hostdev-scsi-lsi.x86_64-latest.xml} | 5 +-
... hostdev-scsi-shareable.x86_64-latest.xml} | 9 +-
...dev-scsi-vhost-scsi-pci.x86_64-latest.xml} | 9 +-
...ostdev-scsi-virtio-scsi.x86_64-latest.xml} | 5 +-
...fio.xml => hostdev-vfio.x86_64-latest.xml} | 9 +-
...v-off.xml => hyperv-off.x86_64-latest.xml} | 5 +-
...nic.xml => hyperv-panic.x86_64-latest.xml} | 5 +-
...l => hyperv-passthrough.x86_64-latest.xml} | 5 +-
...=> hyperv-stimer-direct.x86_64-latest.xml} | 5 +-
.../{hyperv.xml => hyperv.x86_64-latest.xml} | 5 +-
...e.xml => input-usbmouse.x86_64-latest.xml} | 9 +-
....xml => input-usbtablet.x86_64-latest.xml} | 9 +-
...xml => interface-driver.x86_64-latest.xml} | 5 +-
...xml => kvm-features-off.x86_64-latest.xml} | 0
...res.xml => kvm-features.x86_64-latest.xml} | 0
...vmclock.xml => kvmclock.x86_64-latest.xml} | 9 +-
.../{lease.xml => lease.x86_64-latest.xml} | 9 +-
...xml => machine-core-off.x86_64-latest.xml} | 9 +-
....xml => machine-core-on.x86_64-latest.xml} | 9 +-
... => memory-hotplug-dimm.x86_64-latest.xml} | 9 +-
...y-hotplug-nvdimm-access.x86_64-latest.xml} | 0
...ry-hotplug-nvdimm-align.x86_64-latest.xml} | 0
...ry-hotplug-nvdimm-label.x86_64-latest.xml} | 0
...ory-hotplug-nvdimm-pmem.x86_64-latest.xml} | 0
...hotplug-nvdimm-readonly.x86_64-latest.xml} | 0
...> memory-hotplug-nvdimm.x86_64-latest.xml} | 0
...g.xml => memory-hotplug.x86_64-latest.xml} | 9 +-
...ml => memorybacking-set.x86_64-latest.xml} | 9 +-
... => memorybacking-unset.x86_64-latest.xml} | 9 +-
.../memtune-unlimited.x86_64-latest.xml | 40 +
.../qemuxml2xmloutdata/memtune-unlimited.xml | 37 -
...{memtune.xml => memtune.x86_64-latest.xml} | 9 +-
...l => metadata-duplicate.x86_64-latest.xml} | 9 +-
...etadata.xml => metadata.x86_64-latest.xml} | 9 +-
...{migrate.xml => migrate.x86_64-latest.xml} | 9 +-
...{minimal.xml => minimal.x86_64-latest.xml} | 9 +-
...c-acpi.xml => misc-acpi.x86_64-latest.xml} | 9 +-
....xml => misc-disable-s3.x86_64-latest.xml} | 9 +-
...> misc-disable-suspends.x86_64-latest.xml} | 9 +-
...4.xml => misc-enable-s4.x86_64-latest.xml} | 9 +-
...t.xml => misc-no-reboot.x86_64-latest.xml} | 5 +-
...c-uuid.xml => misc-uuid.x86_64-latest.xml} | 9 +-
...th.xml => net-bandwidth.x86_64-latest.xml} | 5 +-
...2.xml => net-bandwidth2.x86_64-latest.xml} | 5 +-
...sce.xml => net-coalesce.x86_64-latest.xml} | 5 +-
...p.xml => net-eth-hostip.x86_64-latest.xml} | 9 +-
...e.xml => net-eth-ifname.x86_64-latest.xml} | 9 +-
...> net-eth-unmanaged-tap.x86_64-latest.xml} | 9 +-
...{net-eth.xml => net-eth.x86_64-latest.xml} | 9 +-
...> net-hostdev-bootorder.x86_64-latest.xml} | 9 +-
...xml => net-hostdev-vfio.x86_64-latest.xml} | 9 +-
...tdev.xml => net-hostdev.x86_64-latest.xml} | 9 +-
....xml => net-many-models.x86_64-latest.xml} | 7 +-
...onet.xml => net-midonet.x86_64-latest.xml} | 9 +-
...{net-mtu.xml => net-mtu.x86_64-latest.xml} | 0
....xml => net-openvswitch.x86_64-latest.xml} | 9 +-
...erver.xml => net-server.x86_64-latest.xml} | 9 +-
...{net-udp.xml => net-udp.x86_64-latest.xml} | 9 +-
...dr.xml => net-user-addr.x86_64-latest.xml} | 0
tests/qemuxml2xmloutdata/net-user-passt.xml | 1 -
...et-user.xml => net-user.x86_64-latest.xml} | 5 +-
... => net-vdpa-multiqueue.x86_64-latest.xml} | 5 +-
...et-vdpa.xml => net-vdpa.x86_64-latest.xml} | 5 +-
...er.xml => net-vhostuser.x86_64-latest.xml} | 5 +-
...ml => net-virtio-device.x86_64-latest.xml} | 9 +-
...virtio-disable-offloads.x86_64-latest.xml} | 9 +-
...irtio-network-portgroup.x86_64-latest.xml} | 9 +-
...et-virtio-rxtxqueuesize.x86_64-latest.xml} | 9 +-
...-virtio-teaming-hostdev.x86_64-latest.xml} | 0
...-virtio-teaming-network.x86_64-latest.xml} | 9 +-
...l => net-virtio-teaming.x86_64-latest.xml} | 9 +-
...irtio.xml => net-virtio.x86_64-latest.xml} | 9 +-
...ges.xml => nosharepages.x86_64-latest.xml} | 9 +-
...auto-memory-vcpu-cpuset.x86_64-latest.xml} | 9 +-
...no-cpuset-and-placement.x86_64-latest.xml} | 9 +-
...d-auto-vcpu-no-numatune.x86_64-latest.xml} | 9 +-
...static-vcpu-no-numatune.x86_64-latest.xml} | 9 +-
...=> numatune-auto-prefer.x86_64-latest.xml} | 5 +-
...l => numatune-distances.x86_64-latest.xml} | 5 +-
...at.xml => numatune-hmat.x86_64-latest.xml} | 0
...atune-memnode-no-memory.x86_64-latest.xml} | 5 +-
...xml => numatune-memnode.x86_64-latest.xml} | 5 +-
...xml => numatune-no-vcpu.x86_64-latest.xml} | 0
...rd.xml => pages-discard.x86_64-latest.xml} | 0
...ble.xml => panic-double.x86_64-latest.xml} | 5 +-
...xml => panic-no-address.x86_64-latest.xml} | 5 +-
.../{panic.xml => panic.x86_64-latest.xml} | 5 +-
...xml => pci-autoadd-addr.x86_64-latest.xml} | 5 +-
....xml => pci-autoadd-idx.x86_64-latest.xml} | 5 +-
...ml => pci-autofill-addr.x86_64-latest.xml} | 5 +-
...> pci-bridge-many-disks.x86_64-latest.xml} | 5 +-
...ridge.xml => pci-bridge.x86_64-latest.xml} | 5 +-
...xml => pci-expander-bus.x86_64-latest.xml} | 3 +-
...ci-many.xml => pci-many.x86_64-latest.xml} | 5 +-
...ci-rom-disabled-invalid.x86_64-latest.xml} | 3 +
...xml => pci-rom-disabled.x86_64-latest.xml} | 3 +
...{pci-rom.xml => pci-rom.x86_64-latest.xml} | 9 +-
... pci-serial-dev-chardev.x86_64-latest.xml} | 5 +-
...ml => pcie-expander-bus.x86_64-latest.xml} | 13 +-
...root-port-model-generic.x86_64-latest.xml} | 6 +
...root-port-model-ioh3420.x86_64-latest.xml} | 8 +-
...t.xml => pcie-root-port.x86_64-latest.xml} | 8 +-
.../pcie-root.x86_64-latest.xml | 43 +
tests/qemuxml2xmloutdata/pcie-root.xml | 27 -
...-switch-downstream-port.x86_64-latest.xml} | 8 +-
...cie-switch-upstream-port.x86_64-latest.xml | 66 ++
...ib.xml => pcihole64-gib.x86_64-latest.xml} | 5 +-
...35.xml => pcihole64-q35.x86_64-latest.xml} | 31 +-
tests/qemuxml2xmloutdata/pcihole64-q35.xml | 39 -
...hole64.xml => pcihole64.x86_64-latest.xml} | 5 +-
.../pmu-feature-off.x86_64-latest.xml | 33 +
tests/qemuxml2xmloutdata/pmu-feature-off.xml | 30 -
.../pmu-feature.x86_64-latest.xml | 33 +
tests/qemuxml2xmloutdata/pmu-feature.xml | 30 -
...=> pv-spinlock-disabled.x86_64-latest.xml} | 5 +-
... => pv-spinlock-enabled.x86_64-latest.xml} | 5 +-
...> q35-pci-force-address.x86_64-latest.xml} | 5 +-
...r.xml => q35-usb2-multi.x86_64-latest.xml} | 23 +-
...xml => q35-usb2-reorder.x86_64-latest.xml} | 23 +-
...35-usb2.xml => q35-usb2.x86_64-latest.xml} | 3 +
...pstream-port.xml => q35.x86_64-latest.xml} | 24 +-
...v.xml => qemu-ns-no-env.x86_64-latest.xml} | 9 +-
.../reboot-timeout-disabled.x86_64-latest.xml | 30 +
.../reboot-timeout-disabled.xml | 27 -
.../reboot-timeout-enabled.x86_64-latest.xml | 30 +
.../reboot-timeout-enabled.xml | 27 -
.../restore-v2.x86_64-latest.xml | 38 +
tests/qemuxml2xmloutdata/restore-v2.xml | 35 -
...ml => seclabel-dac-none.x86_64-latest.xml} | 9 +-
...eclabel-device-multiple.x86_64-latest.xml} | 9 +-
.../seclabel-dynamic-baselabel-inactive.xml | 4 +-
.../seclabel-dynamic-labelskip-inactive.xml | 4 +-
...> seclabel-dynamic-none.x86_64-latest.xml} | 9 +-
.../seclabel-dynamic-override-inactive.xml | 4 +-
.../seclabel-dynamic-relabel-inactive.xml | 4 +-
...ne.xml => seclabel-none.x86_64-latest.xml} | 9 +-
...static-labelskip-active.x86_64-latest.xml} | 9 +-
...atic-labelskip-inactive.x86_64-latest.xml} | 9 +-
....xml => seclabel-static.x86_64-latest.xml} | 9 +-
....xml => serial-debugcon.x86_64-latest.xml} | 5 +-
...xml => serial-spiceport.x86_64-latest.xml} | 5 +-
...serial-target-port-auto.x86_64-latest.xml} | 9 +-
...p-tlsx509-chardev-notls.x86_64-latest.xml} | 0
...ial-tcp-tlsx509-chardev.x86_64-latest.xml} | 5 +-
...=> shmem-plain-doorbell.x86_64-latest.xml} | 9 +-
tests/qemuxml2xmloutdata/shmem.xml | 74 --
...=> smartcard-controller.x86_64-latest.xml} | 11 +-
...t-certificates-database.x86_64-latest.xml} | 9 +-
...tcard-host-certificates.x86_64-latest.xml} | 9 +-
...r.xml => smartcard-host.x86_64-latest.xml} | 11 +-
...rd-passthrough-spicevmc.x86_64-latest.xml} | 9 +-
...artcard-passthrough-tcp.x86_64-latest.xml} | 9 +-
...> smbios-multiple-type2.x86_64-latest.xml} | 9 +-
...ml => smbios-type-fwcfg.x86_64-latest.xml} | 0
.../{smbios.xml => smbios.x86_64-latest.xml} | 9 +-
.../{smp.xml => smp.x86_64-latest.xml} | 9 +-
... => tap-vhost-incorrect.x86_64-latest.xml} | 5 +-
...-vhost.xml => tap-vhost.x86_64-latest.xml} | 5 +-
...-controller-default-q35.x86_64-latest.xml} | 3 +
...controller-explicit-q35.x86_64-latest.xml} | 3 +
...r.xml => usb-controller.x86_64-latest.xml} | 7 +-
...l => usb-ich9-ehci-addr.x86_64-latest.xml} | 7 +-
...sb-none.xml => usb-none.x86_64-latest.xml} | 7 +-
...=> usb-piix3-controller.x86_64-latest.xml} | 9 +-
...xml => usb-port-missing.x86_64-latest.xml} | 9 +-
...sb-redir-filter-version.x86_64-latest.xml} | 9 +-
...xml => usb-redir-filter.x86_64-latest.xml} | 7 +-
...-redir.xml => usb-redir.x86_64-latest.xml} | 7 +-
...ues.xml => vhost_queues.x86_64-latest.xml} | 5 +-
...-device-pciaddr-default.x86_64-latest.xml} | 5 +-
...ml => video-none-device.x86_64-latest.xml} | 9 +-
....xml => video-qxl-heads.x86_64-latest.xml} | 9 +-
...ml => video-qxl-noheads.x86_64-latest.xml} | 9 +-
...=> video-qxl-resolution.x86_64-latest.xml} | 0
...video-virtio-gpu-device.x86_64-latest.xml} | 9 +-
...video-virtio-gpu-sdl-gl.x86_64-latest.xml} | 9 +-
...eo-virtio-gpu-secondary.x86_64-latest.xml} | 5 +-
...deo-virtio-gpu-spice-gl.x86_64-latest.xml} | 9 +-
... video-virtio-gpu-virgl.x86_64-latest.xml} | 9 +-
...irtio-input-passthrough.x86_64-latest.xml} | 9 +-
...put.xml => virtio-input.x86_64-latest.xml} | 9 +-
...o-lun.xml => virtio-lun.x86_64-latest.xml} | 5 +-
...d.xml => virtio-rng-egd.x86_64-latest.xml} | 9 +-
...ml => virtio-rng-random.x86_64-latest.xml} | 9 +-
...einfo.xml => vmcoreinfo.x86_64-latest.xml} | 9 +-
...atchdog.xml => watchdog.x86_64-latest.xml} | 5 +-
tests/qemuxml2xmltest.c | 815 +++++++-----------
tests/testutilsqemu.c | 7 -
tests/virschematest.c | 4 +-
845 files changed, 4496 insertions(+), 4214 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/clock-realtime.args
rename tests/qemuxml2argvdata/{serial-tcp-tlsx509-chardev-notls.args =>
clock-realtime.x86_64-latest.args} (60%)
delete mode 100644 tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-0.err
delete mode 100644 tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-1.xml
create mode 100644 tests/qemuxml2argvdata/default-video-type-x86_64.x86_64-latest.args
rename tests/qemuxml2argvdata/{default-video-type-x86_64-caps-test-0.xml =>
default-video-type-x86_64.xml} (100%)
rename tests/qemuxml2argvdata/{fd-memory-no-numa-topology.args =>
fd-memory-no-numa-topology.x86_64-latest.args} (51%)
rename tests/qemuxml2argvdata/{fd-memory-numa-topology.args =>
fd-memory-numa-topology.x86_64-latest.args} (55%)
rename tests/qemuxml2argvdata/{fd-memory-numa-topology2.args =>
fd-memory-numa-topology2.x86_64-latest.args} (51%)
delete mode 100644 tests/qemuxml2argvdata/fd-memory-numa-topology3.args
create mode 100644 tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args
rename tests/qemuxml2argvdata/{graphics-dbus-address.args =>
graphics-dbus-address.x86_64-latest.args} (57%)
rename tests/qemuxml2argvdata/{graphics-dbus-audio.args =>
graphics-dbus-audio.x86_64-latest.args} (61%)
rename tests/qemuxml2argvdata/{graphics-dbus-chardev.args =>
graphics-dbus-chardev.x86_64-latest.args} (54%)
delete mode 100644 tests/qemuxml2argvdata/graphics-dbus-p2p.args
rename tests/qemuxml2argvdata/{graphics-dbus-usbredir.args =>
graphics-dbus-p2p.x86_64-latest.args} (56%)
create mode 100644 tests/qemuxml2argvdata/graphics-dbus-usbredir.x86_64-latest.args
rename tests/qemuxml2argvdata/{graphics-dbus.args => graphics-dbus.x86_64-latest.args}
(57%)
rename tests/qemuxml2argvdata/{kvm-features-off.args =>
kvm-features-off.x86_64-latest.args} (59%)
rename tests/qemuxml2argvdata/{kvm-features.args => kvm-features.x86_64-latest.args}
(58%)
delete mode 100644 tests/qemuxml2argvdata/master-key.args
delete mode 100644 tests/qemuxml2argvdata/master-key.xml
create mode 100644 tests/qemuxml2argvdata/net-client.x86_64-latest.args
rename tests/qemuxml2argvdata/{net-client.args => net-eth-hostip.x86_64-latest.args}
(56%)
delete mode 100644 tests/qemuxml2argvdata/net-eth-ifname.args
create mode 100644 tests/qemuxml2argvdata/net-eth-ifname.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-eth-names.args
create mode 100644 tests/qemuxml2argvdata/net-eth-names.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
create mode 100644 tests/qemuxml2argvdata/net-eth-unmanaged-tap.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-eth.args
create mode 100644 tests/qemuxml2argvdata/net-eth.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-hostdev-bootorder.args
rename tests/qemuxml2argvdata/{net-user.args =>
net-hostdev-bootorder.x86_64-latest.args} (60%)
rename tests/qemuxml2argvdata/{net-hostdev-fail.err =>
net-hostdev-fail.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/net-hostdev-multidomain.args
create mode 100644 tests/qemuxml2argvdata/net-hostdev-multidomain.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
create mode 100644
tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-hostdev-vfio.args
create mode 100644 tests/qemuxml2argvdata/net-hostdev-vfio.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-hostdev.args
create mode 100644 tests/qemuxml2argvdata/net-hostdev.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-many-models.args
create mode 100644 tests/qemuxml2argvdata/net-many-models.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-mcast.args
create mode 100644 tests/qemuxml2argvdata/net-mcast.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-server.args
create mode 100644 tests/qemuxml2argvdata/net-server.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-udp.args
create mode 100644 tests/qemuxml2argvdata/net-udp.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-user-addr.args
create mode 100644 tests/qemuxml2argvdata/net-user-addr.x86_64-latest.args
rename tests/qemuxml2argvdata/{net-vhostuser-fail.err =>
net-vhostuser-fail.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/net-vhostuser-multiq.args
create mode 100644 tests/qemuxml2argvdata/net-vhostuser-multiq.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-vhostuser.args
delete mode 100644 tests/qemuxml2argvdata/net-virtio-device.args
create mode 100644 tests/qemuxml2argvdata/net-virtio-device.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-virtio-disable-offloads.args
create mode 100644 tests/qemuxml2argvdata/net-virtio-disable-offloads.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-virtio-netdev.args
create mode 100644 tests/qemuxml2argvdata/net-virtio-netdev.x86_64-latest.args
rename tests/qemuxml2argvdata/{net-virtio-rxqueuesize-invalid-size.err =>
net-virtio-rxqueuesize-invalid-size.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
create mode 100644 tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming-hostdev.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-virtio-teaming.args
create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-virtio.args
rename tests/qemuxml2argvdata/{net-eth-hostip.args => net-virtio.x86_64-latest.args}
(56%)
delete mode 100644 tests/qemuxml2argvdata/numatune-no-vcpu.args
create mode 100644 tests/qemuxml2argvdata/numatune-no-vcpu.x86_64-latest.args
rename tests/qemuxml2argvdata/{shmem-invalid-address.err =>
shmem-invalid-address.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{shmem-invalid-size.err =>
shmem-invalid-size.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{shmem-msi-only.err => shmem-msi-only.x86_64-latest.err}
(100%)
delete mode 100644 tests/qemuxml2argvdata/shmem-plain-doorbell.args
create mode 100644 tests/qemuxml2argvdata/shmem-plain-doorbell.x86_64-latest.args
rename tests/qemuxml2argvdata/{shmem-small-size.err =>
shmem-small-size.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/shmem.args
delete mode 100644 tests/qemuxml2argvdata/shmem.err
delete mode 100644 tests/qemuxml2argvdata/shmem.xml
rename tests/qemuxml2argvdata/{smbios-type-fwcfg.args =>
smbios-type-fwcfg.x86_64-latest.args} (68%)
delete mode 100644 tests/qemuxml2argvdata/video-device-pciaddr-default.args
create mode 100644
tests/qemuxml2argvdata/video-device-pciaddr-default.x86_64-latest.args
rename tests/qemuxml2argvdata/{video-invalid-multiple-devices.err =>
video-invalid-multiple-devices.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{video-multiple-primaries.err =>
video-multiple-primaries.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{video-none-device.args =>
video-none-device.x86_64-latest.args} (60%)
create mode 100644 tests/qemuxml2argvdata/video-qxl-device-vgamem.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/video-qxl-device.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/video-qxl-heads.args
create mode 100644 tests/qemuxml2argvdata/video-qxl-heads.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/video-qxl-noheads.args
create mode 100644 tests/qemuxml2argvdata/video-qxl-noheads.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/video-qxl-resolution.args
create mode 100644 tests/qemuxml2argvdata/video-qxl-resolution.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/video-qxl-sec-device.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/video-vga-device-vgamem.args
rename tests/qemuxml2argvdata/{video-qxl-device-vgamem.args =>
video-vga-device-vgamem.x86_64-latest.args} (58%)
delete mode 100644 tests/qemuxml2argvdata/video-vga-device.args
rename tests/qemuxml2argvdata/{video-qxl-device.args =>
video-vga-device.x86_64-latest.args} (58%)
delete mode 100644 tests/qemuxml2argvdata/video-vga-qxl-heads.args
create mode 100644 tests/qemuxml2argvdata/video-vga-qxl-heads.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-device.args
rename tests/qemuxml2argvdata/{video-qxl-sec-device-vgamem.args =>
video-virtio-gpu-device.x86_64-latest.args} (57%)
rename tests/qemuxml2argvdata/{video-virtio-gpu-sdl-gl.args =>
video-virtio-gpu-sdl-gl.x86_64-latest.args} (56%)
rename tests/qemuxml2argvdata/{video-virtio-gpu-secondary.args =>
video-virtio-gpu-secondary.x86_64-latest.args} (51%)
rename tests/qemuxml2argvdata/{video-virtio-gpu-spice-gl.args =>
video-virtio-gpu-spice-gl.x86_64-latest.args} (59%)
delete mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-virgl.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/video-virtio-vga.args
rename tests/qemuxml2argvdata/{video-qxl-sec-device.args =>
video-virtio-vga.x86_64-latest.args} (57%)
rename tests/qemuxml2xmloutdata/{acpi-table.xml => acpi-table.x86_64-latest.xml}
(87%)
rename tests/qemuxml2xmloutdata/{autoindex.xml => autoindex.x86_64-latest.xml} (98%)
create mode 100644 tests/qemuxml2xmloutdata/balloon-device-auto.x86_64-latest.xml
delete mode 100644 tests/qemuxml2xmloutdata/balloon-device-auto.xml
rename tests/qemuxml2xmloutdata/{balloon-device-period.xml =>
balloon-device-period.x86_64-latest.xml} (82%)
rename tests/qemuxml2xmloutdata/{blkiotune-device.xml =>
blkiotune-device.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{blkiotune.xml => blkiotune.x86_64-latest.xml} (82%)
rename tests/qemuxml2xmloutdata/{boot-cdrom.xml => boot-cdrom.x86_64-latest.xml}
(88%)
rename tests/qemuxml2xmloutdata/{boot-floppy-q35.xml =>
boot-floppy-q35.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{boot-floppy.xml => boot-floppy.x86_64-latest.xml}
(90%)
rename tests/qemuxml2xmloutdata/{boot-menu-disable-with-timeout.xml =>
boot-menu-disable-with-timeout.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{boot-menu-disable.xml =>
boot-menu-disable.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{boot-menu-enable-with-timeout.xml =>
boot-menu-enable-with-timeout.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{boot-multi.xml => boot-multi.x86_64-latest.xml}
(89%)
rename tests/qemuxml2xmloutdata/{boot-network.xml => boot-network.x86_64-latest.xml}
(88%)
rename tests/qemuxml2xmloutdata/{boot-order.xml => boot-order.x86_64-latest.xml}
(93%)
rename tests/qemuxml2xmloutdata/{channel-guestfwd.xml =>
channel-guestfwd.x86_64-latest.xml} (83%)
rename tests/qemuxml2xmloutdata/{channel-unix-source-path-active.xml =>
channel-unix-source-path-active.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{channel-unix-source-path-inactive.xml =>
channel-unix-source-path-inactive.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{channel-virtio-auto.xml =>
channel-virtio-auto.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{channel-virtio-state-active.xml =>
channel-virtio-state-active.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{channel-virtio-state-inactive.xml =>
channel-virtio-state-inactive.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{channel-virtio.xml =>
channel-virtio.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{chardev-label.xml => chardev-label.x86_64-latest.xml}
(92%)
rename tests/qemuxml2xmloutdata/{clock-catchup.xml => clock-catchup.x86_64-latest.xml}
(84%)
create mode 100644 tests/qemuxml2xmloutdata/clock-localtime.x86_64-latest.xml
delete mode 100644 tests/qemuxml2xmloutdata/clock-localtime.xml
rename tests/qemuxml2xmloutdata/{clock-realtime.xml =>
clock-realtime.x86_64-latest.xml} (100%)
create mode 100644 tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.x86_64-latest.xml
delete mode 100644 tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
create mode 100644 tests/qemuxml2xmloutdata/clock-utc.x86_64-latest.xml
delete mode 100644 tests/qemuxml2xmloutdata/clock-utc.xml
rename tests/qemuxml2xmloutdata/{console-compat-auto.xml =>
console-compat-auto.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{console-compat.xml =>
console-compat.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{console-compat2.xml =>
console-compat2.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{console-virtio-many.xml =>
console-virtio-many.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{console-virtio.xml =>
console-virtio.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{controller-virtio-scsi.xml =>
controller-virtio-scsi.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{cpu-check-default-none.xml =>
cpu-check-default-none.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{cpu-check-default-none2.xml =>
cpu-check-default-none2.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{cpu-check-default-partial.xml =>
cpu-check-default-partial.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{cpu-check-partial.xml =>
cpu-check-default-partial2.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{cpu-check-full.xml =>
cpu-check-full.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{cpu-check-none.xml =>
cpu-check-none.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{cpu-check-default-partial2.xml =>
cpu-check-partial.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{cpu-empty.xml => cpu-empty.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{cpu-eoi-disabled.xml =>
cpu-eoi-disabled.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{cpu-eoi-enabled.xml =>
cpu-eoi-enabled.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{cpu-host-kvmclock.xml =>
cpu-host-kvmclock.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{cpu-host-model-features.xml =>
cpu-host-model-features.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{cpu-host-model-vendor.xml =>
cpu-host-model-vendor.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{cpu-host-passthrough-features.xml =>
cpu-host-passthrough-features.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{cpu-kvmclock.xml => cpu-kvmclock.x86_64-latest.xml}
(86%)
rename tests/qemuxml2xmloutdata/{cpu-numa-disjoint.xml =>
cpu-numa-disjoint.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{cpu-numa-disordered.xml =>
cpu-numa-disordered.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{cpu-numa-memshared.xml =>
cpu-numa-memshared.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{cpu-numa2.xml =>
cpu-numa-no-memory-element.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{cpu-numa1.xml => cpu-numa1.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{cpu-numa-no-memory-element.xml =>
cpu-numa2.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{default-kvm-host-arch.xml =>
default-kvm-host-arch.x86_64-latest.xml} (79%)
rename tests/qemuxml2xmloutdata/{default-qemu-host-arch.xml =>
default-qemu-host-arch.x86_64-latest.xml} (79%)
delete mode 100644 tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-0.xml
rename tests/qemuxml2xmloutdata/{default-video-type-x86_64-caps-test-1.xml =>
default-video-type-x86_64.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{disk-active-commit-active.xml =>
disk-active-commit-active.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{disk-active-commit-inactive.xml =>
disk-active-commit-inactive.x86_64-latest.xml} (83%)
rename tests/qemuxml2xmloutdata/{disk-aio.xml => disk-aio.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{disk-backing-chains-index-active.xml =>
disk-backing-chains-index-active.x86_64-latest.xml} (97%)
rename tests/qemuxml2xmloutdata/{disk-backing-chains-index-inactive.xml =>
disk-backing-chains-index-inactive.x86_64-latest.xml} (97%)
rename tests/qemuxml2xmloutdata/{disk-backing-chains-noindex.xml =>
disk-backing-chains-noindex.x86_64-latest.xml} (97%)
rename tests/qemuxml2xmloutdata/{disk-boot-cdrom.xml =>
disk-boot-cdrom.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{disk-boot-disk.xml =>
disk-boot-disk.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{disk-cdrom-bus-other.xml =>
disk-cdrom-bus-other.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{disk-cdrom-empty-network-invalid.x86_64-latest.xml =>
disk-cdrom-empty-network-invalid-active.x86_64-latest.xml} (100%)
create mode 120000
tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid-inactive.x86_64-latest.xml
rename tests/qemuxml2xmloutdata/{disk-cdrom.xml => disk-cdrom.x86_64-latest.xml}
(92%)
rename tests/qemuxml2xmloutdata/{disk-copy_on_read.xml =>
disk-copy_on_read.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{disk-error-policy.xml =>
disk-error-policy.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{disk-floppy.xml => disk-floppy.x86_64-latest.xml}
(91%)
rename tests/qemuxml2xmloutdata/{disk-fmt-qcow.xml => disk-fmt-qcow.x86_64-latest.xml}
(90%)
rename tests/qemuxml2xmloutdata/{disk-mirror-active.xml =>
disk-mirror-active.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{disk-mirror-inactive.xml =>
disk-mirror-inactive.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{disk-mirror-old-active.xml =>
disk-mirror-old-active.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{disk-mirror-old-inactive.xml =>
disk-mirror-old-inactive.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{disk-network-gluster.xml =>
disk-network-gluster.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{disk-network-iscsi.xml =>
disk-network-iscsi.x86_64-latest.xml} (96%)
rename tests/qemuxml2xmloutdata/{disk-network-nbd.xml =>
disk-network-nbd.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{disk-network-rbd.xml =>
disk-network-rbd.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{disk-network-sheepdog.xml =>
disk-network-sheepdog.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{disk-network-source-auth.xml =>
disk-network-source-auth.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{disk-network-tlsx509-nbd.xml =>
disk-network-tlsx509-nbd.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{disk-network-tlsx509-vxhs.xml =>
disk-network-tlsx509-vxhs.x86_64-5.0.0.xml} (90%)
rename tests/qemuxml2xmloutdata/{disk-network-vxhs.xml =>
disk-network-vxhs.x86_64-5.0.0.xml} (84%)
rename tests/qemuxml2xmloutdata/{disk-scsi-device-auto.xml =>
disk-scsi-device-auto.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{disk-scsi-disk-vpd.xml =>
disk-scsi-disk-vpd.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{disk-serial.xml => disk-serial.x86_64-latest.xml}
(92%)
rename tests/qemuxml2xmloutdata/{disk-source-pool-mode.xml =>
disk-source-pool-mode.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{disk-source-pool.xml =>
disk-source-pool.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{disk-usb-device.xml =>
disk-usb-device.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{disk-virtio-scsi-reservations.xml =>
disk-virtio-scsi-reservations.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{disk-virtio.xml => disk-virtio.x86_64-latest.xml}
(92%)
rename tests/qemuxml2xmloutdata/{downscript.xml => downscript.x86_64-latest.xml}
(100%)
rename tests/qemuxml2xmloutdata/{eoi-disabled.xml => eoi-disabled.x86_64-latest.xml}
(86%)
rename tests/qemuxml2xmloutdata/{eoi-enabled.xml => eoi-enabled.x86_64-latest.xml}
(86%)
rename tests/qemuxml2xmloutdata/{event_idx.xml => event_idx.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{fd-memory-no-numa-topology.xml =>
fd-memory-no-numa-topology.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{fd-memory-numa-topology.xml =>
fd-memory-numa-topology.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{fd-memory-numa-topology2.xml =>
fd-memory-numa-topology2.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{fd-memory-numa-topology3.xml =>
fd-memory-numa-topology3.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{floppy-drive-fat.xml =>
floppy-drive-fat.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{graphics-dbus-address.xml =>
graphics-dbus-address.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{graphics-dbus-audio.xml =>
graphics-dbus-audio.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{graphics-dbus-chardev.xml =>
graphics-dbus-chardev.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{graphics-dbus-p2p.xml =>
graphics-dbus-p2p.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{graphics-dbus.xml => graphics-dbus.x86_64-latest.xml}
(100%)
rename tests/qemuxml2xmloutdata/{graphics-egl-headless-rendernode.xml =>
graphics-egl-headless-rendernode.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{graphics-listen-network.xml =>
graphics-listen-network.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{graphics-listen-network2.xml =>
graphics-listen-network2.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{graphics-sdl-fullscreen.xml =>
graphics-sdl-fullscreen.x86_64-latest.xml} (83%)
rename tests/qemuxml2xmloutdata/{graphics-sdl.xml => graphics-sdl.x86_64-latest.xml}
(83%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-auto-socket-cfg.xml =>
graphics-vnc-auto-socket-cfg.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-auto-socket.xml =>
graphics-vnc-auto-socket.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-egl-headless.xml =>
graphics-vnc-egl-headless.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{graphics-vnc.xml =>
graphics-vnc-no-listen-attr.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-remove-generated-socket-active.xml =>
graphics-vnc-remove-generated-socket-active.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-remove-generated-socket-inactive.xml =>
graphics-vnc-remove-generated-socket-inactive.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-sasl.xml =>
graphics-vnc-sasl.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-socket.xml =>
graphics-vnc-socket.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-tls.xml =>
graphics-vnc-tls.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-websocket.xml =>
graphics-vnc-websocket.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-no-listen-attr.xml =>
graphics-vnc.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{hostdev-mdev-display.xml =>
hostdev-mdev-display.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{hostdev-mdev-precreated.xml =>
hostdev-mdev-precreated.x86_64-latest.xml} (79%)
rename tests/qemuxml2xmloutdata/{hostdev-pci-address-unassigned.xml =>
hostdev-pci-address-unassigned.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{hostdev-pci-multifunction.xml =>
hostdev-pci-multifunction.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{hostdev-scsi-autogen-address.xml =>
hostdev-scsi-autogen-address.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{hostdev-scsi-large-unit.xml =>
hostdev-scsi-large-unit.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{hostdev-scsi-lsi.xml =>
hostdev-scsi-lsi.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{hostdev-scsi-shareable.xml =>
hostdev-scsi-shareable.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{hostdev-scsi-vhost-scsi-pci.xml =>
hostdev-scsi-vhost-scsi-pci.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{hostdev-scsi-virtio-scsi.xml =>
hostdev-scsi-virtio-scsi.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{hostdev-vfio.xml => hostdev-vfio.x86_64-latest.xml}
(85%)
rename tests/qemuxml2xmloutdata/{hyperv-off.xml => hyperv-off.x86_64-latest.xml}
(89%)
rename tests/qemuxml2xmloutdata/{hyperv-panic.xml => hyperv-panic.x86_64-latest.xml}
(84%)
rename tests/qemuxml2xmloutdata/{hyperv-passthrough.xml =>
hyperv-passthrough.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{hyperv-stimer-direct.xml =>
hyperv-stimer-direct.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{hyperv.xml => hyperv.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{input-usbmouse.xml =>
input-usbmouse.x86_64-latest.xml} (81%)
rename tests/qemuxml2xmloutdata/{input-usbtablet.xml =>
input-usbtablet.x86_64-latest.xml} (81%)
rename tests/qemuxml2xmloutdata/{interface-driver.xml =>
interface-driver.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{kvm-features-off.xml =>
kvm-features-off.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{kvm-features.xml => kvm-features.x86_64-latest.xml}
(100%)
rename tests/qemuxml2xmloutdata/{kvmclock.xml => kvmclock.x86_64-latest.xml} (75%)
rename tests/qemuxml2xmloutdata/{lease.xml => lease.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{machine-core-off.xml =>
machine-core-off.x86_64-latest.xml} (81%)
rename tests/qemuxml2xmloutdata/{machine-core-on.xml =>
machine-core-on.x86_64-latest.xml} (80%)
rename tests/qemuxml2xmloutdata/{memory-hotplug-dimm.xml =>
memory-hotplug-dimm.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-access.xml =>
memory-hotplug-nvdimm-access.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-align.xml =>
memory-hotplug-nvdimm-align.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-label.xml =>
memory-hotplug-nvdimm-label.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-pmem.xml =>
memory-hotplug-nvdimm-pmem.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-readonly.xml =>
memory-hotplug-nvdimm-readonly.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm.xml =>
memory-hotplug-nvdimm.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{memory-hotplug.xml =>
memory-hotplug.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{memorybacking-set.xml =>
memorybacking-set.x86_64-latest.xml} (78%)
rename tests/qemuxml2xmloutdata/{memorybacking-unset.xml =>
memorybacking-unset.x86_64-latest.xml} (78%)
create mode 100644 tests/qemuxml2xmloutdata/memtune-unlimited.x86_64-latest.xml
delete mode 100644 tests/qemuxml2xmloutdata/memtune-unlimited.xml
rename tests/qemuxml2xmloutdata/{memtune.xml => memtune.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{metadata-duplicate.xml =>
metadata-duplicate.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{metadata.xml => metadata.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{migrate.xml => migrate.x86_64-latest.xml} (80%)
rename tests/qemuxml2xmloutdata/{minimal.xml => minimal.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{misc-acpi.xml => misc-acpi.x86_64-latest.xml} (81%)
rename tests/qemuxml2xmloutdata/{misc-disable-s3.xml =>
misc-disable-s3.x86_64-latest.xml} (81%)
rename tests/qemuxml2xmloutdata/{misc-disable-suspends.xml =>
misc-disable-suspends.x86_64-latest.xml} (81%)
rename tests/qemuxml2xmloutdata/{misc-enable-s4.xml =>
misc-enable-s4.x86_64-latest.xml} (81%)
rename tests/qemuxml2xmloutdata/{misc-no-reboot.xml =>
misc-no-reboot.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{misc-uuid.xml => misc-uuid.x86_64-latest.xml} (81%)
rename tests/qemuxml2xmloutdata/{net-bandwidth.xml => net-bandwidth.x86_64-latest.xml}
(94%)
rename tests/qemuxml2xmloutdata/{net-bandwidth2.xml =>
net-bandwidth2.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{net-coalesce.xml => net-coalesce.x86_64-latest.xml}
(94%)
rename tests/qemuxml2xmloutdata/{net-eth-hostip.xml =>
net-eth-hostip.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{net-eth-ifname.xml =>
net-eth-ifname.x86_64-latest.xml} (83%)
rename tests/qemuxml2xmloutdata/{net-eth-unmanaged-tap.xml =>
net-eth-unmanaged-tap.x86_64-latest.xml} (83%)
rename tests/qemuxml2xmloutdata/{net-eth.xml => net-eth.x86_64-latest.xml} (83%)
rename tests/qemuxml2xmloutdata/{net-hostdev-bootorder.xml =>
net-hostdev-bootorder.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{net-hostdev-vfio.xml =>
net-hostdev-vfio.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{net-hostdev.xml => net-hostdev.x86_64-latest.xml}
(87%)
rename tests/qemuxml2xmloutdata/{net-many-models.xml =>
net-many-models.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{net-midonet.xml => net-midonet.x86_64-latest.xml}
(85%)
rename tests/qemuxml2xmloutdata/{net-mtu.xml => net-mtu.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{net-openvswitch.xml =>
net-openvswitch.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{net-server.xml => net-server.x86_64-latest.xml}
(84%)
rename tests/qemuxml2xmloutdata/{net-udp.xml => net-udp.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{net-user-addr.xml => net-user-addr.x86_64-latest.xml}
(100%)
delete mode 120000 tests/qemuxml2xmloutdata/net-user-passt.xml
rename tests/qemuxml2xmloutdata/{net-user.xml => net-user.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{net-vdpa-multiqueue.xml =>
net-vdpa-multiqueue.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{net-vdpa.xml => net-vdpa.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{net-vhostuser.xml => net-vhostuser.x86_64-latest.xml}
(91%)
rename tests/qemuxml2xmloutdata/{net-virtio-device.xml =>
net-virtio-device.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{net-virtio-disable-offloads.xml =>
net-virtio-disable-offloads.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{net-virtio-network-portgroup.xml =>
net-virtio-network-portgroup.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{net-virtio-rxtxqueuesize.xml =>
net-virtio-rxtxqueuesize.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{net-virtio-teaming-hostdev.xml =>
net-virtio-teaming-hostdev.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{net-virtio-teaming-network.xml =>
net-virtio-teaming-network.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{net-virtio-teaming.xml =>
net-virtio-teaming.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{net-virtio.xml => net-virtio.x86_64-latest.xml}
(83%)
rename tests/qemuxml2xmloutdata/{nosharepages.xml => nosharepages.x86_64-latest.xml}
(81%)
rename tests/qemuxml2xmloutdata/{numad-auto-memory-vcpu-cpuset.xml =>
numad-auto-memory-vcpu-cpuset.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{numad-auto-memory-vcpu-no-cpuset-and-placement.xml =>
numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{numad-auto-vcpu-no-numatune.xml =>
numad-auto-vcpu-no-numatune.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{numad-static-vcpu-no-numatune.xml =>
numad-static-vcpu-no-numatune.x86_64-latest.xml} (83%)
rename tests/qemuxml2xmloutdata/{numatune-auto-prefer.xml =>
numatune-auto-prefer.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{numatune-distances.xml =>
numatune-distances.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{numatune-hmat.xml => numatune-hmat.x86_64-latest.xml}
(100%)
rename tests/qemuxml2xmloutdata/{numatune-memnode-no-memory.xml =>
numatune-memnode-no-memory.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{numatune-memnode.xml =>
numatune-memnode.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{numatune-no-vcpu.xml =>
numatune-no-vcpu.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{pages-discard.xml => pages-discard.x86_64-latest.xml}
(100%)
rename tests/qemuxml2xmloutdata/{panic-double.xml => panic-double.x86_64-latest.xml}
(85%)
rename tests/qemuxml2xmloutdata/{panic-no-address.xml =>
panic-no-address.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{panic.xml => panic.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{pci-autoadd-addr.xml =>
pci-autoadd-addr.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{pci-autoadd-idx.xml =>
pci-autoadd-idx.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{pci-autofill-addr.xml =>
pci-autofill-addr.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{pci-bridge-many-disks.xml =>
pci-bridge-many-disks.x86_64-latest.xml} (99%)
rename tests/qemuxml2xmloutdata/{pci-bridge.xml => pci-bridge.x86_64-latest.xml}
(98%)
rename tests/qemuxml2xmloutdata/{pci-expander-bus.xml =>
pci-expander-bus.x86_64-latest.xml} (98%)
rename tests/qemuxml2xmloutdata/{pci-many.xml => pci-many.x86_64-latest.xml} (98%)
rename tests/qemuxml2xmloutdata/{pci-rom-disabled-invalid.xml =>
pci-rom-disabled-invalid.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{pci-rom-disabled.xml =>
pci-rom-disabled.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{pci-rom.xml => pci-rom.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{pci-serial-dev-chardev.xml =>
pci-serial-dev-chardev.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{pcie-expander-bus.xml =>
pcie-expander-bus.x86_64-latest.xml} (96%)
rename tests/qemuxml2xmloutdata/{pcie-root-port-model-generic.xml =>
pcie-root-port-model-generic.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{pcie-root-port-model-ioh3420.xml =>
pcie-root-port-model-ioh3420.x86_64-latest.xml} (82%)
rename tests/qemuxml2xmloutdata/{pcie-root-port.xml =>
pcie-root-port.x86_64-latest.xml} (85%)
create mode 100644 tests/qemuxml2xmloutdata/pcie-root.x86_64-latest.xml
delete mode 100644 tests/qemuxml2xmloutdata/pcie-root.xml
rename tests/qemuxml2xmloutdata/{pcie-switch-downstream-port.xml =>
pcie-switch-downstream-port.x86_64-latest.xml} (92%)
create mode 100644 tests/qemuxml2xmloutdata/pcie-switch-upstream-port.x86_64-latest.xml
rename tests/qemuxml2xmloutdata/{pcihole64-gib.xml => pcihole64-gib.x86_64-latest.xml}
(86%)
rename tests/qemuxml2xmloutdata/{q35.xml => pcihole64-q35.x86_64-latest.xml} (65%)
delete mode 100644 tests/qemuxml2xmloutdata/pcihole64-q35.xml
rename tests/qemuxml2xmloutdata/{pcihole64.xml => pcihole64.x86_64-latest.xml} (86%)
create mode 100644 tests/qemuxml2xmloutdata/pmu-feature-off.x86_64-latest.xml
delete mode 100644 tests/qemuxml2xmloutdata/pmu-feature-off.xml
create mode 100644 tests/qemuxml2xmloutdata/pmu-feature.x86_64-latest.xml
delete mode 100644 tests/qemuxml2xmloutdata/pmu-feature.xml
rename tests/qemuxml2xmloutdata/{pv-spinlock-disabled.xml =>
pv-spinlock-disabled.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{pv-spinlock-enabled.xml =>
pv-spinlock-enabled.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{q35-pci-force-address.xml =>
q35-pci-force-address.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{q35-usb2-reorder.xml =>
q35-usb2-multi.x86_64-latest.xml} (97%)
rename tests/qemuxml2xmloutdata/{q35-usb2-multi.xml =>
q35-usb2-reorder.x86_64-latest.xml} (97%)
rename tests/qemuxml2xmloutdata/{q35-usb2.xml => q35-usb2.x86_64-latest.xml} (96%)
rename tests/qemuxml2xmloutdata/{pcie-switch-upstream-port.xml =>
q35.x86_64-latest.xml} (83%)
rename tests/qemuxml2xmloutdata/{qemu-ns-no-env.xml =>
qemu-ns-no-env.x86_64-latest.xml} (82%)
create mode 100644 tests/qemuxml2xmloutdata/reboot-timeout-disabled.x86_64-latest.xml
delete mode 100644 tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
create mode 100644 tests/qemuxml2xmloutdata/reboot-timeout-enabled.x86_64-latest.xml
delete mode 100644 tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
create mode 100644 tests/qemuxml2xmloutdata/restore-v2.x86_64-latest.xml
delete mode 100644 tests/qemuxml2xmloutdata/restore-v2.xml
rename tests/qemuxml2xmloutdata/{seclabel-dac-none.xml =>
seclabel-dac-none.x86_64-latest.xml} (82%)
rename tests/qemuxml2xmloutdata/{seclabel-device-multiple.xml =>
seclabel-device-multiple.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{seclabel-dynamic-none.xml =>
seclabel-dynamic-none.x86_64-latest.xml} (82%)
rename tests/qemuxml2xmloutdata/{seclabel-none.xml => seclabel-none.x86_64-latest.xml}
(82%)
rename tests/qemuxml2xmloutdata/{seclabel-static-labelskip-active.xml =>
seclabel-static-labelskip-active.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{seclabel-static-labelskip-inactive.xml =>
seclabel-static-labelskip-inactive.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{seclabel-static.xml =>
seclabel-static.x86_64-latest.xml} (83%)
rename tests/qemuxml2xmloutdata/{serial-debugcon.xml =>
serial-debugcon.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{serial-spiceport.xml =>
serial-spiceport.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{serial-target-port-auto.xml =>
serial-target-port-auto.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{serial-tcp-tlsx509-chardev-notls.xml =>
serial-tcp-tlsx509-chardev-notls.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{serial-tcp-tlsx509-chardev.xml =>
serial-tcp-tlsx509-chardev.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{shmem-plain-doorbell.xml =>
shmem-plain-doorbell.x86_64-latest.xml} (90%)
delete mode 100644 tests/qemuxml2xmloutdata/shmem.xml
rename tests/qemuxml2xmloutdata/{smartcard-host.xml =>
smartcard-controller.x86_64-latest.xml} (78%)
rename tests/qemuxml2xmloutdata/{smartcard-host-certificates-database.xml =>
smartcard-host-certificates-database.x86_64-latest.xml} (81%)
rename tests/qemuxml2xmloutdata/{smartcard-host-certificates.xml =>
smartcard-host-certificates.x86_64-latest.xml} (80%)
rename tests/qemuxml2xmloutdata/{smartcard-controller.xml =>
smartcard-host.x86_64-latest.xml} (78%)
rename tests/qemuxml2xmloutdata/{smartcard-passthrough-spicevmc.xml =>
smartcard-passthrough-spicevmc.x86_64-latest.xml} (82%)
rename tests/qemuxml2xmloutdata/{smartcard-passthrough-tcp.xml =>
smartcard-passthrough-tcp.x86_64-latest.xml} (80%)
rename tests/qemuxml2xmloutdata/{smbios-multiple-type2.xml =>
smbios-multiple-type2.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{smbios-type-fwcfg.xml =>
smbios-type-fwcfg.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{smbios.xml => smbios.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{smp.xml => smp.x86_64-latest.xml} (82%)
rename tests/qemuxml2xmloutdata/{tap-vhost-incorrect.xml =>
tap-vhost-incorrect.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{tap-vhost.xml => tap-vhost.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{usb-controller-default-q35.xml =>
usb-controller-default-q35.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{usb-controller-explicit-q35.xml =>
usb-controller-explicit-q35.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{usb-piix3-controller.xml =>
usb-controller.x86_64-latest.xml} (81%)
rename tests/qemuxml2xmloutdata/{usb-ich9-ehci-addr.xml =>
usb-ich9-ehci-addr.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{usb-none.xml => usb-none.x86_64-latest.xml} (79%)
rename tests/qemuxml2xmloutdata/{usb-controller.xml =>
usb-piix3-controller.x86_64-latest.xml} (75%)
rename tests/qemuxml2xmloutdata/{usb-port-missing.xml =>
usb-port-missing.x86_64-latest.xml} (79%)
rename tests/qemuxml2xmloutdata/{usb-redir-filter-version.xml =>
usb-redir-filter-version.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{usb-redir-filter.xml =>
usb-redir-filter.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{usb-redir.xml => usb-redir.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{vhost_queues.xml => vhost_queues.x86_64-latest.xml}
(93%)
rename tests/qemuxml2xmloutdata/{video-device-pciaddr-default.xml =>
video-device-pciaddr-default.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{video-none-device.xml =>
video-none-device.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{video-qxl-heads.xml =>
video-qxl-heads.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{video-qxl-noheads.xml =>
video-qxl-noheads.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{video-qxl-resolution.xml =>
video-qxl-resolution.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{video-virtio-gpu-device.xml =>
video-virtio-gpu-device.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{video-virtio-gpu-sdl-gl.xml =>
video-virtio-gpu-sdl-gl.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{video-virtio-gpu-secondary.xml =>
video-virtio-gpu-secondary.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{video-virtio-gpu-spice-gl.xml =>
video-virtio-gpu-spice-gl.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{video-virtio-gpu-virgl.xml =>
video-virtio-gpu-virgl.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{virtio-input-passthrough.xml =>
virtio-input-passthrough.x86_64-latest.xml} (79%)
rename tests/qemuxml2xmloutdata/{virtio-input.xml => virtio-input.x86_64-latest.xml}
(82%)
rename tests/qemuxml2xmloutdata/{virtio-lun.xml => virtio-lun.x86_64-latest.xml}
(92%)
rename tests/qemuxml2xmloutdata/{virtio-rng-egd.xml =>
virtio-rng-egd.x86_64-latest.xml} (80%)
rename tests/qemuxml2xmloutdata/{virtio-rng-random.xml =>
virtio-rng-random.x86_64-latest.xml} (80%)
rename tests/qemuxml2xmloutdata/{vmcoreinfo.xml => vmcoreinfo.x86_64-latest.xml}
(82%)
rename tests/qemuxml2xmloutdata/{watchdog.xml => watchdog.x86_64-latest.xml} (88%)
--
2.41.0
6:41 a.m.
New subject: [PATCH 01/24] qemuxml2argvtest: Drop 'master-key' test case
At this point we setup the master key with all VMs, so this specific
test case no longer makes sense.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/master-key.args | 33 --------------------------
tests/qemuxml2argvdata/master-key.xml | 30 -----------------------
tests/qemuxml2argvtest.c | 1 -
3 files changed, 64 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/master-key.args
delete mode 100644 tests/qemuxml2argvdata/master-key.xml
diff --git a/tests/qemuxml2argvdata/master-key.args
b/tests/qemuxml2argvdata/master-key.args
deleted file mode 100644
index 986804c79b..0000000000
--- a/tests/qemuxml2argvdata/master-key.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 2,sockets=2,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/master-key.xml
b/tests/qemuxml2argvdata/master-key.xml
deleted file mode 100644
index ecf8a2db85..0000000000
--- a/tests/qemuxml2argvdata/master-key.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest1</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219136</memory>
- <currentMemory unit='KiB'>219136</currentMemory>
- <vcpu placement='static'>2</vcpu>
- <os>
- <type arch='i686' machine='pc'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
- <disk type='block' device='disk'>
- <driver name='qemu' type='raw'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <controller type='usb' index='0'/>
- <controller type='ide' index='0'/>
- <controller type='pci' index='0' model='pci-root'/>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <memballoon model='none'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index c44b9bc494..8e36a54d98 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2514,7 +2514,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("name-escape");
- DO_TEST_NOCAPS("master-key");
DO_TEST("usb-long-port-path",
QEMU_CAPS_USB_HUB);
DO_TEST_PARSE_ERROR("usb-too-long-port-path-invalid",
--
2.41.0
7:25 a.m.
New subject: [PATCH 01/24] qemuxml2argvtest: Drop 'master-key' test case
On a Thursday in 2023, Peter Krempa wrote:
At this point we setup the master key with all VMs, so this specific
test case no longer makes sense.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/master-key.args | 33 --------------------------
tests/qemuxml2argvdata/master-key.xml | 30 -----------------------
tests/qemuxml2argvtest.c | 1 -
3 files changed, 64 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/master-key.args
delete mode 100644 tests/qemuxml2argvdata/master-key.xml
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 02/24] qemuxml2(argv|xml)test: Modernize 'net-many-models' case
Use real latest capabilities.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/net-many-models.args | 41 ------------------
.../net-many-models.x86_64-latest.args | 43 +++++++++++++++++++
tests/qemuxml2argvdata/net-many-models.xml | 2 +-
tests/qemuxml2argvtest.c | 2 +-
....xml => net-many-models.x86_64-latest.xml} | 7 ++-
tests/qemuxml2xmltest.c | 2 +-
6 files changed, 51 insertions(+), 46 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/net-many-models.args
create mode 100644 tests/qemuxml2argvdata/net-many-models.x86_64-latest.args
rename tests/qemuxml2xmloutdata/{net-many-models.xml =>
net-many-models.x86_64-latest.xml} (90%)
diff --git a/tests/qemuxml2argvdata/net-many-models.args
b/tests/qemuxml2argvdata/net-many-models.args
deleted file mode 100644
index 4b7c1799c2..0000000000
--- a/tests/qemuxml2argvdata/net-many-models.args
+++ /dev/null
@@ -1,41 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--netdev user,id=hostnet0 \
--device idontexist,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
--netdev user,id=hostnet1 \
--device vmxnet3,netdev=hostnet1,id=net1,mac=00:11:22:33:44:56,bus=pci.0,addr=0x3 \
--netdev user,id=hostnet2 \
--device netfront,netdev=hostnet2,id=net2,mac=00:11:22:33:44:57,bus=pci.0,addr=0x4 \
--netdev user,id=hostnet3 \
--device virtio-net-pci,netdev=hostnet3,id=net3,mac=00:11:22:33:44:58,bus=pci.0,addr=0x5
\
--netdev user,id=hostnet4 \
--device ne2k_pci,netdev=hostnet4,id=net4,mac=00:11:22:33:44:58,bus=pci.0,addr=0x6 \
--netdev user,id=hostnet5 \
--device pcnet,netdev=hostnet5,id=net5,mac=00:11:22:33:44:58,bus=pci.0,addr=0x7 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-many-models.x86_64-latest.args
b/tests/qemuxml2argvdata/net-many-models.x86_64-latest.args
new file mode 100644
index 0000000000..c6ecde421a
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-many-models.x86_64-latest.args
@@ -0,0 +1,43 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-netdev '{"type":"user","id":"hostnet0"}'
\
+-device
'{"driver":"idontexist","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}'
\
+-netdev '{"type":"user","id":"hostnet1"}'
\
+-device
'{"driver":"vmxnet3","netdev":"hostnet1","id":"net1","mac":"00:11:22:33:44:56","bus":"pci.0","addr":"0x3"}'
\
+-netdev '{"type":"user","id":"hostnet2"}'
\
+-device
'{"driver":"netfront","netdev":"hostnet2","id":"net2","mac":"00:11:22:33:44:57","bus":"pci.0","addr":"0x4"}'
\
+-netdev '{"type":"user","id":"hostnet3"}'
\
+-device
'{"driver":"virtio-net-pci","netdev":"hostnet3","id":"net3","mac":"00:11:22:33:44:58","bus":"pci.0","addr":"0x5"}'
\
+-netdev '{"type":"user","id":"hostnet4"}'
\
+-device
'{"driver":"ne2k_pci","netdev":"hostnet4","id":"net4","mac":"00:11:22:33:44:58","bus":"pci.0","addr":"0x6"}'
\
+-netdev '{"type":"user","id":"hostnet5"}'
\
+-device
'{"driver":"pcnet","netdev":"hostnet5","id":"net5","mac":"00:11:22:33:44:58","bus":"pci.0","addr":"0x7"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-many-models.xml
b/tests/qemuxml2argvdata/net-many-models.xml
index 40fc5de06c..27b55ae99d 100644
--- a/tests/qemuxml2argvdata/net-many-models.xml
+++ b/tests/qemuxml2argvdata/net-many-models.xml
@@ -3,7 +3,7 @@
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>219136</memory>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 8e36a54d98..3191dcb7c7 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1403,7 +1403,7 @@ mymain(void)
DO_TEST_NOCAPS("net-eth-unmanaged-tap");
DO_TEST_NOCAPS("net-client");
DO_TEST_NOCAPS("net-server");
- DO_TEST_NOCAPS("net-many-models");
+ DO_TEST_CAPS_LATEST("net-many-models");
DO_TEST_NOCAPS("net-mcast");
DO_TEST_NOCAPS("net-udp");
DO_TEST("net-hostdev", QEMU_CAPS_DEVICE_VFIO_PCI);
diff --git a/tests/qemuxml2xmloutdata/net-many-models.xml
b/tests/qemuxml2xmloutdata/net-many-models.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/net-many-models.xml
rename to tests/qemuxml2xmloutdata/net-many-models.x86_64-latest.xml
index 156ad0f157..4942b6ab8d 100644
--- a/tests/qemuxml2xmloutdata/net-many-models.xml
+++ b/tests/qemuxml2xmloutdata/net-many-models.x86_64-latest.xml
@@ -5,15 +5,18 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pci-root'/>
<interface type='user'>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 5d5ab4cabe..14d083b467 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -456,7 +456,7 @@ mymain(void)
DO_TEST("net-bandwidth2", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_VNC);
DO_TEST_NOCAPS("net-mtu");
DO_TEST_NOCAPS("net-coalesce");
- DO_TEST_NOCAPS("net-many-models");
+ DO_TEST_CAPS_LATEST("net-many-models");
DO_TEST("net-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA);
DO_TEST("net-vdpa-multiqueue", QEMU_CAPS_NETDEV_VHOST_VDPA);
DO_TEST_CAPS_LATEST("net-virtio-rss");
--
2.41.0
7:58 a.m.
New subject: [PATCH 02/24] qemuxml2(argv|xml)test: Modernize 'net-many-models' case
On a Thursday in 2023, Peter Krempa wrote:
Use real latest capabilities.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/net-many-models.args | 41 ------------------
.../net-many-models.x86_64-latest.args | 43 +++++++++++++++++++
tests/qemuxml2argvdata/net-many-models.xml | 2 +-
tests/qemuxml2argvtest.c | 2 +-
....xml => net-many-models.x86_64-latest.xml} | 7 ++-
tests/qemuxml2xmltest.c | 2 +-
6 files changed, 51 insertions(+), 46 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/net-many-models.args
create mode 100644 tests/qemuxml2argvdata/net-many-models.x86_64-latest.args
rename tests/qemuxml2xmloutdata/{net-many-models.xml =>
net-many-models.x86_64-latest.xml} (90%)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 03/24] qemuxml2argvdata: Replace 'qemu-system-i386' by 'qemu-system-x86_64' in most test files
Replace the emulator and architecture to x86_64, for all non-cpu related
test cases.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/440fx-ide-address-conflict.xml | 4 ++--
tests/qemuxml2argvdata/440fx-wrong-root.xml | 4 ++--
tests/qemuxml2argvdata/balloon-device-auto.args | 2 +-
tests/qemuxml2argvdata/balloon-device-auto.xml | 4 ++--
tests/qemuxml2argvdata/balloon-device-deflate-off.args | 2 +-
tests/qemuxml2argvdata/balloon-device-deflate-off.xml | 4 ++--
tests/qemuxml2argvdata/balloon-device-deflate.args | 2 +-
tests/qemuxml2argvdata/balloon-device-deflate.xml | 4 ++--
tests/qemuxml2argvdata/balloon-device-period.args | 2 +-
tests/qemuxml2argvdata/balloon-device-period.xml | 4 ++--
tests/qemuxml2argvdata/balloon-device.args | 2 +-
tests/qemuxml2argvdata/balloon-device.xml | 4 ++--
tests/qemuxml2argvdata/blkiotune-device.args | 2 +-
tests/qemuxml2argvdata/blkiotune-device.xml | 4 ++--
tests/qemuxml2argvdata/blkiotune.args | 2 +-
tests/qemuxml2argvdata/blkiotune.xml | 4 ++--
tests/qemuxml2argvdata/channel-guestfwd.args | 2 +-
tests/qemuxml2argvdata/channel-guestfwd.xml | 4 ++--
tests/qemuxml2argvdata/channel-spicevmc.args | 2 +-
tests/qemuxml2argvdata/channel-spicevmc.xml | 4 ++--
tests/qemuxml2argvdata/channel-virtio-auto.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-auto.xml | 4 ++--
tests/qemuxml2argvdata/channel-virtio-autoadd.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-autoadd.xml | 4 ++--
tests/qemuxml2argvdata/channel-virtio-autoassign.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-autoassign.xml | 4 ++--
tests/qemuxml2argvdata/channel-virtio-default.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-default.xml | 4 ++--
tests/qemuxml2argvdata/channel-virtio-state.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-state.xml | 4 ++--
tests/qemuxml2argvdata/channel-virtio-unix.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-unix.xml | 4 ++--
tests/qemuxml2argvdata/channel-virtio.args | 2 +-
tests/qemuxml2argvdata/channel-virtio.xml | 4 ++--
tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml | 4 ++--
tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml | 4 ++--
tests/qemuxml2argvdata/chardev-reconnect.args | 2 +-
tests/qemuxml2argvdata/chardev-reconnect.xml | 4 ++--
tests/qemuxml2argvdata/clock-catchup.args | 2 +-
tests/qemuxml2argvdata/clock-catchup.xml | 4 ++--
tests/qemuxml2argvdata/clock-france.args | 2 +-
tests/qemuxml2argvdata/clock-france.xml | 4 ++--
tests/qemuxml2argvdata/clock-hpet-off.args | 2 +-
tests/qemuxml2argvdata/clock-hpet-off.xml | 4 ++--
tests/qemuxml2argvdata/clock-localtime-basis-localtime.args | 2 +-
tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml | 4 ++--
tests/qemuxml2argvdata/clock-localtime.args | 2 +-
tests/qemuxml2argvdata/clock-localtime.xml | 4 ++--
tests/qemuxml2argvdata/clock-realtime.args | 2 +-
tests/qemuxml2argvdata/clock-realtime.xml | 4 ++--
tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 4 ++--
tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml | 4 ++--
tests/qemuxml2argvdata/clock-utc.args | 2 +-
tests/qemuxml2argvdata/clock-utc.xml | 4 ++--
tests/qemuxml2argvdata/clock-variable.args | 2 +-
tests/qemuxml2argvdata/clock-variable.xml | 4 ++--
tests/qemuxml2argvdata/console-compat2.xml | 4 ++--
tests/qemuxml2argvdata/console-virtio-many.args | 2 +-
tests/qemuxml2argvdata/console-virtio-many.xml | 4 ++--
tests/qemuxml2argvdata/console-virtio.args | 2 +-
tests/qemuxml2argvdata/console-virtio.xml | 4 ++--
tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml | 4 ++--
tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml | 4 ++--
tests/qemuxml2argvdata/disk-active-commit.xml | 4 ++--
tests/qemuxml2argvdata/disk-mirror-old.xml | 4 ++--
tests/qemuxml2argvdata/disk-mirror.xml | 4 ++--
tests/qemuxml2argvdata/graphics-dbus-address.args | 2 +-
tests/qemuxml2argvdata/graphics-dbus-address.xml | 4 ++--
tests/qemuxml2argvdata/graphics-dbus-audio.args | 2 +-
tests/qemuxml2argvdata/graphics-dbus-audio.xml | 4 ++--
tests/qemuxml2argvdata/graphics-dbus-chardev.args | 2 +-
tests/qemuxml2argvdata/graphics-dbus-chardev.xml | 4 ++--
tests/qemuxml2argvdata/graphics-dbus-p2p.args | 2 +-
tests/qemuxml2argvdata/graphics-dbus-p2p.xml | 4 ++--
tests/qemuxml2argvdata/graphics-dbus-usbredir.args | 2 +-
tests/qemuxml2argvdata/graphics-dbus-usbredir.xml | 4 ++--
tests/qemuxml2argvdata/graphics-dbus.args | 2 +-
tests/qemuxml2argvdata/graphics-dbus.xml | 4 ++--
tests/qemuxml2argvdata/graphics-listen-network.xml | 4 ++--
tests/qemuxml2argvdata/graphics-listen-network2.xml | 4 ++--
tests/qemuxml2argvdata/graphics-sdl-fullscreen.args | 2 +-
tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml | 4 ++--
tests/qemuxml2argvdata/graphics-sdl.args | 2 +-
tests/qemuxml2argvdata/graphics-sdl.xml | 4 ++--
.../hostdev-mdev-display-missing-graphics.xml | 4 ++--
tests/qemuxml2argvdata/hostdev-mdev-display.xml | 4 ++--
tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml | 4 ++--
.../qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml | 4 ++--
tests/qemuxml2argvdata/hostdev-mdev-precreated.args | 2 +-
tests/qemuxml2argvdata/hostdev-mdev-precreated.xml | 4 ++--
tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml | 4 ++--
tests/qemuxml2argvdata/hostdev-pci-duplicate.xml | 4 ++--
tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml | 4 ++--
tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml | 4 ++--
tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml | 4 ++--
tests/qemuxml2argvdata/hostdev-scsi-shareable.xml | 4 ++--
tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml | 4 ++--
tests/qemuxml2argvdata/hostdev-usb-duplicate.xml | 4 ++--
tests/qemuxml2argvdata/hostdev-vfio-multidomain.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml | 4 ++--
tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml | 4 ++--
tests/qemuxml2argvdata/hostdev-vfio.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio.xml | 4 ++--
tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml | 4 ++--
tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml | 4 ++--
tests/qemuxml2argvdata/input-usbmouse-addr.args | 2 +-
tests/qemuxml2argvdata/input-usbmouse-addr.xml | 4 ++--
tests/qemuxml2argvdata/input-usbmouse.args | 2 +-
tests/qemuxml2argvdata/input-usbmouse.xml | 4 ++--
tests/qemuxml2argvdata/input-usbtablet.args | 2 +-
tests/qemuxml2argvdata/input-usbtablet.xml | 4 ++--
tests/qemuxml2argvdata/kvm-features-off.args | 2 +-
tests/qemuxml2argvdata/kvm-features-off.xml | 4 ++--
tests/qemuxml2argvdata/kvm-features.args | 2 +-
tests/qemuxml2argvdata/kvm-features.xml | 4 ++--
tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-delay.xml | 4 ++--
tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-discard.xml | 4 ++--
tests/qemuxml2argvdata/kvmclock.args | 4 ++--
tests/qemuxml2argvdata/kvmclock.xml | 4 ++--
tests/qemuxml2argvdata/lease.xml | 4 ++--
tests/qemuxml2argvdata/machine-core-off.args | 2 +-
tests/qemuxml2argvdata/machine-core-off.xml | 4 ++--
tests/qemuxml2argvdata/machine-core-on.args | 2 +-
tests/qemuxml2argvdata/machine-core-on.xml | 4 ++--
tests/qemuxml2argvdata/machine-vmport-opt.args | 2 +-
tests/qemuxml2argvdata/machine-vmport-opt.xml | 4 ++--
tests/qemuxml2argvdata/memory-align-fail.xml | 4 ++--
tests/qemuxml2argvdata/memory-hotplug-dimm.args | 2 +-
tests/qemuxml2argvdata/memory-hotplug-dimm.xml | 4 ++--
tests/qemuxml2argvdata/memory-hotplug-nonuma.xml | 4 ++--
tests/qemuxml2argvdata/memory-hotplug.args | 2 +-
tests/qemuxml2argvdata/memory-hotplug.xml | 4 ++--
tests/qemuxml2argvdata/memorybacking-set.xml | 4 ++--
tests/qemuxml2argvdata/memorybacking-unset.xml | 4 ++--
tests/qemuxml2argvdata/memtune-unlimited.args | 2 +-
tests/qemuxml2argvdata/memtune-unlimited.xml | 4 ++--
tests/qemuxml2argvdata/memtune.args | 2 +-
tests/qemuxml2argvdata/memtune.xml | 4 ++--
tests/qemuxml2argvdata/metadata-duplicate.xml | 4 ++--
tests/qemuxml2argvdata/metadata.xml | 4 ++--
tests/qemuxml2argvdata/migrate.args | 2 +-
tests/qemuxml2argvdata/migrate.xml | 4 ++--
tests/qemuxml2argvdata/minimal-no-memory.xml | 4 ++--
tests/qemuxml2argvdata/minimal.args | 2 +-
tests/qemuxml2argvdata/minimal.xml | 4 ++--
tests/qemuxml2argvdata/misc-acpi.args | 2 +-
tests/qemuxml2argvdata/misc-acpi.xml | 4 ++--
tests/qemuxml2argvdata/misc-disable-s3.args | 2 +-
tests/qemuxml2argvdata/misc-disable-s3.xml | 4 ++--
tests/qemuxml2argvdata/misc-disable-suspends.args | 2 +-
tests/qemuxml2argvdata/misc-disable-suspends.xml | 4 ++--
tests/qemuxml2argvdata/misc-enable-s4.args | 2 +-
tests/qemuxml2argvdata/misc-enable-s4.xml | 4 ++--
tests/qemuxml2argvdata/misc-uuid.args | 2 +-
tests/qemuxml2argvdata/misc-uuid.xml | 4 ++--
tests/qemuxml2argvdata/monitor-json.args | 2 +-
tests/qemuxml2argvdata/monitor-json.xml | 4 ++--
tests/qemuxml2argvdata/multifunction-pci-device.args | 2 +-
tests/qemuxml2argvdata/multifunction-pci-device.xml | 4 ++--
tests/qemuxml2argvdata/net-client.args | 2 +-
tests/qemuxml2argvdata/net-client.xml | 4 ++--
tests/qemuxml2argvdata/net-eth-hostip.args | 2 +-
tests/qemuxml2argvdata/net-eth-hostip.xml | 4 ++--
tests/qemuxml2argvdata/net-eth-ifname.args | 2 +-
tests/qemuxml2argvdata/net-eth-ifname.xml | 4 ++--
tests/qemuxml2argvdata/net-eth-names.args | 2 +-
tests/qemuxml2argvdata/net-eth-names.xml | 4 ++--
tests/qemuxml2argvdata/net-eth-unmanaged-tap.args | 2 +-
tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml | 4 ++--
tests/qemuxml2argvdata/net-eth.args | 2 +-
tests/qemuxml2argvdata/net-eth.xml | 4 ++--
tests/qemuxml2argvdata/net-hostdev-bootorder.args | 2 +-
tests/qemuxml2argvdata/net-hostdev-bootorder.xml | 4 ++--
tests/qemuxml2argvdata/net-hostdev-fail.xml | 4 ++--
tests/qemuxml2argvdata/net-hostdev-multidomain.args | 2 +-
tests/qemuxml2argvdata/net-hostdev-multidomain.xml | 4 ++--
tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args | 2 +-
tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml | 4 ++--
tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 +-
tests/qemuxml2argvdata/net-hostdev-vfio.xml | 4 ++--
tests/qemuxml2argvdata/net-hostdev.args | 2 +-
tests/qemuxml2argvdata/net-hostdev.xml | 4 ++--
tests/qemuxml2argvdata/net-mcast.args | 2 +-
tests/qemuxml2argvdata/net-mcast.xml | 4 ++--
tests/qemuxml2argvdata/net-midonet.xml | 4 ++--
tests/qemuxml2argvdata/net-openvswitch.xml | 4 ++--
tests/qemuxml2argvdata/net-server.args | 2 +-
tests/qemuxml2argvdata/net-server.xml | 4 ++--
tests/qemuxml2argvdata/net-udp.args | 2 +-
tests/qemuxml2argvdata/net-udp.xml | 4 ++--
tests/qemuxml2argvdata/net-user-addr.args | 2 +-
tests/qemuxml2argvdata/net-user-addr.xml | 4 ++--
tests/qemuxml2argvdata/net-vhostuser-fail.xml | 4 ++--
tests/qemuxml2argvdata/net-vhostuser-multiq.args | 2 +-
tests/qemuxml2argvdata/net-vhostuser-multiq.xml | 4 ++--
tests/qemuxml2argvdata/net-virtio-device.args | 2 +-
tests/qemuxml2argvdata/net-virtio-device.xml | 4 ++--
tests/qemuxml2argvdata/net-virtio-disable-offloads.args | 2 +-
tests/qemuxml2argvdata/net-virtio-disable-offloads.xml | 4 ++--
tests/qemuxml2argvdata/net-virtio-netdev.args | 2 +-
tests/qemuxml2argvdata/net-virtio-netdev.xml | 4 ++--
tests/qemuxml2argvdata/net-virtio-network-portgroup.xml | 4 ++--
.../qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml | 4 ++--
tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args | 2 +-
tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml | 4 ++--
tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args | 2 +-
tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml | 4 ++--
tests/qemuxml2argvdata/net-virtio-teaming-network.xml | 4 ++--
tests/qemuxml2argvdata/net-virtio-teaming.args | 2 +-
tests/qemuxml2argvdata/net-virtio-teaming.xml | 4 ++--
tests/qemuxml2argvdata/net-virtio.args | 2 +-
tests/qemuxml2argvdata/net-virtio.xml | 4 ++--
tests/qemuxml2argvdata/nosharepages.args | 2 +-
tests/qemuxml2argvdata/nosharepages.xml | 4 ++--
tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args | 2 +-
tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml | 4 ++--
.../numad-auto-memory-vcpu-no-cpuset-and-placement.args | 2 +-
.../numad-auto-memory-vcpu-no-cpuset-and-placement.xml | 4 ++--
tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml | 4 ++--
.../numad-auto-vcpu-static-numatune-no-nodeset.xml | 4 ++--
tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args | 2 +-
tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml | 4 ++--
tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args | 2 +-
tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml | 4 ++--
tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml | 4 ++--
tests/qemuxml2argvdata/numad.args | 2 +-
tests/qemuxml2argvdata/numad.xml | 4 ++--
tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args | 2 +-
tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml | 4 ++--
tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml | 4 ++--
tests/qemuxml2argvdata/numatune-memory.args | 2 +-
tests/qemuxml2argvdata/numatune-memory.xml | 4 ++--
.../numatune-static-nodeset-exceed-hostnode.xml | 4 ++--
tests/qemuxml2argvdata/pci-bus-invalid.xml | 4 ++--
tests/qemuxml2argvdata/pci-domain-invalid.xml | 4 ++--
tests/qemuxml2argvdata/pci-function-invalid.xml | 4 ++--
tests/qemuxml2argvdata/pci-rom.args | 2 +-
tests/qemuxml2argvdata/pci-rom.xml | 4 ++--
tests/qemuxml2argvdata/pci-slot-invalid.xml | 4 ++--
tests/qemuxml2argvdata/pmu-feature-off.args | 4 ++--
tests/qemuxml2argvdata/pmu-feature-off.xml | 4 ++--
tests/qemuxml2argvdata/pmu-feature.args | 4 ++--
tests/qemuxml2argvdata/pmu-feature.xml | 4 ++--
tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-alt.xml | 4 ++--
tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml | 4 ++--
tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml | 4 ++--
tests/qemuxml2argvdata/qemu-ns-commandline.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-commandline.xml | 4 ++--
tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml | 4 ++--
tests/qemuxml2argvdata/qemu-ns-domain-commandline.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml | 4 ++--
tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml | 4 ++--
tests/qemuxml2argvdata/qemu-ns-no-env.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-no-env.xml | 4 ++--
tests/qemuxml2argvdata/reboot-timeout-disabled.args | 2 +-
tests/qemuxml2argvdata/reboot-timeout-disabled.xml | 4 ++--
tests/qemuxml2argvdata/reboot-timeout-enabled.args | 2 +-
tests/qemuxml2argvdata/reboot-timeout-enabled.xml | 4 ++--
tests/qemuxml2argvdata/restore-v2-fd.args | 2 +-
tests/qemuxml2argvdata/restore-v2-fd.xml | 4 ++--
tests/qemuxml2argvdata/restore-v2.args | 2 +-
tests/qemuxml2argvdata/restore-v2.xml | 4 ++--
tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +-
tests/qemuxml2argvdata/seclabel-dac-none.xml | 4 ++--
tests/qemuxml2argvdata/seclabel-device-duplicates.xml | 4 ++--
tests/qemuxml2argvdata/seclabel-device-multiple.xml | 4 ++--
tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml | 4 ++--
tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml | 4 ++--
tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml | 4 ++--
tests/qemuxml2argvdata/seclabel-dynamic-none.xml | 4 ++--
tests/qemuxml2argvdata/seclabel-dynamic-override.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic-override.xml | 4 ++--
tests/qemuxml2argvdata/seclabel-dynamic-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml | 4 ++--
tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic.xml | 4 ++--
tests/qemuxml2argvdata/seclabel-multiple.xml | 4 ++--
tests/qemuxml2argvdata/seclabel-none.args | 2 +-
tests/qemuxml2argvdata/seclabel-none.xml | 4 ++--
tests/qemuxml2argvdata/seclabel-static-labelskip.args | 2 +-
tests/qemuxml2argvdata/seclabel-static-labelskip.xml | 4 ++--
tests/qemuxml2argvdata/seclabel-static-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-static-relabel.xml | 4 ++--
tests/qemuxml2argvdata/seclabel-static.args | 2 +-
tests/qemuxml2argvdata/seclabel-static.xml | 4 ++--
tests/qemuxml2argvdata/serial-target-port-auto.xml | 4 ++--
tests/qemuxml2argvdata/shmem-invalid-address.xml | 4 ++--
tests/qemuxml2argvdata/shmem-invalid-size.xml | 4 ++--
tests/qemuxml2argvdata/shmem-msi-only.xml | 4 ++--
tests/qemuxml2argvdata/shmem-plain-doorbell.args | 2 +-
tests/qemuxml2argvdata/shmem-plain-doorbell.xml | 4 ++--
tests/qemuxml2argvdata/shmem-small-size.xml | 4 ++--
tests/qemuxml2argvdata/shmem.args | 2 +-
tests/qemuxml2argvdata/shmem.xml | 4 ++--
tests/qemuxml2argvdata/smartcard-controller.args | 2 +-
tests/qemuxml2argvdata/smartcard-controller.xml | 4 ++--
.../smartcard-host-certificates-database.args | 2 +-
.../qemuxml2argvdata/smartcard-host-certificates-database.xml | 4 ++--
tests/qemuxml2argvdata/smartcard-host-certificates.args | 2 +-
tests/qemuxml2argvdata/smartcard-host-certificates.xml | 4 ++--
tests/qemuxml2argvdata/smartcard-host.args | 2 +-
tests/qemuxml2argvdata/smartcard-host.xml | 4 ++--
tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args | 2 +-
tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml | 4 ++--
tests/qemuxml2argvdata/smartcard-passthrough-tcp.args | 2 +-
tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml | 4 ++--
tests/qemuxml2argvdata/smbios-date.xml | 4 ++--
tests/qemuxml2argvdata/smbios-multiple-type2.xml | 4 ++--
tests/qemuxml2argvdata/smbios-type-fwcfg.args | 2 +-
tests/qemuxml2argvdata/smbios-type-fwcfg.xml | 4 ++--
tests/qemuxml2argvdata/smbios-uuid-match.xml | 4 ++--
tests/qemuxml2argvdata/smbios.args | 2 +-
tests/qemuxml2argvdata/smbios.xml | 4 ++--
tests/qemuxml2argvdata/smp-dies.args | 2 +-
tests/qemuxml2argvdata/smp-dies.xml | 4 ++--
tests/qemuxml2argvdata/smp.args | 2 +-
tests/qemuxml2argvdata/smp.xml | 4 ++--
tests/qemuxml2argvdata/usb-bus-missing.xml | 4 ++--
tests/qemuxml2argvdata/usb-controller-xhci-limit.xml | 4 ++--
tests/qemuxml2argvdata/usb-controller-xhci.args | 2 +-
tests/qemuxml2argvdata/usb-controller-xhci.xml | 4 ++--
tests/qemuxml2argvdata/usb-controller.args | 2 +-
tests/qemuxml2argvdata/usb-controller.xml | 4 ++--
tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 2 +-
tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml | 4 ++--
tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +-
tests/qemuxml2argvdata/usb-hub-autoadd.xml | 4 ++--
tests/qemuxml2argvdata/usb-hub-conflict.xml | 4 ++--
tests/qemuxml2argvdata/usb-hub-nonexistent.xml | 4 ++--
tests/qemuxml2argvdata/usb-hub.args | 2 +-
tests/qemuxml2argvdata/usb-hub.xml | 4 ++--
tests/qemuxml2argvdata/usb-ich9-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb-ich9-autoassign.xml | 4 ++--
tests/qemuxml2argvdata/usb-ich9-companion.args | 2 +-
tests/qemuxml2argvdata/usb-ich9-companion.xml | 4 ++--
tests/qemuxml2argvdata/usb-ich9-ehci-addr.args | 2 +-
tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml | 4 ++--
tests/qemuxml2argvdata/usb-ich9-no-companion.xml | 4 ++--
tests/qemuxml2argvdata/usb-long-port-path.args | 2 +-
tests/qemuxml2argvdata/usb-long-port-path.xml | 4 ++--
tests/qemuxml2argvdata/usb-none-hub.xml | 4 ++--
tests/qemuxml2argvdata/usb-none-other.xml | 4 ++--
tests/qemuxml2argvdata/usb-none-usbtablet.xml | 4 ++--
tests/qemuxml2argvdata/usb-none.args | 2 +-
tests/qemuxml2argvdata/usb-none.xml | 4 ++--
tests/qemuxml2argvdata/usb-piix3-controller.args | 2 +-
tests/qemuxml2argvdata/usb-piix3-controller.xml | 4 ++--
tests/qemuxml2argvdata/usb-port-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb-port-autoassign.xml | 4 ++--
tests/qemuxml2argvdata/usb-port-missing.args | 2 +-
tests/qemuxml2argvdata/usb-port-missing.xml | 4 ++--
tests/qemuxml2argvdata/usb-ports-out-of-range.xml | 4 ++--
tests/qemuxml2argvdata/usb-ports.args | 2 +-
tests/qemuxml2argvdata/usb-ports.xml | 4 ++--
tests/qemuxml2argvdata/usb-redir-boot.args | 2 +-
tests/qemuxml2argvdata/usb-redir-boot.xml | 4 ++--
tests/qemuxml2argvdata/usb-redir-filter-version.args | 2 +-
tests/qemuxml2argvdata/usb-redir-filter-version.xml | 4 ++--
tests/qemuxml2argvdata/usb-redir-filter.args | 2 +-
tests/qemuxml2argvdata/usb-redir-filter.xml | 4 ++--
tests/qemuxml2argvdata/usb-redir.args | 2 +-
tests/qemuxml2argvdata/usb-redir.xml | 4 ++--
tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml | 4 ++--
tests/qemuxml2argvdata/usb-xhci-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb-xhci-autoassign.xml | 4 ++--
tests/qemuxml2argvdata/usb1-usb2.args | 2 +-
tests/qemuxml2argvdata/usb1-usb2.xml | 4 ++--
tests/qemuxml2argvdata/video-invalid-multiple-devices.xml | 4 ++--
tests/qemuxml2argvdata/video-multiple-primaries.xml | 4 ++--
tests/qemuxml2argvdata/video-none-device.args | 2 +-
tests/qemuxml2argvdata/video-none-device.xml | 4 ++--
tests/qemuxml2argvdata/video-qxl-device-vgamem.args | 2 +-
tests/qemuxml2argvdata/video-qxl-device-vgamem.xml | 4 ++--
tests/qemuxml2argvdata/video-qxl-device.args | 2 +-
tests/qemuxml2argvdata/video-qxl-device.xml | 4 ++--
tests/qemuxml2argvdata/video-qxl-heads.args | 2 +-
tests/qemuxml2argvdata/video-qxl-heads.xml | 4 ++--
tests/qemuxml2argvdata/video-qxl-noheads.args | 2 +-
tests/qemuxml2argvdata/video-qxl-noheads.xml | 4 ++--
tests/qemuxml2argvdata/video-qxl-resolution.args | 2 +-
tests/qemuxml2argvdata/video-qxl-resolution.xml | 4 ++--
tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args | 2 +-
tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml | 4 ++--
tests/qemuxml2argvdata/video-qxl-sec-device.args | 2 +-
tests/qemuxml2argvdata/video-qxl-sec-device.xml | 4 ++--
tests/qemuxml2argvdata/video-vga-device-vgamem.args | 2 +-
tests/qemuxml2argvdata/video-vga-device-vgamem.xml | 4 ++--
tests/qemuxml2argvdata/video-vga-device.args | 2 +-
tests/qemuxml2argvdata/video-vga-device.xml | 4 ++--
tests/qemuxml2argvdata/video-vga-qxl-heads.args | 2 +-
tests/qemuxml2argvdata/video-vga-qxl-heads.xml | 4 ++--
tests/qemuxml2argvdata/video-virtio-gpu-device.args | 2 +-
tests/qemuxml2argvdata/video-virtio-gpu-device.xml | 4 ++--
tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args | 2 +-
tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml | 4 ++--
tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args | 2 +-
tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml | 4 ++--
tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 2 +-
tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml | 4 ++--
tests/qemuxml2argvdata/video-virtio-vga.args | 2 +-
tests/qemuxml2argvdata/video-virtio-vga.xml | 4 ++--
tests/qemuxml2argvdata/virtio-input-passthrough.args | 2 +-
tests/qemuxml2argvdata/virtio-input-passthrough.xml | 4 ++--
tests/qemuxml2argvdata/virtio-input.args | 2 +-
tests/qemuxml2argvdata/virtio-input.xml | 4 ++--
tests/qemuxml2argvdata/virtio-rng-default.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-default.xml | 4 ++--
tests/qemuxml2argvdata/virtio-rng-egd-crash.xml | 4 ++--
tests/qemuxml2argvdata/virtio-rng-egd.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-egd.xml | 4 ++--
tests/qemuxml2argvdata/virtio-rng-multiple.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-multiple.xml | 4 ++--
tests/qemuxml2argvdata/virtio-rng-random.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-random.xml | 4 ++--
tests/qemuxml2argvdata/vmcoreinfo.args | 2 +-
tests/qemuxml2argvdata/vmcoreinfo.xml | 4 ++--
tests/qemuxml2xmloutdata/balloon-device-auto.xml | 4 ++--
tests/qemuxml2xmloutdata/balloon-device-period.xml | 4 ++--
tests/qemuxml2xmloutdata/blkiotune-device.xml | 4 ++--
tests/qemuxml2xmloutdata/blkiotune.xml | 4 ++--
tests/qemuxml2xmloutdata/channel-guestfwd.xml | 4 ++--
tests/qemuxml2xmloutdata/channel-virtio-auto.xml | 4 ++--
tests/qemuxml2xmloutdata/channel-virtio-state-active.xml | 4 ++--
tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml | 4 ++--
tests/qemuxml2xmloutdata/channel-virtio.xml | 4 ++--
tests/qemuxml2xmloutdata/clock-catchup.xml | 4 ++--
tests/qemuxml2xmloutdata/clock-localtime.xml | 4 ++--
tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml | 4 ++--
tests/qemuxml2xmloutdata/clock-utc.xml | 4 ++--
tests/qemuxml2xmloutdata/console-compat2.xml | 4 ++--
tests/qemuxml2xmloutdata/console-virtio-many.xml | 4 ++--
tests/qemuxml2xmloutdata/console-virtio.xml | 4 ++--
tests/qemuxml2xmloutdata/disk-active-commit-active.xml | 4 ++--
tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml | 4 ++--
tests/qemuxml2xmloutdata/disk-mirror-active.xml | 4 ++--
tests/qemuxml2xmloutdata/disk-mirror-inactive.xml | 4 ++--
tests/qemuxml2xmloutdata/disk-mirror-old-active.xml | 4 ++--
tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml | 4 ++--
tests/qemuxml2xmloutdata/graphics-listen-network.xml | 4 ++--
tests/qemuxml2xmloutdata/graphics-listen-network2.xml | 4 ++--
tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml | 4 ++--
tests/qemuxml2xmloutdata/graphics-sdl.xml | 4 ++--
tests/qemuxml2xmloutdata/hostdev-mdev-display.xml | 4 ++--
tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml | 4 ++--
tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml | 4 ++--
tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml | 4 ++--
tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml | 4 ++--
tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml | 4 ++--
tests/qemuxml2xmloutdata/hostdev-vfio.xml | 4 ++--
tests/qemuxml2xmloutdata/input-usbmouse.xml | 4 ++--
tests/qemuxml2xmloutdata/input-usbtablet.xml | 4 ++--
tests/qemuxml2xmloutdata/kvmclock.xml | 4 ++--
tests/qemuxml2xmloutdata/lease.xml | 4 ++--
tests/qemuxml2xmloutdata/machine-core-off.xml | 4 ++--
tests/qemuxml2xmloutdata/machine-core-on.xml | 4 ++--
tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml | 4 ++--
tests/qemuxml2xmloutdata/memory-hotplug.xml | 4 ++--
tests/qemuxml2xmloutdata/memorybacking-set.xml | 4 ++--
tests/qemuxml2xmloutdata/memorybacking-unset.xml | 4 ++--
tests/qemuxml2xmloutdata/memtune-unlimited.xml | 4 ++--
tests/qemuxml2xmloutdata/memtune.xml | 4 ++--
tests/qemuxml2xmloutdata/metadata-duplicate.xml | 4 ++--
tests/qemuxml2xmloutdata/metadata.xml | 4 ++--
tests/qemuxml2xmloutdata/migrate.xml | 4 ++--
tests/qemuxml2xmloutdata/minimal.xml | 4 ++--
tests/qemuxml2xmloutdata/misc-acpi.xml | 4 ++--
tests/qemuxml2xmloutdata/misc-disable-s3.xml | 4 ++--
tests/qemuxml2xmloutdata/misc-disable-suspends.xml | 4 ++--
tests/qemuxml2xmloutdata/misc-enable-s4.xml | 4 ++--
tests/qemuxml2xmloutdata/misc-uuid.xml | 4 ++--
tests/qemuxml2xmloutdata/net-eth-hostip.xml | 4 ++--
tests/qemuxml2xmloutdata/net-eth-ifname.xml | 4 ++--
tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml | 4 ++--
tests/qemuxml2xmloutdata/net-eth.xml | 4 ++--
tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml | 4 ++--
tests/qemuxml2xmloutdata/net-hostdev-vfio.xml | 4 ++--
tests/qemuxml2xmloutdata/net-hostdev.xml | 4 ++--
tests/qemuxml2xmloutdata/net-midonet.xml | 4 ++--
tests/qemuxml2xmloutdata/net-openvswitch.xml | 4 ++--
tests/qemuxml2xmloutdata/net-server.xml | 4 ++--
tests/qemuxml2xmloutdata/net-udp.xml | 4 ++--
tests/qemuxml2xmloutdata/net-virtio-device.xml | 4 ++--
tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml | 4 ++--
tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml | 4 ++--
tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml | 4 ++--
tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml | 4 ++--
tests/qemuxml2xmloutdata/net-virtio-teaming.xml | 4 ++--
tests/qemuxml2xmloutdata/net-virtio.xml | 4 ++--
tests/qemuxml2xmloutdata/nosharepages.xml | 4 ++--
tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml | 4 ++--
.../numad-auto-memory-vcpu-no-cpuset-and-placement.xml | 4 ++--
tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml | 4 ++--
tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml | 4 ++--
tests/qemuxml2xmloutdata/pci-rom.xml | 4 ++--
tests/qemuxml2xmloutdata/pmu-feature-off.xml | 4 ++--
tests/qemuxml2xmloutdata/pmu-feature.xml | 4 ++--
tests/qemuxml2xmloutdata/qemu-ns-no-env.xml | 4 ++--
tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml | 4 ++--
tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml | 4 ++--
tests/qemuxml2xmloutdata/restore-v2.xml | 4 ++--
tests/qemuxml2xmloutdata/seclabel-dac-none.xml | 4 ++--
tests/qemuxml2xmloutdata/seclabel-device-multiple.xml | 4 ++--
.../seclabel-dynamic-baselabel-inactive.xml | 4 ++--
.../seclabel-dynamic-labelskip-inactive.xml | 4 ++--
tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml | 4 ++--
.../qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml | 4 ++--
.../qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml | 4 ++--
tests/qemuxml2xmloutdata/seclabel-none.xml | 4 ++--
tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml | 4 ++--
.../qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml | 4 ++--
tests/qemuxml2xmloutdata/seclabel-static.xml | 4 ++--
tests/qemuxml2xmloutdata/serial-target-port-auto.xml | 4 ++--
tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml | 4 ++--
tests/qemuxml2xmloutdata/shmem.xml | 4 ++--
tests/qemuxml2xmloutdata/smartcard-controller.xml | 4 ++--
.../smartcard-host-certificates-database.xml | 4 ++--
tests/qemuxml2xmloutdata/smartcard-host-certificates.xml | 4 ++--
tests/qemuxml2xmloutdata/smartcard-host.xml | 4 ++--
tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml | 4 ++--
tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml | 4 ++--
tests/qemuxml2xmloutdata/smbios-multiple-type2.xml | 4 ++--
tests/qemuxml2xmloutdata/smbios.xml | 4 ++--
tests/qemuxml2xmloutdata/smp.xml | 4 ++--
tests/qemuxml2xmloutdata/usb-controller.xml | 4 ++--
tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml | 4 ++--
tests/qemuxml2xmloutdata/usb-none.xml | 4 ++--
tests/qemuxml2xmloutdata/usb-piix3-controller.xml | 4 ++--
tests/qemuxml2xmloutdata/usb-port-missing.xml | 4 ++--
tests/qemuxml2xmloutdata/usb-redir-filter-version.xml | 4 ++--
tests/qemuxml2xmloutdata/usb-redir-filter.xml | 4 ++--
tests/qemuxml2xmloutdata/usb-redir.xml | 4 ++--
tests/qemuxml2xmloutdata/video-none-device.xml | 4 ++--
tests/qemuxml2xmloutdata/video-qxl-heads.xml | 4 ++--
tests/qemuxml2xmloutdata/video-qxl-noheads.xml | 4 ++--
tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml | 4 ++--
tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml | 4 ++--
tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml | 4 ++--
tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml | 4 ++--
tests/qemuxml2xmloutdata/virtio-input-passthrough.xml | 4 ++--
tests/qemuxml2xmloutdata/virtio-input.xml | 4 ++--
tests/qemuxml2xmloutdata/virtio-rng-egd.xml | 4 ++--
tests/qemuxml2xmloutdata/virtio-rng-random.xml | 4 ++--
tests/qemuxml2xmloutdata/vmcoreinfo.xml | 4 ++--
553 files changed, 935 insertions(+), 935 deletions(-)
diff --git a/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml
b/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml
index b72a7b93e3..9fd38d4180 100644
--- a/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml
+++ b/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml
@@ -4,7 +4,7 @@
<memory unit='KiB'>219100</memory>
<currentMemory unit='KiB'>219100</currentMemory>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -12,7 +12,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/440fx-wrong-root.xml
b/tests/qemuxml2argvdata/440fx-wrong-root.xml
index 3bd79311f4..803f28d569 100644
--- a/tests/qemuxml2argvdata/440fx-wrong-root.xml
+++ b/tests/qemuxml2argvdata/440fx-wrong-root.xml
@@ -9,7 +9,7 @@
<memory unit='KiB'>219100</memory>
<currentMemory unit='KiB'>219100</currentMemory>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -17,7 +17,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pcie-root'/>
diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args
b/tests/qemuxml2argvdata/balloon-device-auto.args
index f16464092e..5078429e1b 100644
--- a/tests/qemuxml2argvdata/balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/balloon-device-auto.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/balloon-device-auto.xml
b/tests/qemuxml2argvdata/balloon-device-auto.xml
index ddfc605bd4..e11a8c3a74 100644
--- a/tests/qemuxml2argvdata/balloon-device-auto.xml
+++ b/tests/qemuxml2argvdata/balloon-device-auto.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
index cdd928cea8..c1acd2f6b6 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.xml
b/tests/qemuxml2argvdata/balloon-device-deflate-off.xml
index ecf73abe05..00f6558b97 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate-off.xml
+++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args
b/tests/qemuxml2argvdata/balloon-device-deflate.args
index 88ef85351f..a5017e6657 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.xml
b/tests/qemuxml2argvdata/balloon-device-deflate.xml
index dc443bcea9..8619611552 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate.xml
+++ b/tests/qemuxml2argvdata/balloon-device-deflate.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/balloon-device-period.args
b/tests/qemuxml2argvdata/balloon-device-period.args
index dc8e9c2fe2..517d83feab 100644
--- a/tests/qemuxml2argvdata/balloon-device-period.args
+++ b/tests/qemuxml2argvdata/balloon-device-period.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/balloon-device-period.xml
b/tests/qemuxml2argvdata/balloon-device-period.xml
index 8094e7a308..217ab99a7b 100644
--- a/tests/qemuxml2argvdata/balloon-device-period.xml
+++ b/tests/qemuxml2argvdata/balloon-device-period.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/balloon-device.args
b/tests/qemuxml2argvdata/balloon-device.args
index dc8e9c2fe2..517d83feab 100644
--- a/tests/qemuxml2argvdata/balloon-device.args
+++ b/tests/qemuxml2argvdata/balloon-device.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/balloon-device.xml
b/tests/qemuxml2argvdata/balloon-device.xml
index 3c1c04a455..766cfd355d 100644
--- a/tests/qemuxml2argvdata/balloon-device.xml
+++ b/tests/qemuxml2argvdata/balloon-device.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/blkiotune-device.args
b/tests/qemuxml2argvdata/blkiotune-device.args
index f16464092e..5078429e1b 100644
--- a/tests/qemuxml2argvdata/blkiotune-device.args
+++ b/tests/qemuxml2argvdata/blkiotune-device.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/blkiotune-device.xml
b/tests/qemuxml2argvdata/blkiotune-device.xml
index 9fdc25b767..e2efaff468 100644
--- a/tests/qemuxml2argvdata/blkiotune-device.xml
+++ b/tests/qemuxml2argvdata/blkiotune-device.xml
@@ -24,7 +24,7 @@
</blkiotune>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -32,7 +32,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/blkiotune.args
b/tests/qemuxml2argvdata/blkiotune.args
index f16464092e..5078429e1b 100644
--- a/tests/qemuxml2argvdata/blkiotune.args
+++ b/tests/qemuxml2argvdata/blkiotune.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/blkiotune.xml b/tests/qemuxml2argvdata/blkiotune.xml
index 9c224f1035..1a887c8bf5 100644
--- a/tests/qemuxml2argvdata/blkiotune.xml
+++ b/tests/qemuxml2argvdata/blkiotune.xml
@@ -8,7 +8,7 @@
</blkiotune>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args
b/tests/qemuxml2argvdata/channel-guestfwd.args
index 3c744dad44..bdd413d4bf 100644
--- a/tests/qemuxml2argvdata/channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/channel-guestfwd.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/channel-guestfwd.xml
b/tests/qemuxml2argvdata/channel-guestfwd.xml
index e463c2d970..62a3b8c36d 100644
--- a/tests/qemuxml2argvdata/channel-guestfwd.xml
+++ b/tests/qemuxml2argvdata/channel-guestfwd.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args
b/tests/qemuxml2argvdata/channel-spicevmc.args
index 7365d77b98..da36b815b0 100644
--- a/tests/qemuxml2argvdata/channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/channel-spicevmc.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/channel-spicevmc.xml
b/tests/qemuxml2argvdata/channel-spicevmc.xml
index de5029f306..d34f3fc86b 100644
--- a/tests/qemuxml2argvdata/channel-spicevmc.xml
+++ b/tests/qemuxml2argvdata/channel-spicevmc.xml
@@ -4,7 +4,7 @@
<memory unit='KiB'>219136</memory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -12,7 +12,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args
b/tests/qemuxml2argvdata/channel-virtio-auto.args
index 434a686216..5bd8e2193c 100644
--- a/tests/qemuxml2argvdata/channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.xml
b/tests/qemuxml2argvdata/channel-virtio-auto.xml
index 080a9faf95..6fd4ae63df 100644
--- a/tests/qemuxml2argvdata/channel-virtio-auto.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
index 6ff23fdcf7..df6657f587 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.xml
b/tests/qemuxml2argvdata/channel-virtio-autoadd.xml
index 2daec88dc9..644dcdd82a 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
index 89cc541683..b952025101 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.xml
b/tests/qemuxml2argvdata/channel-virtio-autoassign.xml
index 45402468c8..ed26da0188 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args
b/tests/qemuxml2argvdata/channel-virtio-default.args
index 3a1b3bb0f0..5ff502848d 100644
--- a/tests/qemuxml2argvdata/channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/channel-virtio-default.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/channel-virtio-default.xml
b/tests/qemuxml2argvdata/channel-virtio-default.xml
index 28d0b218f8..bc093113b0 100644
--- a/tests/qemuxml2argvdata/channel-virtio-default.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-default.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args
b/tests/qemuxml2argvdata/channel-virtio-state.args
index 23642de1cd..6d20f431cb 100644
--- a/tests/qemuxml2argvdata/channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/channel-virtio-state.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/channel-virtio-state.xml
b/tests/qemuxml2argvdata/channel-virtio-state.xml
index 006ba1d048..9b1a014691 100644
--- a/tests/qemuxml2argvdata/channel-virtio-state.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-state.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args
b/tests/qemuxml2argvdata/channel-virtio-unix.args
index 7627b530fa..6e42dc9f41 100644
--- a/tests/qemuxml2argvdata/channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.xml
b/tests/qemuxml2argvdata/channel-virtio-unix.xml
index 46a9286da2..505b8b158b 100644
--- a/tests/qemuxml2argvdata/channel-virtio-unix.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.xml
@@ -4,7 +4,7 @@
<memory unit='KiB'>219136</memory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -12,7 +12,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/channel-virtio.args
b/tests/qemuxml2argvdata/channel-virtio.args
index 7cf82b7941..423c27eb42 100644
--- a/tests/qemuxml2argvdata/channel-virtio.args
+++ b/tests/qemuxml2argvdata/channel-virtio.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/channel-virtio.xml
b/tests/qemuxml2argvdata/channel-virtio.xml
index 0bf7b04d50..a70e64017d 100644
--- a/tests/qemuxml2argvdata/channel-virtio.xml
+++ b/tests/qemuxml2argvdata/channel-virtio.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml
b/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml
index 2466c65523..c58b32f235 100644
--- a/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml
+++ b/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml
@@ -4,11 +4,11 @@
<memory unit='KiB'>219136</memory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='virtio-serial' index='1'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
</controller>
diff --git a/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml
b/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml
index d3308b4afe..55ad0cce76 100644
--- a/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml
+++ b/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml
@@ -4,11 +4,11 @@
<memory unit='KiB'>219136</memory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='virtio-serial' index='1'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
</controller>
diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args
b/tests/qemuxml2argvdata/chardev-reconnect.args
index 5c9be9b00e..aae62b8f75 100644
--- a/tests/qemuxml2argvdata/chardev-reconnect.args
+++ b/tests/qemuxml2argvdata/chardev-reconnect.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/chardev-reconnect.xml
b/tests/qemuxml2argvdata/chardev-reconnect.xml
index 2065fe1a03..7941c7b549 100644
--- a/tests/qemuxml2argvdata/chardev-reconnect.xml
+++ b/tests/qemuxml2argvdata/chardev-reconnect.xml
@@ -4,11 +4,11 @@
<memory unit='KiB'>219136</memory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='virtio-serial' index='1'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
</controller>
diff --git a/tests/qemuxml2argvdata/clock-catchup.args
b/tests/qemuxml2argvdata/clock-catchup.args
index 1c917fc91d..d7ec73ace2 100644
--- a/tests/qemuxml2argvdata/clock-catchup.args
+++ b/tests/qemuxml2argvdata/clock-catchup.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/clock-catchup.xml
b/tests/qemuxml2argvdata/clock-catchup.xml
index 8c22afe1c8..0d02cf47f5 100644
--- a/tests/qemuxml2argvdata/clock-catchup.xml
+++ b/tests/qemuxml2argvdata/clock-catchup.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'>
@@ -23,7 +23,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/clock-france.args
b/tests/qemuxml2argvdata/clock-france.args
index 50cee14245..a5664b547d 100644
--- a/tests/qemuxml2argvdata/clock-france.args
+++ b/tests/qemuxml2argvdata/clock-france.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
TZ=Europe/Paris \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/clock-france.xml
b/tests/qemuxml2argvdata/clock-france.xml
index be9231e92f..2775b79a91 100644
--- a/tests/qemuxml2argvdata/clock-france.xml
+++ b/tests/qemuxml2argvdata/clock-france.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='timezone' timezone='Europe/Paris'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args
b/tests/qemuxml2argvdata/clock-hpet-off.args
index ba9047a585..b5cb297e92 100644
--- a/tests/qemuxml2argvdata/clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/clock-hpet-off.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/clock-hpet-off.xml
b/tests/qemuxml2argvdata/clock-hpet-off.xml
index 4b573464f7..11bb4abd55 100644
--- a/tests/qemuxml2argvdata/clock-hpet-off.xml
+++ b/tests/qemuxml2argvdata/clock-hpet-off.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'>
@@ -17,7 +17,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
index 1c8c07c6a3..8fd8f42083 100644
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml
b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml
index 9924f865c3..c81f006579 100644
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='variable' adjustment='3600'
basis='localtime'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/clock-localtime.args
b/tests/qemuxml2argvdata/clock-localtime.args
index 58378cc2b8..daf503d3fd 100644
--- a/tests/qemuxml2argvdata/clock-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/clock-localtime.xml
b/tests/qemuxml2argvdata/clock-localtime.xml
index d5f848b9e7..2f68f6dd79 100644
--- a/tests/qemuxml2argvdata/clock-localtime.xml
+++ b/tests/qemuxml2argvdata/clock-localtime.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='localtime'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/clock-realtime.args
b/tests/qemuxml2argvdata/clock-realtime.args
index 45690e5351..6e1339e4d1 100644
--- a/tests/qemuxml2argvdata/clock-realtime.args
+++ b/tests/qemuxml2argvdata/clock-realtime.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/clock-realtime.xml
b/tests/qemuxml2argvdata/clock-realtime.xml
index 2fc6f3df9e..5539095638 100644
--- a/tests/qemuxml2argvdata/clock-realtime.xml
+++ b/tests/qemuxml2argvdata/clock-realtime.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'>
@@ -15,7 +15,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
index 0399fdc4a1..5a952a2cf6 100644
--- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
@@ -6,13 +6,13 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
--cpu qemu32,hv-time=on \
+-cpu qemu64,hv-time=on \
-m size=219136k \
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml
b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml
index 14400f5d7b..638b717519 100644
--- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml
+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>6</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
<features>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/clock-utc.args
b/tests/qemuxml2argvdata/clock-utc.args
index c4d5239df5..2ebb6cb762 100644
--- a/tests/qemuxml2argvdata/clock-utc.args
+++ b/tests/qemuxml2argvdata/clock-utc.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/clock-utc.xml b/tests/qemuxml2argvdata/clock-utc.xml
index 7e26f2ed52..6cfcb6b194 100644
--- a/tests/qemuxml2argvdata/clock-utc.xml
+++ b/tests/qemuxml2argvdata/clock-utc.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/clock-variable.args
b/tests/qemuxml2argvdata/clock-variable.args
index aa815b052b..ed42be8dd0 100644
--- a/tests/qemuxml2argvdata/clock-variable.args
+++ b/tests/qemuxml2argvdata/clock-variable.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/clock-variable.xml
b/tests/qemuxml2argvdata/clock-variable.xml
index 1cb936a712..b9f56d3f9b 100644
--- a/tests/qemuxml2argvdata/clock-variable.xml
+++ b/tests/qemuxml2argvdata/clock-variable.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='variable' adjustment='123456'
basis='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/console-compat2.xml
b/tests/qemuxml2argvdata/console-compat2.xml
index 16160dcc3b..900e345b1d 100644
--- a/tests/qemuxml2argvdata/console-compat2.xml
+++ b/tests/qemuxml2argvdata/console-compat2.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/console-virtio-many.args
b/tests/qemuxml2argvdata/console-virtio-many.args
index 1f2ac43cde..bb67eec187 100644
--- a/tests/qemuxml2argvdata/console-virtio-many.args
+++ b/tests/qemuxml2argvdata/console-virtio-many.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/console-virtio-many.xml
b/tests/qemuxml2argvdata/console-virtio-many.xml
index a455a39751..042c5383e1 100644
--- a/tests/qemuxml2argvdata/console-virtio-many.xml
+++ b/tests/qemuxml2argvdata/console-virtio-many.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/console-virtio.args
b/tests/qemuxml2argvdata/console-virtio.args
index 90abc51ad1..2baa069c04 100644
--- a/tests/qemuxml2argvdata/console-virtio.args
+++ b/tests/qemuxml2argvdata/console-virtio.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/console-virtio.xml
b/tests/qemuxml2argvdata/console-virtio.xml
index 77fd040b39..315f11f591 100644
--- a/tests/qemuxml2argvdata/console-virtio.xml
+++ b/tests/qemuxml2argvdata/console-virtio.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml
b/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml
index dd9a664939..60430c6d1d 100644
--- a/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml
+++ b/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml
@@ -17,7 +17,7 @@
<iothreadsched iothreads='2' scheduler='fifo'
priority='1'/>
</cputune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -25,7 +25,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml
b/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml
index 4e07f17ad8..8af1223bf6 100644
--- a/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml
+++ b/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml
@@ -16,7 +16,7 @@
<vcpusched vcpus='1-2' scheduler='fifo' priority='1'/>
</cputune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -24,7 +24,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/disk-active-commit.xml
b/tests/qemuxml2argvdata/disk-active-commit.xml
index 28e59dcd85..469a097c3a 100644
--- a/tests/qemuxml2argvdata/disk-active-commit.xml
+++ b/tests/qemuxml2argvdata/disk-active-commit.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/>
<source file='/tmp/HostVG/QEMUGuest1-snap'/>
diff --git a/tests/qemuxml2argvdata/disk-mirror-old.xml
b/tests/qemuxml2argvdata/disk-mirror-old.xml
index 8aca54f05b..1bdd5fcadb 100644
--- a/tests/qemuxml2argvdata/disk-mirror-old.xml
+++ b/tests/qemuxml2argvdata/disk-mirror-old.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<backingStore/>
diff --git a/tests/qemuxml2argvdata/disk-mirror.xml
b/tests/qemuxml2argvdata/disk-mirror.xml
index 73886e99f4..2ea4c68d90 100644
--- a/tests/qemuxml2argvdata/disk-mirror.xml
+++ b/tests/qemuxml2argvdata/disk-mirror.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<backingStore/>
diff --git a/tests/qemuxml2argvdata/graphics-dbus-address.args
b/tests/qemuxml2argvdata/graphics-dbus-address.args
index e9fd771527..0dfdb37d0a 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-address.args
+++ b/tests/qemuxml2argvdata/graphics-dbus-address.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/graphics-dbus-address.xml
b/tests/qemuxml2argvdata/graphics-dbus-address.xml
index 1e8526b274..18e8e71701 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-address.xml
+++ b/tests/qemuxml2argvdata/graphics-dbus-address.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2argvdata/graphics-dbus-audio.args
b/tests/qemuxml2argvdata/graphics-dbus-audio.args
index 9e07c26134..8cb0e6718c 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-audio.args
+++ b/tests/qemuxml2argvdata/graphics-dbus-audio.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/graphics-dbus-audio.xml
b/tests/qemuxml2argvdata/graphics-dbus-audio.xml
index b1304e3f6f..b257370187 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-audio.xml
+++ b/tests/qemuxml2argvdata/graphics-dbus-audio.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/graphics-dbus-chardev.args
b/tests/qemuxml2argvdata/graphics-dbus-chardev.args
index dac48ae5cd..d8ddc54b99 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-chardev.args
+++ b/tests/qemuxml2argvdata/graphics-dbus-chardev.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/graphics-dbus-chardev.xml
b/tests/qemuxml2argvdata/graphics-dbus-chardev.xml
index d2ca208bd9..76f4b406db 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-chardev.xml
+++ b/tests/qemuxml2argvdata/graphics-dbus-chardev.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2argvdata/graphics-dbus-p2p.args
b/tests/qemuxml2argvdata/graphics-dbus-p2p.args
index 3a41f089d5..d2b335aa28 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-p2p.args
+++ b/tests/qemuxml2argvdata/graphics-dbus-p2p.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/graphics-dbus-p2p.xml
b/tests/qemuxml2argvdata/graphics-dbus-p2p.xml
index a99e695471..8d54d042b0 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-p2p.xml
+++ b/tests/qemuxml2argvdata/graphics-dbus-p2p.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2argvdata/graphics-dbus-usbredir.args
b/tests/qemuxml2argvdata/graphics-dbus-usbredir.args
index 9a480b978f..a42aca5305 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-usbredir.args
+++ b/tests/qemuxml2argvdata/graphics-dbus-usbredir.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/graphics-dbus-usbredir.xml
b/tests/qemuxml2argvdata/graphics-dbus-usbredir.xml
index fad6cd8b5f..769b4db57d 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-usbredir.xml
+++ b/tests/qemuxml2argvdata/graphics-dbus-usbredir.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/graphics-dbus.args
b/tests/qemuxml2argvdata/graphics-dbus.args
index a6cae8b8d8..56d926a0eb 100644
--- a/tests/qemuxml2argvdata/graphics-dbus.args
+++ b/tests/qemuxml2argvdata/graphics-dbus.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/graphics-dbus.xml
b/tests/qemuxml2argvdata/graphics-dbus.xml
index be8442b3cd..8dec42cde7 100644
--- a/tests/qemuxml2argvdata/graphics-dbus.xml
+++ b/tests/qemuxml2argvdata/graphics-dbus.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2argvdata/graphics-listen-network.xml
b/tests/qemuxml2argvdata/graphics-listen-network.xml
index f96fb01200..f1ab81ca0b 100644
--- a/tests/qemuxml2argvdata/graphics-listen-network.xml
+++ b/tests/qemuxml2argvdata/graphics-listen-network.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/graphics-listen-network2.xml
b/tests/qemuxml2argvdata/graphics-listen-network2.xml
index ede047ac38..c65314c658 100644
--- a/tests/qemuxml2argvdata/graphics-listen-network2.xml
+++ b/tests/qemuxml2argvdata/graphics-listen-network2.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
index a4718718d0..96ab12917e 100644
--- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
+++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
XAUTHORITY=/root/.Xauthority \
DISPLAY=:0.1 \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml
b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml
index 4c006e171b..f26f5d3ac7 100644
--- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml
+++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/graphics-sdl.args
b/tests/qemuxml2argvdata/graphics-sdl.args
index 9cdaf2a652..c7d20d3e1f 100644
--- a/tests/qemuxml2argvdata/graphics-sdl.args
+++ b/tests/qemuxml2argvdata/graphics-sdl.args
@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
XAUTHORITY=/root/.Xauthority \
DISPLAY=:0.1 \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/graphics-sdl.xml
b/tests/qemuxml2argvdata/graphics-sdl.xml
index 79947b715c..c7ea1bcb74 100644
--- a/tests/qemuxml2argvdata/graphics-sdl.xml
+++ b/tests/qemuxml2argvdata/graphics-sdl.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml
b/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml
index 0a78309c99..527b1c45de 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display.xml
b/tests/qemuxml2argvdata/hostdev-mdev-display.xml
index e24ca7dc90..14839bf412 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-display.xml
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml
b/tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml
index 1c5e326381..604e6df9b7 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml
+++ b/tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml
b/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml
index 2c899738e2..8fea6aa8f5 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml
+++ b/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
index c0133bff9d..2e49cff0e2 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
-/usr/bin/qemu-system-i386 \
+/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
\
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml
b/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml
index 4b198c29a6..d37b770797 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml
+++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml
b/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml
index 81740baa00..031ea31a02 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml
+++ b/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/hostdev-pci-duplicate.xml
b/tests/qemuxml2argvdata/hostdev-pci-duplicate.xml
index c744fddf9f..94de97603b 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-duplicate.xml
+++ b/tests/qemuxml2argvdata/hostdev-pci-duplicate.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml
b/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml
index 22eb515cbb..aa06b8d5fd 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml
b/tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml
index ea367de386..6d9b451e37 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml
b/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml
index 046563211e..13469ca320 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml
b/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml
index 991f75fb26..45ef214251 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
index ebf1484ee0..5f8197e7ed 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
-/usr/bin/qemu-system-i386 \
+/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
\
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml
index 6e2f3da5c1..e1eec4ef25 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/hostdev-usb-duplicate.xml
b/tests/qemuxml2argvdata/hostdev-usb-duplicate.xml
index 533a905902..34c2dc81c5 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-duplicate.xml
+++ b/tests/qemuxml2argvdata/hostdev-usb-duplicate.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
index abcc42989e..ac9db13ab5 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
-/usr/bin/qemu-system-i386 \
+/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
\
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml
b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml
index e894e1577f..b720883913 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml
index 521ebcf802..a9a5afd6dd 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args
b/tests/qemuxml2argvdata/hostdev-vfio.args
index 7741f637c6..9872d77f17 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
-/usr/bin/qemu-system-i386 \
+/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
\
diff --git a/tests/qemuxml2argvdata/hostdev-vfio.xml
b/tests/qemuxml2argvdata/hostdev-vfio.xml
index e32ee972ba..1b438a2eef 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio.xml
+++ b/tests/qemuxml2argvdata/hostdev-vfio.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml
b/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml
index 49cd2c827a..e5a8046ead 100644
--- a/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml
+++ b/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml
@@ -11,7 +11,7 @@
</memoryBacking>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -19,7 +19,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml
b/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml
index ddd4a6df92..2136528267 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml
+++ b/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml
@@ -15,7 +15,7 @@
<memnode cellid='3' mode='strict' nodeset='3'/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -31,7 +31,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args
b/tests/qemuxml2argvdata/input-usbmouse-addr.args
index 605d88223c..06d31b4605 100644
--- a/tests/qemuxml2argvdata/input-usbmouse-addr.args
+++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.xml
b/tests/qemuxml2argvdata/input-usbmouse-addr.xml
index 2e6cca6c51..31c943bd63 100644
--- a/tests/qemuxml2argvdata/input-usbmouse-addr.xml
+++ b/tests/qemuxml2argvdata/input-usbmouse-addr.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/input-usbmouse.args
b/tests/qemuxml2argvdata/input-usbmouse.args
index 5e780f30d5..3b85615ce2 100644
--- a/tests/qemuxml2argvdata/input-usbmouse.args
+++ b/tests/qemuxml2argvdata/input-usbmouse.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/input-usbmouse.xml
b/tests/qemuxml2argvdata/input-usbmouse.xml
index 533029f352..108ab0af24 100644
--- a/tests/qemuxml2argvdata/input-usbmouse.xml
+++ b/tests/qemuxml2argvdata/input-usbmouse.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/input-usbtablet.args
b/tests/qemuxml2argvdata/input-usbtablet.args
index 1db1c47965..95ceafb413 100644
--- a/tests/qemuxml2argvdata/input-usbtablet.args
+++ b/tests/qemuxml2argvdata/input-usbtablet.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/input-usbtablet.xml
b/tests/qemuxml2argvdata/input-usbtablet.xml
index 59ac2d35fb..5edfff1611 100644
--- a/tests/qemuxml2argvdata/input-usbtablet.xml
+++ b/tests/qemuxml2argvdata/input-usbtablet.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/kvm-features-off.args
b/tests/qemuxml2argvdata/kvm-features-off.args
index 49d5e81ebe..61f5221adc 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.args
+++ b/tests/qemuxml2argvdata/kvm-features-off.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/kvm-features-off.xml
b/tests/qemuxml2argvdata/kvm-features-off.xml
index 7ee6525cd9..f22e75e8aa 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.xml
+++ b/tests/qemuxml2argvdata/kvm-features-off.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>6</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
<features>
@@ -24,7 +24,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2argvdata/kvm-features.args
b/tests/qemuxml2argvdata/kvm-features.args
index 9c8236c210..72ac9bc0ed 100644
--- a/tests/qemuxml2argvdata/kvm-features.args
+++ b/tests/qemuxml2argvdata/kvm-features.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/kvm-features.xml
b/tests/qemuxml2argvdata/kvm-features.xml
index 8ce3a2b987..cd0f170ed3 100644
--- a/tests/qemuxml2argvdata/kvm-features.xml
+++ b/tests/qemuxml2argvdata/kvm-features.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>6</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
<features>
@@ -24,7 +24,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args
b/tests/qemuxml2argvdata/kvm-pit-delay.args
index a2fa824303..f8234ba1cb 100644
--- a/tests/qemuxml2argvdata/kvm-pit-delay.args
+++ b/tests/qemuxml2argvdata/kvm-pit-delay.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.xml
b/tests/qemuxml2argvdata/kvm-pit-delay.xml
index 3b5b6d05dd..c81a6ada73 100644
--- a/tests/qemuxml2argvdata/kvm-pit-delay.xml
+++ b/tests/qemuxml2argvdata/kvm-pit-delay.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'>
@@ -15,7 +15,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args
b/tests/qemuxml2argvdata/kvm-pit-discard.args
index c50b3351f9..b75f0945cc 100644
--- a/tests/qemuxml2argvdata/kvm-pit-discard.args
+++ b/tests/qemuxml2argvdata/kvm-pit-discard.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.xml
b/tests/qemuxml2argvdata/kvm-pit-discard.xml
index 0af4b57106..b3832bc77f 100644
--- a/tests/qemuxml2argvdata/kvm-pit-discard.xml
+++ b/tests/qemuxml2argvdata/kvm-pit-discard.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'>
@@ -15,7 +15,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args
index 6d7527252c..bd71be3ec0 100644
--- a/tests/qemuxml2argvdata/kvmclock.args
+++ b/tests/qemuxml2argvdata/kvmclock.args
@@ -6,13 +6,13 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
--cpu qemu32,kvmclock=off \
+-cpu qemu64,kvmclock=off \
-m size=219136k \
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/kvmclock.xml b/tests/qemuxml2argvdata/kvmclock.xml
index 5d155e067f..7af64b4101 100644
--- a/tests/qemuxml2argvdata/kvmclock.xml
+++ b/tests/qemuxml2argvdata/kvmclock.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>6</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
<features>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/lease.xml b/tests/qemuxml2argvdata/lease.xml
index d52b66b2f2..a4f1d9728d 100644
--- a/tests/qemuxml2argvdata/lease.xml
+++ b/tests/qemuxml2argvdata/lease.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219200</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/machine-core-off.args
b/tests/qemuxml2argvdata/machine-core-off.args
index c4d5239df5..2ebb6cb762 100644
--- a/tests/qemuxml2argvdata/machine-core-off.args
+++ b/tests/qemuxml2argvdata/machine-core-off.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/machine-core-off.xml
b/tests/qemuxml2argvdata/machine-core-off.xml
index 36482550b6..dfffe8551f 100644
--- a/tests/qemuxml2argvdata/machine-core-off.xml
+++ b/tests/qemuxml2argvdata/machine-core-off.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/machine-core-on.args
b/tests/qemuxml2argvdata/machine-core-on.args
index 218aee51dc..78dea552bf 100644
--- a/tests/qemuxml2argvdata/machine-core-on.args
+++ b/tests/qemuxml2argvdata/machine-core-on.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/machine-core-on.xml
b/tests/qemuxml2argvdata/machine-core-on.xml
index 89396bb186..cd0754cc58 100644
--- a/tests/qemuxml2argvdata/machine-core-on.xml
+++ b/tests/qemuxml2argvdata/machine-core-on.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args
b/tests/qemuxml2argvdata/machine-vmport-opt.args
index d9361967ba..88eb59d12e 100644
--- a/tests/qemuxml2argvdata/machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.xml
b/tests/qemuxml2argvdata/machine-vmport-opt.xml
index 656e1d395f..13ec104477 100644
--- a/tests/qemuxml2argvdata/machine-vmport-opt.xml
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<features>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/memory-align-fail.xml
b/tests/qemuxml2argvdata/memory-align-fail.xml
index 636f0e3d8e..bde9db9190 100644
--- a/tests/qemuxml2argvdata/memory-align-fail.xml
+++ b/tests/qemuxml2argvdata/memory-align-fail.xml
@@ -6,7 +6,7 @@
<currentMemory unit='KiB'>9007199254740991</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -20,7 +20,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='ide' index='0'/>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
index 5085035875..4e45bb059a 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.xml
b/tests/qemuxml2argvdata/memory-hotplug-dimm.xml
index 585e0a5f51..5b2f8cc0e4 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.xml
@@ -6,7 +6,7 @@
<currentMemory unit='KiB'>1267710</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<idmap>
@@ -24,7 +24,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nonuma.xml
b/tests/qemuxml2argvdata/memory-hotplug-nonuma.xml
index a441eb7b77..15c9937cfe 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nonuma.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nonuma.xml
@@ -6,7 +6,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -14,7 +14,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/memory-hotplug.args
b/tests/qemuxml2argvdata/memory-hotplug.args
index a02da4662f..3bd7aaf9e5 100644
--- a/tests/qemuxml2argvdata/memory-hotplug.args
+++ b/tests/qemuxml2argvdata/memory-hotplug.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/memory-hotplug.xml
b/tests/qemuxml2argvdata/memory-hotplug.xml
index 8d09856e95..b090febc4f 100644
--- a/tests/qemuxml2argvdata/memory-hotplug.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug.xml
@@ -6,7 +6,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -20,7 +20,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/memorybacking-set.xml
b/tests/qemuxml2argvdata/memorybacking-set.xml
index 9bd4e72485..ec0b1f6ef5 100644
--- a/tests/qemuxml2argvdata/memorybacking-set.xml
+++ b/tests/qemuxml2argvdata/memorybacking-set.xml
@@ -10,7 +10,7 @@
</memoryBacking>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<memballoon model='virtio'/>
</devices>
</domain>
diff --git a/tests/qemuxml2argvdata/memorybacking-unset.xml
b/tests/qemuxml2argvdata/memorybacking-unset.xml
index c64c7397d0..816d11c10c 100644
--- a/tests/qemuxml2argvdata/memorybacking-unset.xml
+++ b/tests/qemuxml2argvdata/memorybacking-unset.xml
@@ -10,7 +10,7 @@
</memoryBacking>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<memballoon model='virtio'/>
</devices>
</domain>
diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args
b/tests/qemuxml2argvdata/memtune-unlimited.args
index f16464092e..5078429e1b 100644
--- a/tests/qemuxml2argvdata/memtune-unlimited.args
+++ b/tests/qemuxml2argvdata/memtune-unlimited.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/memtune-unlimited.xml
b/tests/qemuxml2argvdata/memtune-unlimited.xml
index db67e409f0..3a85fc0c60 100644
--- a/tests/qemuxml2argvdata/memtune-unlimited.xml
+++ b/tests/qemuxml2argvdata/memtune-unlimited.xml
@@ -8,7 +8,7 @@
</memtune>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args
index f16464092e..5078429e1b 100644
--- a/tests/qemuxml2argvdata/memtune.args
+++ b/tests/qemuxml2argvdata/memtune.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/memtune.xml b/tests/qemuxml2argvdata/memtune.xml
index 94a86a8070..46fef02de6 100644
--- a/tests/qemuxml2argvdata/memtune.xml
+++ b/tests/qemuxml2argvdata/memtune.xml
@@ -10,7 +10,7 @@
</memtune>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/metadata-duplicate.xml
b/tests/qemuxml2argvdata/metadata-duplicate.xml
index fdf2110bc3..6971c40e74 100644
--- a/tests/qemuxml2argvdata/metadata-duplicate.xml
+++ b/tests/qemuxml2argvdata/metadata-duplicate.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/metadata.xml b/tests/qemuxml2argvdata/metadata.xml
index 18ab46899e..5fc10c1c85 100644
--- a/tests/qemuxml2argvdata/metadata.xml
+++ b/tests/qemuxml2argvdata/metadata.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/migrate.args
index 0aa2f2a780..e46b190249 100644
--- a/tests/qemuxml2argvdata/migrate.args
+++ b/tests/qemuxml2argvdata/migrate.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/migrate.xml b/tests/qemuxml2argvdata/migrate.xml
index 7b4ea974eb..d14d45524e 100644
--- a/tests/qemuxml2argvdata/migrate.xml
+++ b/tests/qemuxml2argvdata/migrate.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/minimal-no-memory.xml
b/tests/qemuxml2argvdata/minimal-no-memory.xml
index 8c6b5a71be..dfa2b6dd89 100644
--- a/tests/qemuxml2argvdata/minimal-no-memory.xml
+++ b/tests/qemuxml2argvdata/minimal-no-memory.xml
@@ -3,7 +3,7 @@
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -11,7 +11,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args
index f16464092e..5078429e1b 100644
--- a/tests/qemuxml2argvdata/minimal.args
+++ b/tests/qemuxml2argvdata/minimal.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/minimal.xml b/tests/qemuxml2argvdata/minimal.xml
index 8701906357..8854059ab1 100644
--- a/tests/qemuxml2argvdata/minimal.xml
+++ b/tests/qemuxml2argvdata/minimal.xml
@@ -10,7 +10,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/misc-acpi.args
b/tests/qemuxml2argvdata/misc-acpi.args
index 01b0c81f6f..12f2d4e6ae 100644
--- a/tests/qemuxml2argvdata/misc-acpi.args
+++ b/tests/qemuxml2argvdata/misc-acpi.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/misc-acpi.xml b/tests/qemuxml2argvdata/misc-acpi.xml
index 718847daee..59fbe471ff 100644
--- a/tests/qemuxml2argvdata/misc-acpi.xml
+++ b/tests/qemuxml2argvdata/misc-acpi.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<features>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args
b/tests/qemuxml2argvdata/misc-disable-s3.args
index fcc5cd7795..d64b9f56ae 100644
--- a/tests/qemuxml2argvdata/misc-disable-s3.args
+++ b/tests/qemuxml2argvdata/misc-disable-s3.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/misc-disable-s3.xml
b/tests/qemuxml2argvdata/misc-disable-s3.xml
index d65b72dbd4..13eb6e754a 100644
--- a/tests/qemuxml2argvdata/misc-disable-s3.xml
+++ b/tests/qemuxml2argvdata/misc-disable-s3.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -16,7 +16,7 @@
<suspend-to-mem enabled='no'/>
</pm>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args
b/tests/qemuxml2argvdata/misc-disable-suspends.args
index d1c3183dac..554620fe24 100644
--- a/tests/qemuxml2argvdata/misc-disable-suspends.args
+++ b/tests/qemuxml2argvdata/misc-disable-suspends.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.xml
b/tests/qemuxml2argvdata/misc-disable-suspends.xml
index 3c51e3fb6e..4f259641be 100644
--- a/tests/qemuxml2argvdata/misc-disable-suspends.xml
+++ b/tests/qemuxml2argvdata/misc-disable-suspends.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -17,7 +17,7 @@
<suspend-to-disk enabled='no'/>
</pm>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args
b/tests/qemuxml2argvdata/misc-enable-s4.args
index 0af59b3260..0734635405 100644
--- a/tests/qemuxml2argvdata/misc-enable-s4.args
+++ b/tests/qemuxml2argvdata/misc-enable-s4.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/misc-enable-s4.xml
b/tests/qemuxml2argvdata/misc-enable-s4.xml
index 62f32c2b02..0692a7a6b9 100644
--- a/tests/qemuxml2argvdata/misc-enable-s4.xml
+++ b/tests/qemuxml2argvdata/misc-enable-s4.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -16,7 +16,7 @@
<suspend-to-disk enabled='yes'/>
</pm>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/misc-uuid.args
b/tests/qemuxml2argvdata/misc-uuid.args
index 01b0c81f6f..12f2d4e6ae 100644
--- a/tests/qemuxml2argvdata/misc-uuid.args
+++ b/tests/qemuxml2argvdata/misc-uuid.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/misc-uuid.xml b/tests/qemuxml2argvdata/misc-uuid.xml
index 718847daee..59fbe471ff 100644
--- a/tests/qemuxml2argvdata/misc-uuid.xml
+++ b/tests/qemuxml2argvdata/misc-uuid.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<features>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/monitor-json.args
b/tests/qemuxml2argvdata/monitor-json.args
index 3fe4db5a94..817806f5a4 100644
--- a/tests/qemuxml2argvdata/monitor-json.args
+++ b/tests/qemuxml2argvdata/monitor-json.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=encryptdisk,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/monitor-json.xml
b/tests/qemuxml2argvdata/monitor-json.xml
index d3a630ab3e..d151884434 100644
--- a/tests/qemuxml2argvdata/monitor-json.xml
+++ b/tests/qemuxml2argvdata/monitor-json.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/>
<source file='/dev/hda1'/>
diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args
b/tests/qemuxml2argvdata/multifunction-pci-device.args
index 36c0353f19..40a25fbe7b 100644
--- a/tests/qemuxml2argvdata/multifunction-pci-device.args
+++ b/tests/qemuxml2argvdata/multifunction-pci-device.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.xml
b/tests/qemuxml2argvdata/multifunction-pci-device.xml
index 806cfa44ae..a2e497939f 100644
--- a/tests/qemuxml2argvdata/multifunction-pci-device.xml
+++ b/tests/qemuxml2argvdata/multifunction-pci-device.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<source file='/tmp/scsidisk.img'/>
<target dev='sda' bus='scsi'/>
diff --git a/tests/qemuxml2argvdata/net-client.args
b/tests/qemuxml2argvdata/net-client.args
index ebefd3341a..3336e3fb53 100644
--- a/tests/qemuxml2argvdata/net-client.args
+++ b/tests/qemuxml2argvdata/net-client.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-client.xml
b/tests/qemuxml2argvdata/net-client.xml
index d6a634338c..7c7805916e 100644
--- a/tests/qemuxml2argvdata/net-client.xml
+++ b/tests/qemuxml2argvdata/net-client.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args
b/tests/qemuxml2argvdata/net-eth-hostip.args
index 05aab251e6..79dd75a39d 100644
--- a/tests/qemuxml2argvdata/net-eth-hostip.args
+++ b/tests/qemuxml2argvdata/net-eth-hostip.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-eth-hostip.xml
b/tests/qemuxml2argvdata/net-eth-hostip.xml
index 2430941df8..16cfdabdb3 100644
--- a/tests/qemuxml2argvdata/net-eth-hostip.xml
+++ b/tests/qemuxml2argvdata/net-eth-hostip.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args
b/tests/qemuxml2argvdata/net-eth-ifname.args
index 05aab251e6..79dd75a39d 100644
--- a/tests/qemuxml2argvdata/net-eth-ifname.args
+++ b/tests/qemuxml2argvdata/net-eth-ifname.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-eth-ifname.xml
b/tests/qemuxml2argvdata/net-eth-ifname.xml
index 86a41c17d9..a27c82e45f 100644
--- a/tests/qemuxml2argvdata/net-eth-ifname.xml
+++ b/tests/qemuxml2argvdata/net-eth-ifname.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/net-eth-names.args
b/tests/qemuxml2argvdata/net-eth-names.args
index 1a4a32cc7c..24c86a1308 100644
--- a/tests/qemuxml2argvdata/net-eth-names.args
+++ b/tests/qemuxml2argvdata/net-eth-names.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-eth-names.xml
b/tests/qemuxml2argvdata/net-eth-names.xml
index 344cf9252d..dfd98bcf1e 100644
--- a/tests/qemuxml2argvdata/net-eth-names.xml
+++ b/tests/qemuxml2argvdata/net-eth-names.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
index 6668a279db..5fc34bcd4d 100644
--- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
+++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml
b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml
index 217b57ea0b..c86c13ad3e 100644
--- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml
+++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args
index 05aab251e6..79dd75a39d 100644
--- a/tests/qemuxml2argvdata/net-eth.args
+++ b/tests/qemuxml2argvdata/net-eth.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-eth.xml b/tests/qemuxml2argvdata/net-eth.xml
index 5fa415bb63..943325044e 100644
--- a/tests/qemuxml2argvdata/net-eth.xml
+++ b/tests/qemuxml2argvdata/net-eth.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
index 9714cb899b..2e23f63a86 100644
--- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.xml
b/tests/qemuxml2argvdata/net-hostdev-bootorder.xml
index acf05ba164..cabfdbec9c 100644
--- a/tests/qemuxml2argvdata/net-hostdev-bootorder.xml
+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.xml
@@ -5,14 +5,14 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-hostdev-fail.xml
b/tests/qemuxml2argvdata/net-hostdev-fail.xml
index a2c9ee21e0..705faed508 100644
--- a/tests/qemuxml2argvdata/net-hostdev-fail.xml
+++ b/tests/qemuxml2argvdata/net-hostdev-fail.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
index 60e19a2f0b..a08927b219 100644
--- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.xml
b/tests/qemuxml2argvdata/net-hostdev-multidomain.xml
index 8bb3022ce0..0989c79290 100644
--- a/tests/qemuxml2argvdata/net-hostdev-multidomain.xml
+++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
index de1a9dba44..c816221514 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml
b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml
index c247a15444..ae8c4e7e80 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args
b/tests/qemuxml2argvdata/net-hostdev-vfio.args
index 6aad28d828..b0e3b64504 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.xml
b/tests/qemuxml2argvdata/net-hostdev-vfio.xml
index 6f64229191..e6e6b6e5d3 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio.xml
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-hostdev.args
b/tests/qemuxml2argvdata/net-hostdev.args
index 8bf52c2b6f..ef4e7c872b 100644
--- a/tests/qemuxml2argvdata/net-hostdev.args
+++ b/tests/qemuxml2argvdata/net-hostdev.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-hostdev.xml
b/tests/qemuxml2argvdata/net-hostdev.xml
index e60e615a82..bb94f7c7b8 100644
--- a/tests/qemuxml2argvdata/net-hostdev.xml
+++ b/tests/qemuxml2argvdata/net-hostdev.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-mcast.args
b/tests/qemuxml2argvdata/net-mcast.args
index 1fbd375998..4f64e6ae23 100644
--- a/tests/qemuxml2argvdata/net-mcast.args
+++ b/tests/qemuxml2argvdata/net-mcast.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-mcast.xml b/tests/qemuxml2argvdata/net-mcast.xml
index a199162023..0d677df12e 100644
--- a/tests/qemuxml2argvdata/net-mcast.xml
+++ b/tests/qemuxml2argvdata/net-mcast.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-midonet.xml
b/tests/qemuxml2argvdata/net-midonet.xml
index 2688b50236..fc539ee692 100644
--- a/tests/qemuxml2argvdata/net-midonet.xml
+++ b/tests/qemuxml2argvdata/net-midonet.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-openvswitch.xml
b/tests/qemuxml2argvdata/net-openvswitch.xml
index 7d928b5f88..c8b64be4a0 100644
--- a/tests/qemuxml2argvdata/net-openvswitch.xml
+++ b/tests/qemuxml2argvdata/net-openvswitch.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-server.args
b/tests/qemuxml2argvdata/net-server.args
index fe3d03f5ef..43a6842b44 100644
--- a/tests/qemuxml2argvdata/net-server.args
+++ b/tests/qemuxml2argvdata/net-server.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-server.xml
b/tests/qemuxml2argvdata/net-server.xml
index b2fa27ca93..5b17ab30b9 100644
--- a/tests/qemuxml2argvdata/net-server.xml
+++ b/tests/qemuxml2argvdata/net-server.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args
index 7a40bf070e..454ca9d75b 100644
--- a/tests/qemuxml2argvdata/net-udp.args
+++ b/tests/qemuxml2argvdata/net-udp.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-udp.xml b/tests/qemuxml2argvdata/net-udp.xml
index b00805d35b..911280ca17 100644
--- a/tests/qemuxml2argvdata/net-udp.xml
+++ b/tests/qemuxml2argvdata/net-udp.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-user-addr.args
b/tests/qemuxml2argvdata/net-user-addr.args
index fd6cc0ec59..a96e9fe3f1 100644
--- a/tests/qemuxml2argvdata/net-user-addr.args
+++ b/tests/qemuxml2argvdata/net-user-addr.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-user-addr.xml
b/tests/qemuxml2argvdata/net-user-addr.xml
index 45e024d627..dd42c4451e 100644
--- a/tests/qemuxml2argvdata/net-user-addr.xml
+++ b/tests/qemuxml2argvdata/net-user-addr.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/net-vhostuser-fail.xml
b/tests/qemuxml2argvdata/net-vhostuser-fail.xml
index 4050191a26..d50589af6f 100644
--- a/tests/qemuxml2argvdata/net-vhostuser-fail.xml
+++ b/tests/qemuxml2argvdata/net-vhostuser-fail.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
index 2abd05a437..34f70166d2 100644
--- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
+++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.xml
b/tests/qemuxml2argvdata/net-vhostuser-multiq.xml
index 342d151d97..ed492ea41a 100644
--- a/tests/qemuxml2argvdata/net-vhostuser-multiq.xml
+++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/net-virtio-device.args
b/tests/qemuxml2argvdata/net-virtio-device.args
index d9303a4d14..e6d9236470 100644
--- a/tests/qemuxml2argvdata/net-virtio-device.args
+++ b/tests/qemuxml2argvdata/net-virtio-device.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-virtio-device.xml
b/tests/qemuxml2argvdata/net-virtio-device.xml
index c8bd8525eb..64d71b9164 100644
--- a/tests/qemuxml2argvdata/net-virtio-device.xml
+++ b/tests/qemuxml2argvdata/net-virtio-device.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
index 3be0fa4625..d9f43a0142 100644
--- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
+++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml
b/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml
index c8debd6ae4..ea1658ac9b 100644
--- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml
+++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest7'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args
b/tests/qemuxml2argvdata/net-virtio-netdev.args
index fe5b7fb021..e0c876e239 100644
--- a/tests/qemuxml2argvdata/net-virtio-netdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-netdev.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.xml
b/tests/qemuxml2argvdata/net-virtio-netdev.xml
index f78ea5d64e..914476b9ad 100644
--- a/tests/qemuxml2argvdata/net-virtio-netdev.xml
+++ b/tests/qemuxml2argvdata/net-virtio-netdev.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml
b/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml
index 47d35e8661..81b4aa8555 100644
--- a/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml
+++ b/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml
b/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml
index 2214884a05..49b839976b 100644
--- a/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml
+++ b/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
index 77837b74a4..cecbf674cc 100644
--- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
+++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml
b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml
index 000af9830e..d9cdaa19d9 100644
--- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml
+++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
index 72f9b42d35..3e0aaca8df 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml
b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml
index ed1d4c8c05..46171ddf09 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml
+++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-network.xml
b/tests/qemuxml2argvdata/net-virtio-teaming-network.xml
index edab52f3a1..04638cfeda 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming-network.xml
+++ b/tests/qemuxml2argvdata/net-virtio-teaming-network.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args
b/tests/qemuxml2argvdata/net-virtio-teaming.args
index 83e46ecbd1..15dae0e779 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.xml
b/tests/qemuxml2argvdata/net-virtio-teaming.xml
index 830ce28524..a10e0c13f2 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming.xml
+++ b/tests/qemuxml2argvdata/net-virtio-teaming.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/net-virtio.args
b/tests/qemuxml2argvdata/net-virtio.args
index 8ac6d7bc0b..064b7fffe9 100644
--- a/tests/qemuxml2argvdata/net-virtio.args
+++ b/tests/qemuxml2argvdata/net-virtio.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/net-virtio.xml
b/tests/qemuxml2argvdata/net-virtio.xml
index 372c79d8de..2731c399cf 100644
--- a/tests/qemuxml2argvdata/net-virtio.xml
+++ b/tests/qemuxml2argvdata/net-virtio.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/nosharepages.args
b/tests/qemuxml2argvdata/nosharepages.args
index 366973f7c5..a059b61da4 100644
--- a/tests/qemuxml2argvdata/nosharepages.args
+++ b/tests/qemuxml2argvdata/nosharepages.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/nosharepages.xml
b/tests/qemuxml2argvdata/nosharepages.xml
index d2ab028715..78f20ec401 100644
--- a/tests/qemuxml2argvdata/nosharepages.xml
+++ b/tests/qemuxml2argvdata/nosharepages.xml
@@ -8,7 +8,7 @@
</memoryBacking>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
index 69f613e482..951de4194a 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml
b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml
index 5758e65d09..b3a23763c4 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml
@@ -8,7 +8,7 @@
<memory mode='interleave' placement='auto'/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -19,7 +19,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
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 69f613e482..951de4194a 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
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
index 80314d05a3..d193543583 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
@@ -8,7 +8,7 @@
<memory mode='interleave' placement='auto'/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -19,7 +19,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml
b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml
index 0edf8ee46f..e06b353d25 100644
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='auto'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml
b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml
index 517dd5dbd7..f53de51459 100644
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml
@@ -8,7 +8,7 @@
<memory mode='interleave' placement='static'/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -19,7 +19,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
index 69f613e482..951de4194a 100644
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml
b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml
index a7f32b6802..7b0133720e 100644
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml
@@ -8,7 +8,7 @@
<memory mode='interleave' nodeset='0'/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -19,7 +19,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
index 69f613e482..951de4194a 100644
--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml
b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml
index 5758e65d09..b3a23763c4 100644
--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml
+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml
@@ -8,7 +8,7 @@
<memory mode='interleave' placement='auto'/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -19,7 +19,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml
b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml
index 3237e7c7c5..e92966f455 100644
--- a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml
+++ b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args
index 69f613e482..951de4194a 100644
--- a/tests/qemuxml2argvdata/numad.args
+++ b/tests/qemuxml2argvdata/numad.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/numad.xml b/tests/qemuxml2argvdata/numad.xml
index ae995e2d6b..dc38889abf 100644
--- a/tests/qemuxml2argvdata/numad.xml
+++ b/tests/qemuxml2argvdata/numad.xml
@@ -8,7 +8,7 @@
<memory mode="interleave" placement='auto'/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -19,7 +19,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
index 69f613e482..951de4194a 100644
--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml
b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml
index e6ca895b0d..dfc9473343 100644
--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml
+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml
@@ -8,7 +8,7 @@
<memory mode='preferred' placement='auto'
nodeset="0-5,^4"/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -19,7 +19,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml
b/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml
index 70e7b92f34..5dc72db833 100644
--- a/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml
+++ b/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml
@@ -8,7 +8,7 @@
<memory mode="strict" nodeset="0,^0"/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -19,7 +19,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/numatune-memory.args
b/tests/qemuxml2argvdata/numatune-memory.args
index 69f613e482..951de4194a 100644
--- a/tests/qemuxml2argvdata/numatune-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memory.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/numatune-memory.xml
b/tests/qemuxml2argvdata/numatune-memory.xml
index 93ee70cc0b..ed86d5cf56 100644
--- a/tests/qemuxml2argvdata/numatune-memory.xml
+++ b/tests/qemuxml2argvdata/numatune-memory.xml
@@ -8,7 +8,7 @@
<memory mode="strict" nodeset="0-5,^4"/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -19,7 +19,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml
b/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml
index 631d3bad38..647b607a28 100644
--- a/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml
+++ b/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml
@@ -9,7 +9,7 @@
<memnode cellid='1' mode='strict' nodeset='0'/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -23,7 +23,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/pci-bus-invalid.xml
b/tests/qemuxml2argvdata/pci-bus-invalid.xml
index 5884af6fc8..34bc2addb0 100644
--- a/tests/qemuxml2argvdata/pci-bus-invalid.xml
+++ b/tests/qemuxml2argvdata/pci-bus-invalid.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/pci-domain-invalid.xml
b/tests/qemuxml2argvdata/pci-domain-invalid.xml
index 5884af6fc8..34bc2addb0 100644
--- a/tests/qemuxml2argvdata/pci-domain-invalid.xml
+++ b/tests/qemuxml2argvdata/pci-domain-invalid.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/pci-function-invalid.xml
b/tests/qemuxml2argvdata/pci-function-invalid.xml
index 5642809ec0..23c9b6e4ac 100644
--- a/tests/qemuxml2argvdata/pci-function-invalid.xml
+++ b/tests/qemuxml2argvdata/pci-function-invalid.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args
index 2934cfcae6..886862eb98 100644
--- a/tests/qemuxml2argvdata/pci-rom.args
+++ b/tests/qemuxml2argvdata/pci-rom.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
-/usr/bin/qemu-system-i386 \
+/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
\
diff --git a/tests/qemuxml2argvdata/pci-rom.xml b/tests/qemuxml2argvdata/pci-rom.xml
index 2e8ea4bde3..59581f60fa 100644
--- a/tests/qemuxml2argvdata/pci-rom.xml
+++ b/tests/qemuxml2argvdata/pci-rom.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/pci-slot-invalid.xml
b/tests/qemuxml2argvdata/pci-slot-invalid.xml
index 0c4a2daef2..448ca47950 100644
--- a/tests/qemuxml2argvdata/pci-slot-invalid.xml
+++ b/tests/qemuxml2argvdata/pci-slot-invalid.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args
b/tests/qemuxml2argvdata/pmu-feature-off.args
index 866d9b892f..4af05c4d9a 100644
--- a/tests/qemuxml2argvdata/pmu-feature-off.args
+++ b/tests/qemuxml2argvdata/pmu-feature-off.args
@@ -6,13 +6,13 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
--cpu qemu32,pmu=off \
+-cpu qemu64,pmu=off \
-m size=219136k \
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/pmu-feature-off.xml
b/tests/qemuxml2argvdata/pmu-feature-off.xml
index 17e1fec954..743083f290 100644
--- a/tests/qemuxml2argvdata/pmu-feature-off.xml
+++ b/tests/qemuxml2argvdata/pmu-feature-off.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>6</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
<features>
@@ -17,7 +17,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/pmu-feature.args
b/tests/qemuxml2argvdata/pmu-feature.args
index 67b0c87540..26296caedb 100644
--- a/tests/qemuxml2argvdata/pmu-feature.args
+++ b/tests/qemuxml2argvdata/pmu-feature.args
@@ -6,13 +6,13 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
--cpu qemu32,pmu=on \
+-cpu qemu64,pmu=on \
-m size=219136k \
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/pmu-feature.xml
b/tests/qemuxml2argvdata/pmu-feature.xml
index a7f43392a4..ffd667990e 100644
--- a/tests/qemuxml2argvdata/pmu-feature.xml
+++ b/tests/qemuxml2argvdata/pmu-feature.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>6</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
<features>
@@ -17,7 +17,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<memballoon model='none'/>
diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args
b/tests/qemuxml2argvdata/qemu-ns-alt.args
index dd495e83eb..0af708dfe0 100644
--- a/tests/qemuxml2argvdata/qemu-ns-alt.args
+++ b/tests/qemuxml2argvdata/qemu-ns-alt.args
@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
NS=ns \
BAR='' \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.xml
b/tests/qemuxml2argvdata/qemu-ns-alt.xml
index 6b8b5ba36b..75424bcef3 100644
--- a/tests/qemuxml2argvdata/qemu-ns-alt.xml
+++ b/tests/qemuxml2argvdata/qemu-ns-alt.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
index 81b146977b..1f4ef13cc3 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml
index 9189927126..613ee56ea9 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
index 81b146977b..1f4ef13cc3 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml
index e98d777309..1801102e31 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args
b/tests/qemuxml2argvdata/qemu-ns-commandline.args
index 81b146977b..1f4ef13cc3 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.xml
b/tests/qemuxml2argvdata/qemu-ns-commandline.xml
index 25f83acb12..6e8e32eee0 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline.xml
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
index 81b146977b..1f4ef13cc3 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml
index 9c25329b05..7b23a179cb 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
index 81b146977b..1f4ef13cc3 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml
index 65a688fb78..250a479a81 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
index 81b146977b..1f4ef13cc3 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml
b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml
index a5d3ec0b02..2f71f53ddb 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args
b/tests/qemuxml2argvdata/qemu-ns-no-env.args
index b4505826d8..11a2a9b480 100644
--- a/tests/qemuxml2argvdata/qemu-ns-no-env.args
+++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.xml
b/tests/qemuxml2argvdata/qemu-ns-no-env.xml
index 3dad42eead..d27b1ee92e 100644
--- a/tests/qemuxml2argvdata/qemu-ns-no-env.xml
+++ b/tests/qemuxml2argvdata/qemu-ns-no-env.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
index fd69ea14fc..9dfd4cad5c 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.xml
b/tests/qemuxml2argvdata/reboot-timeout-disabled.xml
index a815b4b274..e0876035fe 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-disabled.xml
+++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>6</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
<bios rebootTimeout='-1'/>
</os>
@@ -14,7 +14,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
index f7ab6fb345..ce3712cdbc 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.xml
b/tests/qemuxml2argvdata/reboot-timeout-enabled.xml
index 4554f85323..74ded1ce21 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-enabled.xml
+++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>6</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
<bios rebootTimeout='128'/>
</os>
@@ -14,7 +14,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args
b/tests/qemuxml2argvdata/restore-v2-fd.args
index d00eb8542e..61c3521103 100644
--- a/tests/qemuxml2argvdata/restore-v2-fd.args
+++ b/tests/qemuxml2argvdata/restore-v2-fd.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/restore-v2-fd.xml
b/tests/qemuxml2argvdata/restore-v2-fd.xml
index f56ba5a1e7..025578a089 100644
--- a/tests/qemuxml2argvdata/restore-v2-fd.xml
+++ b/tests/qemuxml2argvdata/restore-v2-fd.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/restore-v2.args
b/tests/qemuxml2argvdata/restore-v2.args
index eec598e1af..d6247264df 100644
--- a/tests/qemuxml2argvdata/restore-v2.args
+++ b/tests/qemuxml2argvdata/restore-v2.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/restore-v2.xml
b/tests/qemuxml2argvdata/restore-v2.xml
index 7b4ea974eb..d14d45524e 100644
--- a/tests/qemuxml2argvdata/restore-v2.xml
+++ b/tests/qemuxml2argvdata/restore-v2.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args
b/tests/qemuxml2argvdata/seclabel-dac-none.args
index f16464092e..5078429e1b 100644
--- a/tests/qemuxml2argvdata/seclabel-dac-none.args
+++ b/tests/qemuxml2argvdata/seclabel-dac-none.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.xml
b/tests/qemuxml2argvdata/seclabel-dac-none.xml
index cf1b1d557e..8a5ca7fc6b 100644
--- a/tests/qemuxml2argvdata/seclabel-dac-none.xml
+++ b/tests/qemuxml2argvdata/seclabel-dac-none.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/seclabel-device-duplicates.xml
b/tests/qemuxml2argvdata/seclabel-device-duplicates.xml
index 100c67ce5f..3a0cb42e4d 100644
--- a/tests/qemuxml2argvdata/seclabel-device-duplicates.xml
+++ b/tests/qemuxml2argvdata/seclabel-device-duplicates.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'>
<seclabel model='selinux' relabel='no'/>
diff --git a/tests/qemuxml2argvdata/seclabel-device-multiple.xml
b/tests/qemuxml2argvdata/seclabel-device-multiple.xml
index cf3d3c04ee..94d1adcc01 100644
--- a/tests/qemuxml2argvdata/seclabel-device-multiple.xml
+++ b/tests/qemuxml2argvdata/seclabel-device-multiple.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'>
<seclabel model='selinux' relabel='yes'>
diff --git a/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml
b/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml
index f5e2c418b6..5b924202c8 100644
--- a/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml
+++ b/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'>
<seclabel model='dac' relabel='no'/>
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
index f16464092e..5078429e1b 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml
b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml
index cfebf7720d..27b776882c 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
index f16464092e..5078429e1b 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml
b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml
index 11b52e2998..cdab31aeb7 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'>
<seclabel model='selinux' labelskip='yes'/>
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-none.xml
b/tests/qemuxml2argvdata/seclabel-dynamic-none.xml
index ec75535c0e..c902c8e88e 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-none.xml
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-none.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
index e20206ef0b..1f41c61f72 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.xml
b/tests/qemuxml2argvdata/seclabel-dynamic-override.xml
index 4946f2f0c0..255fc6bd11 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-override.xml
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'>
<seclabel model='selinux' relabel='no'/>
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
index f16464092e..5078429e1b 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml
b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml
index db97b92d06..26ee64aa3d 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args
b/tests/qemuxml2argvdata/seclabel-dynamic.args
index f16464092e..5078429e1b 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.xml
b/tests/qemuxml2argvdata/seclabel-dynamic.xml
index f6586062da..1cde5a9ec6 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic.xml
+++ b/tests/qemuxml2argvdata/seclabel-dynamic.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/seclabel-multiple.xml
b/tests/qemuxml2argvdata/seclabel-multiple.xml
index 9fe7bdd8df..fc349366ee 100644
--- a/tests/qemuxml2argvdata/seclabel-multiple.xml
+++ b/tests/qemuxml2argvdata/seclabel-multiple.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'>
<seclabel model='selinux' labelskip='yes'/>
diff --git a/tests/qemuxml2argvdata/seclabel-none.args
b/tests/qemuxml2argvdata/seclabel-none.args
index f16464092e..5078429e1b 100644
--- a/tests/qemuxml2argvdata/seclabel-none.args
+++ b/tests/qemuxml2argvdata/seclabel-none.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/seclabel-none.xml
b/tests/qemuxml2argvdata/seclabel-none.xml
index 03fc36443a..52b51239eb 100644
--- a/tests/qemuxml2argvdata/seclabel-none.xml
+++ b/tests/qemuxml2argvdata/seclabel-none.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
index f16464092e..5078429e1b 100644
--- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.xml
b/tests/qemuxml2argvdata/seclabel-static-labelskip.xml
index 5d357acd66..d1971c8669 100644
--- a/tests/qemuxml2argvdata/seclabel-static-labelskip.xml
+++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'>
<seclabel model='selinux' labelskip='yes'/>
diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args
b/tests/qemuxml2argvdata/seclabel-static-relabel.args
index f16464092e..5078429e1b 100644
--- a/tests/qemuxml2argvdata/seclabel-static-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.xml
b/tests/qemuxml2argvdata/seclabel-static-relabel.xml
index dd8995bb28..b2d40ed314 100644
--- a/tests/qemuxml2argvdata/seclabel-static-relabel.xml
+++ b/tests/qemuxml2argvdata/seclabel-static-relabel.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/seclabel-static.args
b/tests/qemuxml2argvdata/seclabel-static.args
index f16464092e..5078429e1b 100644
--- a/tests/qemuxml2argvdata/seclabel-static.args
+++ b/tests/qemuxml2argvdata/seclabel-static.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/seclabel-static.xml
b/tests/qemuxml2argvdata/seclabel-static.xml
index a5d4c007e8..3448467378 100644
--- a/tests/qemuxml2argvdata/seclabel-static.xml
+++ b/tests/qemuxml2argvdata/seclabel-static.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/serial-target-port-auto.xml
b/tests/qemuxml2argvdata/serial-target-port-auto.xml
index 9f9ba502b3..b430290e83 100644
--- a/tests/qemuxml2argvdata/serial-target-port-auto.xml
+++ b/tests/qemuxml2argvdata/serial-target-port-auto.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/shmem-invalid-address.xml
b/tests/qemuxml2argvdata/shmem-invalid-address.xml
index 1eef5ed540..0ef64483ac 100644
--- a/tests/qemuxml2argvdata/shmem-invalid-address.xml
+++ b/tests/qemuxml2argvdata/shmem-invalid-address.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<memballoon model='none'/>
diff --git a/tests/qemuxml2argvdata/shmem-invalid-size.xml
b/tests/qemuxml2argvdata/shmem-invalid-size.xml
index e9a383de21..ff37e5ad68 100644
--- a/tests/qemuxml2argvdata/shmem-invalid-size.xml
+++ b/tests/qemuxml2argvdata/shmem-invalid-size.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<memballoon model='none'/>
diff --git a/tests/qemuxml2argvdata/shmem-msi-only.xml
b/tests/qemuxml2argvdata/shmem-msi-only.xml
index 6c8025d63b..e23e27a107 100644
--- a/tests/qemuxml2argvdata/shmem-msi-only.xml
+++ b/tests/qemuxml2argvdata/shmem-msi-only.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<memballoon model='none'/>
diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
index 0cda6eb716..aec63db1cf 100644
--- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
+++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.xml
b/tests/qemuxml2argvdata/shmem-plain-doorbell.xml
index 7c76e0fbba..d9c2a0868d 100644
--- a/tests/qemuxml2argvdata/shmem-plain-doorbell.xml
+++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/shmem-small-size.xml
b/tests/qemuxml2argvdata/shmem-small-size.xml
index 7236f64577..257f3074c6 100644
--- a/tests/qemuxml2argvdata/shmem-small-size.xml
+++ b/tests/qemuxml2argvdata/shmem-small-size.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<memballoon model='none'/>
diff --git a/tests/qemuxml2argvdata/shmem.args b/tests/qemuxml2argvdata/shmem.args
index 1c35a8b6de..1ca9a3354f 100644
--- a/tests/qemuxml2argvdata/shmem.args
+++ b/tests/qemuxml2argvdata/shmem.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/shmem.xml b/tests/qemuxml2argvdata/shmem.xml
index e09f6da780..b6dfe291df 100644
--- a/tests/qemuxml2argvdata/shmem.xml
+++ b/tests/qemuxml2argvdata/shmem.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/smartcard-controller.args
b/tests/qemuxml2argvdata/smartcard-controller.args
index 8078935bd8..5127fd07d5 100644
--- a/tests/qemuxml2argvdata/smartcard-controller.args
+++ b/tests/qemuxml2argvdata/smartcard-controller.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/smartcard-controller.xml
b/tests/qemuxml2argvdata/smartcard-controller.xml
index 31834ec4e8..7141ba352f 100644
--- a/tests/qemuxml2argvdata/smartcard-controller.xml
+++ b/tests/qemuxml2argvdata/smartcard-controller.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='ccid' index='0'/>
<smartcard mode='host'>
<address type='ccid' controller='0' slot='0'/>
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
index 2609f5df94..4e7be2c3dc 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml
b/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml
index 10d4521b98..6c02fd510e 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<smartcard mode='host-certificates'>
<certificate>cert1</certificate>
<certificate>cert2</certificate>
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args
b/tests/qemuxml2argvdata/smartcard-host-certificates.args
index ddde83064c..3e1c0d4267 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.xml
b/tests/qemuxml2argvdata/smartcard-host-certificates.xml
index 093cdb68c2..e8b93f0f2c 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates.xml
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<smartcard mode='host-certificates'>
<certificate>cert1</certificate>
<certificate>cert2</certificate>
diff --git a/tests/qemuxml2argvdata/smartcard-host.args
b/tests/qemuxml2argvdata/smartcard-host.args
index 8078935bd8..5127fd07d5 100644
--- a/tests/qemuxml2argvdata/smartcard-host.args
+++ b/tests/qemuxml2argvdata/smartcard-host.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/smartcard-host.xml
b/tests/qemuxml2argvdata/smartcard-host.xml
index 4b3827fb80..20b3285c21 100644
--- a/tests/qemuxml2argvdata/smartcard-host.xml
+++ b/tests/qemuxml2argvdata/smartcard-host.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<smartcard mode='host'/>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
index 47a783326d..8f4da0c94b 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml
b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml
index 76e0597a76..4c3e814799 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<smartcard mode='passthrough' type='spicevmc'/>
<memballoon model='virtio'/>
<graphics type='spice'/>
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
index b317e0a7d7..53074a41e8 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml
b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml
index aeddc7d4a0..95fdd795b6 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<smartcard mode='passthrough' type='tcp'>
<source mode='bind' host='127.0.0.1'
service='2001'/>
<protocol type='raw'/>
diff --git a/tests/qemuxml2argvdata/smbios-date.xml
b/tests/qemuxml2argvdata/smbios-date.xml
index 06b2e9f737..4a7a5ba649 100644
--- a/tests/qemuxml2argvdata/smbios-date.xml
+++ b/tests/qemuxml2argvdata/smbios-date.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<smbios mode="sysinfo"/>
</os>
<sysinfo type="smbios">
@@ -18,6 +18,6 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
</devices>
</domain>
diff --git a/tests/qemuxml2argvdata/smbios-multiple-type2.xml
b/tests/qemuxml2argvdata/smbios-multiple-type2.xml
index 9e79ff21be..275f7631b3 100644
--- a/tests/qemuxml2argvdata/smbios-multiple-type2.xml
+++ b/tests/qemuxml2argvdata/smbios-multiple-type2.xml
@@ -35,7 +35,7 @@
</baseBoard>
</sysinfo>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
<smbios mode='sysinfo'/>
</os>
@@ -44,7 +44,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.args
b/tests/qemuxml2argvdata/smbios-type-fwcfg.args
index 2e8e4c8be1..160f79adfa 100644
--- a/tests/qemuxml2argvdata/smbios-type-fwcfg.args
+++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.xml
b/tests/qemuxml2argvdata/smbios-type-fwcfg.xml
index dcec9d2e0d..a0864ad2e1 100644
--- a/tests/qemuxml2argvdata/smbios-type-fwcfg.xml
+++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.xml
@@ -31,7 +31,7 @@
<entry name='opt/com.coreos/config'
file='/tmp/provision.ign'/>
</sysinfo>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
<smbios mode='sysinfo'/>
</os>
@@ -40,7 +40,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/smbios-uuid-match.xml
b/tests/qemuxml2argvdata/smbios-uuid-match.xml
index e424a109e5..9a18207483 100644
--- a/tests/qemuxml2argvdata/smbios-uuid-match.xml
+++ b/tests/qemuxml2argvdata/smbios-uuid-match.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<smbios mode="sysinfo"/>
</os>
<sysinfo type="smbios">
@@ -18,6 +18,6 @@
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
</devices>
</domain>
diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args
index bbdd66b28f..54c7c361be 100644
--- a/tests/qemuxml2argvdata/smbios.args
+++ b/tests/qemuxml2argvdata/smbios.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/smbios.xml b/tests/qemuxml2argvdata/smbios.xml
index 9f67376449..b599ae83fb 100644
--- a/tests/qemuxml2argvdata/smbios.xml
+++ b/tests/qemuxml2argvdata/smbios.xml
@@ -40,7 +40,7 @@
</oemStrings>
</sysinfo>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
<smbios mode='sysinfo'/>
</os>
@@ -49,7 +49,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/smp-dies.args
index 679e9785e6..1b73feb8a2 100644
--- a/tests/qemuxml2argvdata/smp-dies.args
+++ b/tests/qemuxml2argvdata/smp-dies.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/smp-dies.xml b/tests/qemuxml2argvdata/smp-dies.xml
index caadaef8b5..a29786c0c4 100644
--- a/tests/qemuxml2argvdata/smp-dies.xml
+++ b/tests/qemuxml2argvdata/smp-dies.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static' current='1'>4</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args
index 50bc8af175..1b090e9dbe 100644
--- a/tests/qemuxml2argvdata/smp.args
+++ b/tests/qemuxml2argvdata/smp.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/smp.xml b/tests/qemuxml2argvdata/smp.xml
index 6041506ed8..274aa37f1a 100644
--- a/tests/qemuxml2argvdata/smp.xml
+++ b/tests/qemuxml2argvdata/smp.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static' current='1'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/usb-bus-missing.xml
b/tests/qemuxml2argvdata/usb-bus-missing.xml
index 23bfdc4c8f..1726043817 100644
--- a/tests/qemuxml2argvdata/usb-bus-missing.xml
+++ b/tests/qemuxml2argvdata/usb-bus-missing.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<memballoon model='virtio'/>
<input type='mouse' bus='usb'>
diff --git a/tests/qemuxml2argvdata/usb-controller-xhci-limit.xml
b/tests/qemuxml2argvdata/usb-controller-xhci-limit.xml
index 1515afea78..08a04183b6 100644
--- a/tests/qemuxml2argvdata/usb-controller-xhci-limit.xml
+++ b/tests/qemuxml2argvdata/usb-controller-xhci-limit.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='nec-xhci'
ports='16'/>
<memballoon model='none'/>
</devices>
diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args
b/tests/qemuxml2argvdata/usb-controller-xhci.args
index 7f6cdbf348..ca0b40ff28 100644
--- a/tests/qemuxml2argvdata/usb-controller-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-xhci.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.xml
b/tests/qemuxml2argvdata/usb-controller-xhci.xml
index 2988b18051..5ee73c9bcf 100644
--- a/tests/qemuxml2argvdata/usb-controller-xhci.xml
+++ b/tests/qemuxml2argvdata/usb-controller-xhci.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='nec-xhci'
ports='8'/>
<memballoon model='none'/>
</devices>
diff --git a/tests/qemuxml2argvdata/usb-controller.args
b/tests/qemuxml2argvdata/usb-controller.args
index a336a06261..4a49b33727 100644
--- a/tests/qemuxml2argvdata/usb-controller.args
+++ b/tests/qemuxml2argvdata/usb-controller.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-controller.xml
b/tests/qemuxml2argvdata/usb-controller.xml
index 7757a0719c..81149b73be 100644
--- a/tests/qemuxml2argvdata/usb-controller.xml
+++ b/tests/qemuxml2argvdata/usb-controller.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
index 313d218ec0..c1ce4d5327 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml
b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml
index abf2470998..4fa5b75e0f 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<memballoon model='virtio'/>
<input type='mouse' bus='usb'>
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args
b/tests/qemuxml2argvdata/usb-hub-autoadd.args
index dd7d1675c2..72a969ffff 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.xml
b/tests/qemuxml2argvdata/usb-hub-autoadd.xml
index 65dda5a407..91e78cf595 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd.xml
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<memballoon model='virtio'/>
<input type='mouse' bus='usb'>
diff --git a/tests/qemuxml2argvdata/usb-hub-conflict.xml
b/tests/qemuxml2argvdata/usb-hub-conflict.xml
index 85ec3c4cf1..5db2211676 100644
--- a/tests/qemuxml2argvdata/usb-hub-conflict.xml
+++ b/tests/qemuxml2argvdata/usb-hub-conflict.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<memballoon model='virtio'/>
<hub type='usb'>
diff --git a/tests/qemuxml2argvdata/usb-hub-nonexistent.xml
b/tests/qemuxml2argvdata/usb-hub-nonexistent.xml
index 7b2b17a678..8a3b9cc773 100644
--- a/tests/qemuxml2argvdata/usb-hub-nonexistent.xml
+++ b/tests/qemuxml2argvdata/usb-hub-nonexistent.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<memballoon model='virtio'/>
<input type='mouse' bus='usb'>
diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args
index 645e81de1d..df6912ecf8 100644
--- a/tests/qemuxml2argvdata/usb-hub.args
+++ b/tests/qemuxml2argvdata/usb-hub.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-hub.xml b/tests/qemuxml2argvdata/usb-hub.xml
index e9e1fef964..66bf07f180 100644
--- a/tests/qemuxml2argvdata/usb-hub.xml
+++ b/tests/qemuxml2argvdata/usb-hub.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<memballoon model='virtio'/>
<hub type='usb'>
diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
index 6b24fcb208..b30ef04710 100644
--- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.xml
b/tests/qemuxml2argvdata/usb-ich9-autoassign.xml
index 3090255821..eb670dce8b 100644
--- a/tests/qemuxml2argvdata/usb-ich9-autoassign.xml
+++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='ich9-ehci1'>
<address type='pci' domain='0' bus='0' slot='4'
function='7'/>
</controller>
diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args
b/tests/qemuxml2argvdata/usb-ich9-companion.args
index 96041805f6..03c5a04492 100644
--- a/tests/qemuxml2argvdata/usb-ich9-companion.args
+++ b/tests/qemuxml2argvdata/usb-ich9-companion.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.xml
b/tests/qemuxml2argvdata/usb-ich9-companion.xml
index 7e31ec95d3..aa5fb12727 100644
--- a/tests/qemuxml2argvdata/usb-ich9-companion.xml
+++ b/tests/qemuxml2argvdata/usb-ich9-companion.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='ich9-ehci1'>
<address type='pci' domain='0' bus='0' slot='4'
function='7'/>
</controller>
diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
index eb55883bd7..70b8cc7a3b 100644
--- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
+++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml
b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml
index 4da9fbdf0e..e5b0cf9eb6 100644
--- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml
+++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<!-- Intentionally mixed up ordering to check we assign
addresses to the correct matching companions -->
<controller type='usb' index='0' model='ich9-ehci1'>
diff --git a/tests/qemuxml2argvdata/usb-ich9-no-companion.xml
b/tests/qemuxml2argvdata/usb-ich9-no-companion.xml
index 8c34954a1a..fbd1bbeb24 100644
--- a/tests/qemuxml2argvdata/usb-ich9-no-companion.xml
+++ b/tests/qemuxml2argvdata/usb-ich9-no-companion.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='ich9-uhci2'>
<master startport='2'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0'/>
diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args
b/tests/qemuxml2argvdata/usb-long-port-path.args
index 5874a1ff49..210a82bc9b 100644
--- a/tests/qemuxml2argvdata/usb-long-port-path.args
+++ b/tests/qemuxml2argvdata/usb-long-port-path.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-long-port-path.xml
b/tests/qemuxml2argvdata/usb-long-port-path.xml
index 0df5c8408f..12c83204b3 100644
--- a/tests/qemuxml2argvdata/usb-long-port-path.xml
+++ b/tests/qemuxml2argvdata/usb-long-port-path.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2argvdata/usb-none-hub.xml
b/tests/qemuxml2argvdata/usb-none-hub.xml
index 7b6fd7d737..0f716e4e00 100644
--- a/tests/qemuxml2argvdata/usb-none-hub.xml
+++ b/tests/qemuxml2argvdata/usb-none-hub.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' model='none' index='0'/>
<memballoon model='virtio'/>
<hub type='usb'>
diff --git a/tests/qemuxml2argvdata/usb-none-other.xml
b/tests/qemuxml2argvdata/usb-none-other.xml
index f4e8a5e4de..0e73c1c8b6 100644
--- a/tests/qemuxml2argvdata/usb-none-other.xml
+++ b/tests/qemuxml2argvdata/usb-none-other.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='none'/>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2argvdata/usb-none-usbtablet.xml
b/tests/qemuxml2argvdata/usb-none-usbtablet.xml
index 36f33788dc..4f0848b441 100644
--- a/tests/qemuxml2argvdata/usb-none-usbtablet.xml
+++ b/tests/qemuxml2argvdata/usb-none-usbtablet.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' model='none' index='0'/>
<input type='tablet' bus='usb'/>
<memballoon model='virtio'/>
diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args
index 2d39b29dbf..755b7fcace 100644
--- a/tests/qemuxml2argvdata/usb-none.args
+++ b/tests/qemuxml2argvdata/usb-none.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-none.xml b/tests/qemuxml2argvdata/usb-none.xml
index 9d429dd845..a425e0e424 100644
--- a/tests/qemuxml2argvdata/usb-none.xml
+++ b/tests/qemuxml2argvdata/usb-none.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='none'/>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args
b/tests/qemuxml2argvdata/usb-piix3-controller.args
index 085a9a9007..fa2643e2fa 100644
--- a/tests/qemuxml2argvdata/usb-piix3-controller.args
+++ b/tests/qemuxml2argvdata/usb-piix3-controller.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.xml
b/tests/qemuxml2argvdata/usb-piix3-controller.xml
index eafc97f7fe..4d685c696f 100644
--- a/tests/qemuxml2argvdata/usb-piix3-controller.xml
+++ b/tests/qemuxml2argvdata/usb-piix3-controller.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='piix3-uhci'/>
<memballoon model='virtio'/>
</devices>
diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args
b/tests/qemuxml2argvdata/usb-port-autoassign.args
index 908025dada..2fbef8d060 100644
--- a/tests/qemuxml2argvdata/usb-port-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-port-autoassign.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.xml
b/tests/qemuxml2argvdata/usb-port-autoassign.xml
index 72a69d85f3..40c6c96b4b 100644
--- a/tests/qemuxml2argvdata/usb-port-autoassign.xml
+++ b/tests/qemuxml2argvdata/usb-port-autoassign.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<memballoon model='virtio'/>
<hub type='usb'>
diff --git a/tests/qemuxml2argvdata/usb-port-missing.args
b/tests/qemuxml2argvdata/usb-port-missing.args
index fe268449ca..80713b27e4 100644
--- a/tests/qemuxml2argvdata/usb-port-missing.args
+++ b/tests/qemuxml2argvdata/usb-port-missing.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-port-missing.xml
b/tests/qemuxml2argvdata/usb-port-missing.xml
index 0d8906268f..c18bdb6758 100644
--- a/tests/qemuxml2argvdata/usb-port-missing.xml
+++ b/tests/qemuxml2argvdata/usb-port-missing.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<memballoon model='virtio'/>
<input type='mouse' bus='usb'>
diff --git a/tests/qemuxml2argvdata/usb-ports-out-of-range.xml
b/tests/qemuxml2argvdata/usb-ports-out-of-range.xml
index 3dd746114f..d00716885e 100644
--- a/tests/qemuxml2argvdata/usb-ports-out-of-range.xml
+++ b/tests/qemuxml2argvdata/usb-ports-out-of-range.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<memballoon model='virtio'/>
<hub type='usb'>
diff --git a/tests/qemuxml2argvdata/usb-ports.args
b/tests/qemuxml2argvdata/usb-ports.args
index 8119dd5400..e3e5cb73ca 100644
--- a/tests/qemuxml2argvdata/usb-ports.args
+++ b/tests/qemuxml2argvdata/usb-ports.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-ports.xml b/tests/qemuxml2argvdata/usb-ports.xml
index 9eaf210368..6f55045edd 100644
--- a/tests/qemuxml2argvdata/usb-ports.xml
+++ b/tests/qemuxml2argvdata/usb-ports.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<memballoon model='virtio'/>
<hub type='usb'>
diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args
b/tests/qemuxml2argvdata/usb-redir-boot.args
index f5f34eccca..150e3c5008 100644
--- a/tests/qemuxml2argvdata/usb-redir-boot.args
+++ b/tests/qemuxml2argvdata/usb-redir-boot.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-redir-boot.xml
b/tests/qemuxml2argvdata/usb-redir-boot.xml
index f6db55ca81..fe34b76a5f 100644
--- a/tests/qemuxml2argvdata/usb-redir-boot.xml
+++ b/tests/qemuxml2argvdata/usb-redir-boot.xml
@@ -5,14 +5,14 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='ich9-ehci1'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x7'/>
</controller>
diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args
b/tests/qemuxml2argvdata/usb-redir-filter-version.args
index 897886c83a..904c6f7842 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter-version.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.xml
b/tests/qemuxml2argvdata/usb-redir-filter-version.xml
index 35a63d8438..fb0037af0d 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter-version.xml
+++ b/tests/qemuxml2argvdata/usb-redir-filter-version.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<redirdev bus='usb' type='spicevmc'>
diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args
b/tests/qemuxml2argvdata/usb-redir-filter.args
index 708e82417c..aba04c7485 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-redir-filter.xml
b/tests/qemuxml2argvdata/usb-redir-filter.xml
index 30a1c1d7bb..04391381e7 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter.xml
+++ b/tests/qemuxml2argvdata/usb-redir-filter.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='ich9-ehci1'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x7'/>
</controller>
diff --git a/tests/qemuxml2argvdata/usb-redir.args
b/tests/qemuxml2argvdata/usb-redir.args
index 963db5bc87..2729c7d8d1 100644
--- a/tests/qemuxml2argvdata/usb-redir.args
+++ b/tests/qemuxml2argvdata/usb-redir.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-redir.xml b/tests/qemuxml2argvdata/usb-redir.xml
index c0758e59fa..311fa65012 100644
--- a/tests/qemuxml2argvdata/usb-redir.xml
+++ b/tests/qemuxml2argvdata/usb-redir.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='ich9-ehci1'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x7'/>
</controller>
diff --git a/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml
b/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml
index 33c781a791..1261f0b2c2 100644
--- a/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml
+++ b/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
index 8a52f6ebeb..3f7720237a 100644
--- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.xml
b/tests/qemuxml2argvdata/usb-xhci-autoassign.xml
index 55a40c4414..94cbbc2432 100644
--- a/tests/qemuxml2argvdata/usb-xhci-autoassign.xml
+++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='nec-xhci'
ports='8'/>
<hub type='usb'/>
<input type='mouse' bus='usb'>
diff --git a/tests/qemuxml2argvdata/usb1-usb2.args
b/tests/qemuxml2argvdata/usb1-usb2.args
index c9881d3507..56d0c52e06 100644
--- a/tests/qemuxml2argvdata/usb1-usb2.args
+++ b/tests/qemuxml2argvdata/usb1-usb2.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/usb1-usb2.xml b/tests/qemuxml2argvdata/usb1-usb2.xml
index ed4622b03b..90bdc9ac3a 100644
--- a/tests/qemuxml2argvdata/usb1-usb2.xml
+++ b/tests/qemuxml2argvdata/usb1-usb2.xml
@@ -5,11 +5,11 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<memballoon model='virtio'/>
<controller type='usb' index='0' model='piix3-uhci'>
diff --git a/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml
b/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml
index 606c60dcea..953e826720 100644
--- a/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml
+++ b/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/video-multiple-primaries.xml
b/tests/qemuxml2argvdata/video-multiple-primaries.xml
index 977227c5ff..dedfeeebc3 100644
--- a/tests/qemuxml2argvdata/video-multiple-primaries.xml
+++ b/tests/qemuxml2argvdata/video-multiple-primaries.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source file='/var/lib/libvirt/images/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/video-none-device.args
b/tests/qemuxml2argvdata/video-none-device.args
index 8cd659c9ec..1ea72106d7 100644
--- a/tests/qemuxml2argvdata/video-none-device.args
+++ b/tests/qemuxml2argvdata/video-none-device.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/video-none-device.xml
b/tests/qemuxml2argvdata/video-none-device.xml
index a7d4d7d3c4..82b33009a2 100644
--- a/tests/qemuxml2argvdata/video-none-device.xml
+++ b/tests/qemuxml2argvdata/video-none-device.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
index b6113e36be..62782829ab 100644
--- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml
b/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml
index d52fdf0fa0..5d0fa86708 100644
--- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml
+++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source file='/var/lib/libvirt/images/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/video-qxl-device.args
b/tests/qemuxml2argvdata/video-qxl-device.args
index e62f524b11..018aa11299 100644
--- a/tests/qemuxml2argvdata/video-qxl-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-device.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/video-qxl-device.xml
b/tests/qemuxml2argvdata/video-qxl-device.xml
index d52fdf0fa0..5d0fa86708 100644
--- a/tests/qemuxml2argvdata/video-qxl-device.xml
+++ b/tests/qemuxml2argvdata/video-qxl-device.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source file='/var/lib/libvirt/images/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args
b/tests/qemuxml2argvdata/video-qxl-heads.args
index fc70ff0fd5..9c063e4ee6 100644
--- a/tests/qemuxml2argvdata/video-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-qxl-heads.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/video-qxl-heads.xml
b/tests/qemuxml2argvdata/video-qxl-heads.xml
index 9601d671fb..8ce892d557 100644
--- a/tests/qemuxml2argvdata/video-qxl-heads.xml
+++ b/tests/qemuxml2argvdata/video-qxl-heads.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args
b/tests/qemuxml2argvdata/video-qxl-noheads.args
index 08272ecc30..7cec45cb49 100644
--- a/tests/qemuxml2argvdata/video-qxl-noheads.args
+++ b/tests/qemuxml2argvdata/video-qxl-noheads.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.xml
b/tests/qemuxml2argvdata/video-qxl-noheads.xml
index f29d1284cd..80e5d25ff9 100644
--- a/tests/qemuxml2argvdata/video-qxl-noheads.xml
+++ b/tests/qemuxml2argvdata/video-qxl-noheads.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args
b/tests/qemuxml2argvdata/video-qxl-resolution.args
index 23501a435c..6343d15e6b 100644
--- a/tests/qemuxml2argvdata/video-qxl-resolution.args
+++ b/tests/qemuxml2argvdata/video-qxl-resolution.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.xml
b/tests/qemuxml2argvdata/video-qxl-resolution.xml
index 020c2a3fe8..5715f9daa4 100644
--- a/tests/qemuxml2argvdata/video-qxl-resolution.xml
+++ b/tests/qemuxml2argvdata/video-qxl-resolution.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
index ac5af7c3ee..9c125f24e4 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml
b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml
index 5b9427afd8..3db63d5476 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source file='/var/lib/libvirt/images/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args
b/tests/qemuxml2argvdata/video-qxl-sec-device.args
index c835722ee8..bab9844498 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.xml
b/tests/qemuxml2argvdata/video-qxl-sec-device.xml
index 5b9427afd8..3db63d5476 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device.xml
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source file='/var/lib/libvirt/images/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
index 34bd93891b..92de05bf2c 100644
--- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.xml
b/tests/qemuxml2argvdata/video-vga-device-vgamem.xml
index 7e2080af0d..6731b4ae3c 100644
--- a/tests/qemuxml2argvdata/video-vga-device-vgamem.xml
+++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source file='/var/lib/libvirt/images/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/video-vga-device.args
b/tests/qemuxml2argvdata/video-vga-device.args
index ef019414d2..8277171a78 100644
--- a/tests/qemuxml2argvdata/video-vga-device.args
+++ b/tests/qemuxml2argvdata/video-vga-device.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/video-vga-device.xml
b/tests/qemuxml2argvdata/video-vga-device.xml
index 7e2080af0d..6731b4ae3c 100644
--- a/tests/qemuxml2argvdata/video-vga-device.xml
+++ b/tests/qemuxml2argvdata/video-vga-device.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source file='/var/lib/libvirt/images/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
index fc70ff0fd5..9c063e4ee6 100644
--- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.xml
b/tests/qemuxml2argvdata/video-vga-qxl-heads.xml
index 9601d671fb..8ce892d557 100644
--- a/tests/qemuxml2argvdata/video-vga-qxl-heads.xml
+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
index 284c924e27..46aa2ebc30 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.xml
b/tests/qemuxml2argvdata/video-virtio-gpu-device.xml
index a9354d77a2..103ddd9894 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-device.xml
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source file='/var/lib/libvirt/images/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
index e0a0a6627f..88ede23a04 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml
b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml
index 9c46bfb4eb..6c9ebe89f4 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source file='/var/lib/libvirt/images/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
index c50b218e6d..dd02a3aea3 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml
b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml
index 2c084224dd..ea63df9514 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source file='/var/lib/libvirt/images/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
index ad9d03bdce..c4b373e48b 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml
b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml
index 97da27deed..3ece016546 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source file='/var/lib/libvirt/images/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args
b/tests/qemuxml2argvdata/video-virtio-vga.args
index 71ee079100..2c9acd9422 100644
--- a/tests/qemuxml2argvdata/video-virtio-vga.args
+++ b/tests/qemuxml2argvdata/video-virtio-vga.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/video-virtio-vga.xml
b/tests/qemuxml2argvdata/video-virtio-vga.xml
index a9354d77a2..103ddd9894 100644
--- a/tests/qemuxml2argvdata/video-virtio-vga.xml
+++ b/tests/qemuxml2argvdata/video-virtio-vga.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source file='/var/lib/libvirt/images/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args
b/tests/qemuxml2argvdata/virtio-input-passthrough.args
index 46915f9d37..ba4ba35f50 100644
--- a/tests/qemuxml2argvdata/virtio-input-passthrough.args
+++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.xml
b/tests/qemuxml2argvdata/virtio-input-passthrough.xml
index da20214f18..d57d311749 100644
--- a/tests/qemuxml2argvdata/virtio-input-passthrough.xml
+++ b/tests/qemuxml2argvdata/virtio-input-passthrough.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='passthrough' bus='virtio'>
diff --git a/tests/qemuxml2argvdata/virtio-input.args
b/tests/qemuxml2argvdata/virtio-input.args
index b689ed9d97..4aa488a101 100644
--- a/tests/qemuxml2argvdata/virtio-input.args
+++ b/tests/qemuxml2argvdata/virtio-input.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/virtio-input.xml
b/tests/qemuxml2argvdata/virtio-input.xml
index a464639eb6..6f07f7b8df 100644
--- a/tests/qemuxml2argvdata/virtio-input.xml
+++ b/tests/qemuxml2argvdata/virtio-input.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='virtio'/>
diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args
b/tests/qemuxml2argvdata/virtio-rng-default.args
index 078eb058aa..a3a33be54f 100644
--- a/tests/qemuxml2argvdata/virtio-rng-default.args
+++ b/tests/qemuxml2argvdata/virtio-rng-default.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/virtio-rng-default.xml
b/tests/qemuxml2argvdata/virtio-rng-default.xml
index b3e3dbfe39..c7192e1b03 100644
--- a/tests/qemuxml2argvdata/virtio-rng-default.xml
+++ b/tests/qemuxml2argvdata/virtio-rng-default.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<memballoon model='virtio'/>
<rng model='virtio'>
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-crash.xml
b/tests/qemuxml2argvdata/virtio-rng-egd-crash.xml
index fea626639a..aca156d0d8 100644
--- a/tests/qemuxml2argvdata/virtio-rng-egd-crash.xml
+++ b/tests/qemuxml2argvdata/virtio-rng-egd-crash.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<memballoon model='virtio'/>
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args
b/tests/qemuxml2argvdata/virtio-rng-egd.args
index 4811003393..befc02c6e4 100644
--- a/tests/qemuxml2argvdata/virtio-rng-egd.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.xml
b/tests/qemuxml2argvdata/virtio-rng-egd.xml
index 8e446f2bf9..d8ca7525f7 100644
--- a/tests/qemuxml2argvdata/virtio-rng-egd.xml
+++ b/tests/qemuxml2argvdata/virtio-rng-egd.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args
b/tests/qemuxml2argvdata/virtio-rng-multiple.args
index 4ab70dc84c..3dc689d25c 100644
--- a/tests/qemuxml2argvdata/virtio-rng-multiple.args
+++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.xml
b/tests/qemuxml2argvdata/virtio-rng-multiple.xml
index 3c0e2a7463..4b81f36cbf 100644
--- a/tests/qemuxml2argvdata/virtio-rng-multiple.xml
+++ b/tests/qemuxml2argvdata/virtio-rng-multiple.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<memballoon model='virtio'/>
diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args
b/tests/qemuxml2argvdata/virtio-rng-random.args
index d44f474c1b..e4c87f9b86 100644
--- a/tests/qemuxml2argvdata/virtio-rng-random.args
+++ b/tests/qemuxml2argvdata/virtio-rng-random.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/virtio-rng-random.xml
b/tests/qemuxml2argvdata/virtio-rng-random.xml
index 738ab13d23..a6104dca4e 100644
--- a/tests/qemuxml2argvdata/virtio-rng-random.xml
+++ b/tests/qemuxml2argvdata/virtio-rng-random.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args
b/tests/qemuxml2argvdata/vmcoreinfo.args
index ec5ada5db7..e9f0ec94e1 100644
--- a/tests/qemuxml2argvdata/vmcoreinfo.args
+++ b/tests/qemuxml2argvdata/vmcoreinfo.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/vmcoreinfo.xml
b/tests/qemuxml2argvdata/vmcoreinfo.xml
index f00109c5fd..b2ef1896f5 100644
--- a/tests/qemuxml2argvdata/vmcoreinfo.xml
+++ b/tests/qemuxml2argvdata/vmcoreinfo.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<features>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2xmloutdata/balloon-device-auto.xml
b/tests/qemuxml2xmloutdata/balloon-device-auto.xml
index 4c58641aca..3480561192 100644
--- a/tests/qemuxml2xmloutdata/balloon-device-auto.xml
+++ b/tests/qemuxml2xmloutdata/balloon-device-auto.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/balloon-device-period.xml
b/tests/qemuxml2xmloutdata/balloon-device-period.xml
index a6c6d6db67..2c4409c3e5 100644
--- a/tests/qemuxml2xmloutdata/balloon-device-period.xml
+++ b/tests/qemuxml2xmloutdata/balloon-device-period.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/blkiotune-device.xml
b/tests/qemuxml2xmloutdata/blkiotune-device.xml
index 6ac1464c65..917fcb18ae 100644
--- a/tests/qemuxml2xmloutdata/blkiotune-device.xml
+++ b/tests/qemuxml2xmloutdata/blkiotune-device.xml
@@ -24,7 +24,7 @@
</blkiotune>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -32,7 +32,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/blkiotune.xml
b/tests/qemuxml2xmloutdata/blkiotune.xml
index 6eb9df13f3..087b18fa8d 100644
--- a/tests/qemuxml2xmloutdata/blkiotune.xml
+++ b/tests/qemuxml2xmloutdata/blkiotune.xml
@@ -8,7 +8,7 @@
</blkiotune>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/channel-guestfwd.xml
b/tests/qemuxml2xmloutdata/channel-guestfwd.xml
index acaab47946..ef2932b0ca 100644
--- a/tests/qemuxml2xmloutdata/channel-guestfwd.xml
+++ b/tests/qemuxml2xmloutdata/channel-guestfwd.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
index ec82bacea5..4011ab5034 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
index ef87c7727c..285ac5947a 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
index 598241d01b..205a88b64a 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio.xml
b/tests/qemuxml2xmloutdata/channel-virtio.xml
index a90679eafe..515746b44c 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/clock-catchup.xml
b/tests/qemuxml2xmloutdata/clock-catchup.xml
index 196e41b4a7..b765b7e46b 100644
--- a/tests/qemuxml2xmloutdata/clock-catchup.xml
+++ b/tests/qemuxml2xmloutdata/clock-catchup.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'>
@@ -23,7 +23,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/clock-localtime.xml
b/tests/qemuxml2xmloutdata/clock-localtime.xml
index 1360343b3e..164c1c9192 100644
--- a/tests/qemuxml2xmloutdata/clock-localtime.xml
+++ b/tests/qemuxml2xmloutdata/clock-localtime.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='localtime'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
index 0f106073a9..1eabd0a87f 100644
--- a/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
+++ b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>6</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
<features>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/clock-utc.xml
b/tests/qemuxml2xmloutdata/clock-utc.xml
index 95f886d23b..b41600b100 100644
--- a/tests/qemuxml2xmloutdata/clock-utc.xml
+++ b/tests/qemuxml2xmloutdata/clock-utc.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/console-compat2.xml
b/tests/qemuxml2xmloutdata/console-compat2.xml
index e943ef6e28..88b8f73f8f 100644
--- a/tests/qemuxml2xmloutdata/console-compat2.xml
+++ b/tests/qemuxml2xmloutdata/console-compat2.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/console-virtio-many.xml
b/tests/qemuxml2xmloutdata/console-virtio-many.xml
index 5d3e551aa7..be11dc68b9 100644
--- a/tests/qemuxml2xmloutdata/console-virtio-many.xml
+++ b/tests/qemuxml2xmloutdata/console-virtio-many.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/console-virtio.xml
b/tests/qemuxml2xmloutdata/console-virtio.xml
index 491f00687a..a14ba28c8d 100644
--- a/tests/qemuxml2xmloutdata/console-virtio.xml
+++ b/tests/qemuxml2xmloutdata/console-virtio.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
b/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
index c3068c8c93..03294b7a6c 100644
--- a/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/>
<source file='/tmp/HostVG/QEMUGuest1-snap'/>
diff --git a/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
index e4fcb0c6ce..1803b844f8 100644
--- a/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2'/>
<source file='/tmp/HostVG/QEMUGuest1-snap'/>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-active.xml
b/tests/qemuxml2xmloutdata/disk-mirror-active.xml
index 5a02198f97..732054c65c 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-active.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
index 5d2caa5fca..ae96a63a3b 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
b/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
index 34ac337537..ecff3883c2 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
index c957f8b45c..e0deb1deda 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-listen-network.xml
b/tests/qemuxml2xmloutdata/graphics-listen-network.xml
index e6ee05d97a..f3dab792ce 100644
--- a/tests/qemuxml2xmloutdata/graphics-listen-network.xml
+++ b/tests/qemuxml2xmloutdata/graphics-listen-network.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
b/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
index cf01ea5d8b..2df6a44540 100644
--- a/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
+++ b/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml
b/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml
index 6c5043d8eb..8076df3ef4 100644
--- a/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml
+++ b/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-sdl.xml
b/tests/qemuxml2xmloutdata/graphics-sdl.xml
index a21d87c2a5..7516c8686a 100644
--- a/tests/qemuxml2xmloutdata/graphics-sdl.xml
+++ b/tests/qemuxml2xmloutdata/graphics-sdl.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
b/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
index 48a1c87cae..bbcf3edde7 100644
--- a/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
index a3a9a0f348..ca83bbcbe0 100644
--- a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
index 4948b5e8cb..2f05bd49d1 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
index 55d31c80ee..40330a95c3 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
index 0e8e8930f9..f0856fcfc3 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
index dbbe51946e..59f2c8449e 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio.xml
b/tests/qemuxml2xmloutdata/hostdev-vfio.xml
index 7d0433eb12..03c836a846 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
diff --git a/tests/qemuxml2xmloutdata/input-usbmouse.xml
b/tests/qemuxml2xmloutdata/input-usbmouse.xml
index d7646efce2..554e1616d1 100644
--- a/tests/qemuxml2xmloutdata/input-usbmouse.xml
+++ b/tests/qemuxml2xmloutdata/input-usbmouse.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/input-usbtablet.xml
b/tests/qemuxml2xmloutdata/input-usbtablet.xml
index add2908f82..f5ad2cdcd8 100644
--- a/tests/qemuxml2xmloutdata/input-usbtablet.xml
+++ b/tests/qemuxml2xmloutdata/input-usbtablet.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/kvmclock.xml
b/tests/qemuxml2xmloutdata/kvmclock.xml
index 0152c59e47..809e7b3295 100644
--- a/tests/qemuxml2xmloutdata/kvmclock.xml
+++ b/tests/qemuxml2xmloutdata/kvmclock.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>6</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
<features>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/lease.xml b/tests/qemuxml2xmloutdata/lease.xml
index a8d358d08f..38d4c5c232 100644
--- a/tests/qemuxml2xmloutdata/lease.xml
+++ b/tests/qemuxml2xmloutdata/lease.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219200</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/machine-core-off.xml
b/tests/qemuxml2xmloutdata/machine-core-off.xml
index faae1accb0..77527bfe64 100644
--- a/tests/qemuxml2xmloutdata/machine-core-off.xml
+++ b/tests/qemuxml2xmloutdata/machine-core-off.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/machine-core-on.xml
b/tests/qemuxml2xmloutdata/machine-core-on.xml
index d3d15a557e..025b88f2de 100644
--- a/tests/qemuxml2xmloutdata/machine-core-on.xml
+++ b/tests/qemuxml2xmloutdata/machine-core-on.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
index f886ee2228..23f213dab0 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
@@ -6,7 +6,7 @@
<currentMemory unit='KiB'>1267710</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<idmap>
@@ -24,7 +24,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.xml
b/tests/qemuxml2xmloutdata/memory-hotplug.xml
index 9545378508..593542072a 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug.xml
@@ -6,7 +6,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static' cpuset='0-1'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -20,7 +20,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/memorybacking-set.xml
b/tests/qemuxml2xmloutdata/memorybacking-set.xml
index 7c9ddf31dc..c5c64e3f1a 100644
--- a/tests/qemuxml2xmloutdata/memorybacking-set.xml
+++ b/tests/qemuxml2xmloutdata/memorybacking-set.xml
@@ -10,7 +10,7 @@
</memoryBacking>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/memorybacking-unset.xml
b/tests/qemuxml2xmloutdata/memorybacking-unset.xml
index 2f7e8ac1ce..2753412d32 100644
--- a/tests/qemuxml2xmloutdata/memorybacking-unset.xml
+++ b/tests/qemuxml2xmloutdata/memorybacking-unset.xml
@@ -10,7 +10,7 @@
</memoryBacking>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/memtune-unlimited.xml
b/tests/qemuxml2xmloutdata/memtune-unlimited.xml
index 20eff94533..032ddfc48d 100644
--- a/tests/qemuxml2xmloutdata/memtune-unlimited.xml
+++ b/tests/qemuxml2xmloutdata/memtune-unlimited.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/memtune.xml b/tests/qemuxml2xmloutdata/memtune.xml
index 53dae40355..ed6992ffde 100644
--- a/tests/qemuxml2xmloutdata/memtune.xml
+++ b/tests/qemuxml2xmloutdata/memtune.xml
@@ -10,7 +10,7 @@
</memtune>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/metadata-duplicate.xml
b/tests/qemuxml2xmloutdata/metadata-duplicate.xml
index 12c246f355..d77f4af6e1 100644
--- a/tests/qemuxml2xmloutdata/metadata-duplicate.xml
+++ b/tests/qemuxml2xmloutdata/metadata-duplicate.xml
@@ -9,7 +9,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -17,7 +17,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/metadata.xml
b/tests/qemuxml2xmloutdata/metadata.xml
index 12c246f355..d77f4af6e1 100644
--- a/tests/qemuxml2xmloutdata/metadata.xml
+++ b/tests/qemuxml2xmloutdata/metadata.xml
@@ -9,7 +9,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -17,7 +17,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/migrate.xml b/tests/qemuxml2xmloutdata/migrate.xml
index 7f512929aa..82f5c9f9e8 100644
--- a/tests/qemuxml2xmloutdata/migrate.xml
+++ b/tests/qemuxml2xmloutdata/migrate.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/minimal.xml b/tests/qemuxml2xmloutdata/minimal.xml
index 447bfbae2d..baed180b00 100644
--- a/tests/qemuxml2xmloutdata/minimal.xml
+++ b/tests/qemuxml2xmloutdata/minimal.xml
@@ -10,7 +10,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/misc-acpi.xml
b/tests/qemuxml2xmloutdata/misc-acpi.xml
index 5c7a1c7494..e92fa21b65 100644
--- a/tests/qemuxml2xmloutdata/misc-acpi.xml
+++ b/tests/qemuxml2xmloutdata/misc-acpi.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<features>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/misc-disable-s3.xml
b/tests/qemuxml2xmloutdata/misc-disable-s3.xml
index 0aa5a98159..48ce6745db 100644
--- a/tests/qemuxml2xmloutdata/misc-disable-s3.xml
+++ b/tests/qemuxml2xmloutdata/misc-disable-s3.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -16,7 +16,7 @@
<suspend-to-mem enabled='no'/>
</pm>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/misc-disable-suspends.xml
b/tests/qemuxml2xmloutdata/misc-disable-suspends.xml
index 10241eb72f..0a58fa986b 100644
--- a/tests/qemuxml2xmloutdata/misc-disable-suspends.xml
+++ b/tests/qemuxml2xmloutdata/misc-disable-suspends.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -17,7 +17,7 @@
<suspend-to-disk enabled='no'/>
</pm>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/misc-enable-s4.xml
b/tests/qemuxml2xmloutdata/misc-enable-s4.xml
index 464aa2482e..7e8f8d5a32 100644
--- a/tests/qemuxml2xmloutdata/misc-enable-s4.xml
+++ b/tests/qemuxml2xmloutdata/misc-enable-s4.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -16,7 +16,7 @@
<suspend-to-disk enabled='yes'/>
</pm>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/misc-uuid.xml
b/tests/qemuxml2xmloutdata/misc-uuid.xml
index 5c7a1c7494..e92fa21b65 100644
--- a/tests/qemuxml2xmloutdata/misc-uuid.xml
+++ b/tests/qemuxml2xmloutdata/misc-uuid.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<features>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/net-eth-hostip.xml
b/tests/qemuxml2xmloutdata/net-eth-hostip.xml
index f860850ab0..08f4e2d13f 100644
--- a/tests/qemuxml2xmloutdata/net-eth-hostip.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-hostip.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/net-eth-ifname.xml
b/tests/qemuxml2xmloutdata/net-eth-ifname.xml
index d15eb3d27a..d60e4c345e 100644
--- a/tests/qemuxml2xmloutdata/net-eth-ifname.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-ifname.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
b/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
index 419bfaa0e7..216b745428 100644
--- a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/net-eth.xml b/tests/qemuxml2xmloutdata/net-eth.xml
index 96ce9fdbf5..15e49c152b 100644
--- a/tests/qemuxml2xmloutdata/net-eth.xml
+++ b/tests/qemuxml2xmloutdata/net-eth.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
index f92256d8ca..8a5842c55a 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
@@ -5,14 +5,14 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
index 0e5e5814ac..5d9696afd5 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev.xml
b/tests/qemuxml2xmloutdata/net-hostdev.xml
index a9873e4af5..3e751155bd 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/net-midonet.xml
b/tests/qemuxml2xmloutdata/net-midonet.xml
index 17a1239ac1..2ddb6b8ad8 100644
--- a/tests/qemuxml2xmloutdata/net-midonet.xml
+++ b/tests/qemuxml2xmloutdata/net-midonet.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/net-openvswitch.xml
b/tests/qemuxml2xmloutdata/net-openvswitch.xml
index d35818435b..ebc11a4542 100644
--- a/tests/qemuxml2xmloutdata/net-openvswitch.xml
+++ b/tests/qemuxml2xmloutdata/net-openvswitch.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/net-server.xml
b/tests/qemuxml2xmloutdata/net-server.xml
index 6878ec8c0a..9be587229c 100644
--- a/tests/qemuxml2xmloutdata/net-server.xml
+++ b/tests/qemuxml2xmloutdata/net-server.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/net-udp.xml b/tests/qemuxml2xmloutdata/net-udp.xml
index ce1eb5460c..65eaabdaf5 100644
--- a/tests/qemuxml2xmloutdata/net-udp.xml
+++ b/tests/qemuxml2xmloutdata/net-udp.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-device.xml
b/tests/qemuxml2xmloutdata/net-virtio-device.xml
index 9827329be7..bff89186a9 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-device.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-device.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
index decf71b86c..7932c50269 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest7'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
index 0402ed8aff..11341c7d85 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
index b0e5fc37b5..7474141a6e 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
b/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
index 6359fd54c7..99da3de48b 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
b/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
index 35fd3bc82a..05a1dd1d2f 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio.xml
b/tests/qemuxml2xmloutdata/net-virtio.xml
index 862c5bd927..a39b9bb1df 100644
--- a/tests/qemuxml2xmloutdata/net-virtio.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/nosharepages.xml
b/tests/qemuxml2xmloutdata/nosharepages.xml
index 6610d7df87..47157a59bd 100644
--- a/tests/qemuxml2xmloutdata/nosharepages.xml
+++ b/tests/qemuxml2xmloutdata/nosharepages.xml
@@ -8,7 +8,7 @@
</memoryBacking>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
index fa81660b34..8d0cdb7cc4 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
@@ -8,7 +8,7 @@
<memory mode='interleave' placement='auto'/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -19,7 +19,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
index 19855ba207..7d25196914 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
@@ -8,7 +8,7 @@
<memory mode='interleave' placement='auto'/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -19,7 +19,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
index 114a5ed2db..d905ec2978 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
@@ -8,7 +8,7 @@
<memory mode='strict' placement='auto'/>
</numatune>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -19,7 +19,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
index 5fbebbde7f..83be2dd639 100644
--- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/pci-rom.xml b/tests/qemuxml2xmloutdata/pci-rom.xml
index 3056c2827f..f5f19669fa 100644
--- a/tests/qemuxml2xmloutdata/pci-rom.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/>
diff --git a/tests/qemuxml2xmloutdata/pmu-feature-off.xml
b/tests/qemuxml2xmloutdata/pmu-feature-off.xml
index 1aaa377290..77bf61d1e2 100644
--- a/tests/qemuxml2xmloutdata/pmu-feature-off.xml
+++ b/tests/qemuxml2xmloutdata/pmu-feature-off.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>6</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
<features>
@@ -17,7 +17,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/pmu-feature.xml
b/tests/qemuxml2xmloutdata/pmu-feature.xml
index bd87c33bd5..32a1813f6c 100644
--- a/tests/qemuxml2xmloutdata/pmu-feature.xml
+++ b/tests/qemuxml2xmloutdata/pmu-feature.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>6</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
<features>
@@ -17,7 +17,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
b/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
index 54a41c5968..1a8efd598d 100644
--- a/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
+++ b/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
b/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
index 88f0268b8d..74b8c753e5 100644
--- a/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
+++ b/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>6</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
<bios rebootTimeout='-1'/>
</os>
@@ -14,7 +14,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
b/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
index 73505cbffd..3b34928f2b 100644
--- a/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
+++ b/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>6</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
<bios rebootTimeout='128'/>
</os>
@@ -14,7 +14,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/restore-v2.xml
b/tests/qemuxml2xmloutdata/restore-v2.xml
index 7f512929aa..82f5c9f9e8 100644
--- a/tests/qemuxml2xmloutdata/restore-v2.xml
+++ b/tests/qemuxml2xmloutdata/restore-v2.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
index 7fc1c0f027..b5cc10d530 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
index 63a5e1f9d8..b571707422 100644
--- a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
index 892438f4c9..5fa8455f77 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
index 892438f4c9..5fa8455f77 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
index 2e97312d91..a2b4a3e19e 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
index 11e5fbe489..56f15db911 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
index 2e97312d91..a2b4a3e19e 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-none.xml
b/tests/qemuxml2xmloutdata/seclabel-none.xml
index 2e97312d91..a2b4a3e19e 100644
--- a/tests/qemuxml2xmloutdata/seclabel-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-none.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
index 4773d23725..3cc87b0b1f 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
index cdf0461180..ae03203ad3 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static.xml
b/tests/qemuxml2xmloutdata/seclabel-static.xml
index 415f28e6fe..391b8b57f8 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
index 937fcfe6f5..b9241e6933 100644
--- a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
+++ b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
index c3b3e1bd8f..a7c3e6cb22 100644
--- a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
+++ b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/shmem.xml b/tests/qemuxml2xmloutdata/shmem.xml
index b4bcc666d2..bdd273de17 100644
--- a/tests/qemuxml2xmloutdata/shmem.xml
+++ b/tests/qemuxml2xmloutdata/shmem.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/smartcard-controller.xml
b/tests/qemuxml2xmloutdata/smartcard-controller.xml
index 55c4751853..d606a10cf8 100644
--- a/tests/qemuxml2xmloutdata/smartcard-controller.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-controller.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='ccid' index='0'/>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
b/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
index f14f64bfa0..2a6a697f56 100644
--- a/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
b/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
index 47e7302a1b..ef776fd659 100644
--- a/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/smartcard-host.xml
b/tests/qemuxml2xmloutdata/smartcard-host.xml
index f8ce1a0185..c8bc4fae88 100644
--- a/tests/qemuxml2xmloutdata/smartcard-host.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
b/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
index f1463f2b0d..656c41bb6d 100644
--- a/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
b/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
index ecd671c9cc..e3d66b5ebf 100644
--- a/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
index b1daa12c44..f4febb1784 100644
--- a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
+++ b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
@@ -35,7 +35,7 @@
</baseBoard>
</sysinfo>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
<smbios mode='sysinfo'/>
</os>
@@ -44,7 +44,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/smbios.xml b/tests/qemuxml2xmloutdata/smbios.xml
index 786bcb02a5..2207fab666 100644
--- a/tests/qemuxml2xmloutdata/smbios.xml
+++ b/tests/qemuxml2xmloutdata/smbios.xml
@@ -40,7 +40,7 @@
</oemStrings>
</sysinfo>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
<smbios mode='sysinfo'/>
</os>
@@ -49,7 +49,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/smp.xml b/tests/qemuxml2xmloutdata/smp.xml
index 951a30bfd0..69126bfa7c 100644
--- a/tests/qemuxml2xmloutdata/smp.xml
+++ b/tests/qemuxml2xmloutdata/smp.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static' current='1'>2</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/usb-controller.xml
b/tests/qemuxml2xmloutdata/usb-controller.xml
index b088bd16d7..d551a5b7ed 100644
--- a/tests/qemuxml2xmloutdata/usb-controller.xml
+++ b/tests/qemuxml2xmloutdata/usb-controller.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
index 26b341b058..5d0f68c324 100644
--- a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
+++ b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='ich9-ehci1'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x7'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/usb-none.xml
b/tests/qemuxml2xmloutdata/usb-none.xml
index 9ec7d39b87..bc06548ad7 100644
--- a/tests/qemuxml2xmloutdata/usb-none.xml
+++ b/tests/qemuxml2xmloutdata/usb-none.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
b/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
index a13c7346cd..5071b6a3d9 100644
--- a/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
+++ b/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/usb-port-missing.xml
b/tests/qemuxml2xmloutdata/usb-port-missing.xml
index ce6b0b394e..def74a1ffc 100644
--- a/tests/qemuxml2xmloutdata/usb-port-missing.xml
+++ b/tests/qemuxml2xmloutdata/usb-port-missing.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
b/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
index 4e5ebca189..28764678d9 100644
--- a/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/usb-redir-filter.xml
b/tests/qemuxml2xmloutdata/usb-redir-filter.xml
index d857a89289..e78cb9de71 100644
--- a/tests/qemuxml2xmloutdata/usb-redir-filter.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir-filter.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='ich9-ehci1'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x7'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/usb-redir.xml
b/tests/qemuxml2xmloutdata/usb-redir.xml
index 95f4d6a1df..a972f811e4 100644
--- a/tests/qemuxml2xmloutdata/usb-redir.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='ich9-ehci1'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x7'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/video-none-device.xml
b/tests/qemuxml2xmloutdata/video-none-device.xml
index 841a95a511..1c6c417bc8 100644
--- a/tests/qemuxml2xmloutdata/video-none-device.xml
+++ b/tests/qemuxml2xmloutdata/video-none-device.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/video-qxl-heads.xml
b/tests/qemuxml2xmloutdata/video-qxl-heads.xml
index bfe8a9b846..9a8e1fca0b 100644
--- a/tests/qemuxml2xmloutdata/video-qxl-heads.xml
+++ b/tests/qemuxml2xmloutdata/video-qxl-heads.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
b/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
index 566773d949..6243e29075 100644
--- a/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
+++ b/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
b/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
index 827ed19153..c1fc9c7f67 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source file='/var/lib/libvirt/images/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml
b/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml
index 4e91b6152f..5a233f527c 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source file='/var/lib/libvirt/images/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
b/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
index 9d8cb40620..411462bebf 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source file='/var/lib/libvirt/images/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
b/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
index c4db021fe4..d26ada53a3 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='file' device='disk'>
<driver name='qemu' type='qcow2' cache='none'/>
<source file='/var/lib/libvirt/images/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
b/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
index 2ff6af9832..24f5c2d06b 100644
--- a/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
+++ b/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/virtio-input.xml
b/tests/qemuxml2xmloutdata/virtio-input.xml
index 313920e911..76f3b5122b 100644
--- a/tests/qemuxml2xmloutdata/virtio-input.xml
+++ b/tests/qemuxml2xmloutdata/virtio-input.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
b/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
index a903ada842..5127097e84 100644
--- a/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
+++ b/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-random.xml
b/tests/qemuxml2xmloutdata/virtio-rng-random.xml
index f7faa2fc4e..a089b5e702 100644
--- a/tests/qemuxml2xmloutdata/virtio-rng-random.xml
+++ b/tests/qemuxml2xmloutdata/virtio-rng-random.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
@@ -13,7 +13,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/vmcoreinfo.xml
b/tests/qemuxml2xmloutdata/vmcoreinfo.xml
index fa60ede67e..9e74938957 100644
--- a/tests/qemuxml2xmloutdata/vmcoreinfo.xml
+++ b/tests/qemuxml2xmloutdata/vmcoreinfo.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<features>
@@ -16,7 +16,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
--
2.41.0
8:04 a.m.
New subject: [PATCH 03/24] qemuxml2argvdata: Replace 'qemu-system-i386' by 'qemu-system-x86_64' in most test files
On a Thursday in 2023, Peter Krempa wrote:
Replace the emulator and architecture to x86_64, for all non-cpu
related
test cases.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/440fx-ide-address-conflict.xml | 4 ++--
tests/qemuxml2argvdata/440fx-wrong-root.xml | 4 ++--
tests/qemuxml2argvdata/balloon-device-auto.args | 2 +-
tests/qemuxml2argvdata/balloon-device-auto.xml | 4 ++--
[...]
tests/qemuxml2xmloutdata/virtio-input-passthrough.xml | 4
++--
tests/qemuxml2xmloutdata/virtio-input.xml | 4 ++--
tests/qemuxml2xmloutdata/virtio-rng-egd.xml | 4 ++--
tests/qemuxml2xmloutdata/virtio-rng-random.xml | 4 ++--
tests/qemuxml2xmloutdata/vmcoreinfo.xml | 4 ++--
553 files changed, 935 insertions(+), 935 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 04/24] qemuxml2(argv|xml)test: Convert certain tests to DO_TEST_CAPS_LATEST
Convert tests which use DO_TEST_NOCAPS in both tests and the
qemuxml2xml variant has a symlink back to the qemuxml2argv input file.
This is done to separate the conversion before a patch converts all
DO_TEST_NOCAPS variants in qemuxml2xmltest to use real capabilities.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...args => clock-realtime.x86_64-latest.args} | 14 +++---
tests/qemuxml2argvdata/clock-realtime.xml | 5 ++-
...gs => kvm-features-off.x86_64-latest.args} | 10 +++--
tests/qemuxml2argvdata/kvm-features-off.xml | 2 +-
...s.args => kvm-features.x86_64-latest.args} | 10 +++--
tests/qemuxml2argvdata/kvm-features.xml | 2 +-
tests/qemuxml2argvdata/net-user-addr.args | 35 ---------------
....args => net-user-addr.x86_64-latest.args} | 19 ++++----
tests/qemuxml2argvdata/net-user-addr.xml | 5 ++-
tests/qemuxml2argvdata/numatune-no-vcpu.args | 36 ---------------
.../numatune-no-vcpu.x86_64-latest.args | 44 +++++++++++++++++++
tests/qemuxml2argvdata/numatune-no-vcpu.xml | 5 ++-
.../serial-tcp-tlsx509-chardev-notls.xml | 5 ++-
...s => smbios-type-fwcfg.x86_64-latest.args} | 14 +++---
tests/qemuxml2argvdata/smbios-type-fwcfg.xml | 5 ++-
tests/qemuxml2argvtest.c | 14 +++---
...e.xml => clock-realtime.x86_64-latest.xml} | 0
...xml => kvm-features-off.x86_64-latest.xml} | 0
...res.xml => kvm-features.x86_64-latest.xml} | 0
...dr.xml => net-user-addr.x86_64-latest.xml} | 0
...xml => numatune-no-vcpu.x86_64-latest.xml} | 0
...p-tlsx509-chardev-notls.x86_64-latest.xml} | 0
...ml => smbios-type-fwcfg.x86_64-latest.xml} | 0
tests/qemuxml2xmltest.c | 14 +++---
24 files changed, 115 insertions(+), 124 deletions(-)
rename tests/qemuxml2argvdata/{clock-realtime.args =>
clock-realtime.x86_64-latest.args} (61%)
rename tests/qemuxml2argvdata/{kvm-features-off.args =>
kvm-features-off.x86_64-latest.args} (61%)
rename tests/qemuxml2argvdata/{kvm-features.args => kvm-features.x86_64-latest.args}
(60%)
delete mode 100644 tests/qemuxml2argvdata/net-user-addr.args
rename tests/qemuxml2argvdata/{serial-tcp-tlsx509-chardev-notls.args =>
net-user-addr.x86_64-latest.args} (56%)
delete mode 100644 tests/qemuxml2argvdata/numatune-no-vcpu.args
create mode 100644 tests/qemuxml2argvdata/numatune-no-vcpu.x86_64-latest.args
rename tests/qemuxml2argvdata/{smbios-type-fwcfg.args =>
smbios-type-fwcfg.x86_64-latest.args} (70%)
rename tests/qemuxml2xmloutdata/{clock-realtime.xml =>
clock-realtime.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{kvm-features-off.xml =>
kvm-features-off.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{kvm-features.xml => kvm-features.x86_64-latest.xml}
(100%)
rename tests/qemuxml2xmloutdata/{net-user-addr.xml => net-user-addr.x86_64-latest.xml}
(100%)
rename tests/qemuxml2xmloutdata/{numatune-no-vcpu.xml =>
numatune-no-vcpu.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{serial-tcp-tlsx509-chardev-notls.xml =>
serial-tcp-tlsx509-chardev-notls.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{smbios-type-fwcfg.xml =>
smbios-type-fwcfg.x86_64-latest.xml} (100%)
diff --git a/tests/qemuxml2argvdata/clock-realtime.args
b/tests/qemuxml2argvdata/clock-realtime.x86_64-latest.args
similarity index 61%
rename from tests/qemuxml2argvdata/clock-realtime.args
rename to tests/qemuxml2argvdata/clock-realtime.x86_64-latest.args
index 6e1339e4d1..94f18cf183 100644
--- a/tests/qemuxml2argvdata/clock-realtime.args
+++ b/tests/qemuxml2argvdata/clock-realtime.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -23,12 +25,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc,clock=rt \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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,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=0x3 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-realtime.xml
b/tests/qemuxml2argvdata/clock-realtime.xml
index 5539095638..1c545ab827 100644
--- a/tests/qemuxml2argvdata/clock-realtime.xml
+++ b/tests/qemuxml2argvdata/clock-realtime.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'>
<timer name='rtc' track='realtime'/>
</clock>
@@ -22,7 +25,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2argvdata/kvm-features-off.args
b/tests/qemuxml2argvdata/kvm-features-off.x86_64-latest.args
similarity index 61%
rename from tests/qemuxml2argvdata/kvm-features-off.args
rename to tests/qemuxml2argvdata/kvm-features-off.x86_64-latest.args
index 61f5221adc..31a2022306 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.args
+++ b/tests/qemuxml2argvdata/kvm-features-off.x86_64-latest.args
@@ -9,11 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
-accel kvm \
--cpu host,kvm-pv-ipi=off \
+-cpu host,migratable=off,kvm-pv-ipi=off \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -25,6 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvm-features-off.xml
b/tests/qemuxml2argvdata/kvm-features-off.xml
index f22e75e8aa..3cd4ff18f2 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.xml
+++ b/tests/qemuxml2argvdata/kvm-features-off.xml
@@ -25,7 +25,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/kvm-features.args
b/tests/qemuxml2argvdata/kvm-features.x86_64-latest.args
similarity index 60%
rename from tests/qemuxml2argvdata/kvm-features.args
rename to tests/qemuxml2argvdata/kvm-features.x86_64-latest.args
index 72ac9bc0ed..955db67eb4 100644
--- a/tests/qemuxml2argvdata/kvm-features.args
+++ b/tests/qemuxml2argvdata/kvm-features.x86_64-latest.args
@@ -9,11 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
-accel kvm,dirty-ring-size=4096 \
--cpu host,kvm=off,kvm-hint-dedicated=on,kvm-poll-control=on \
+-cpu host,migratable=off,kvm=off,kvm-hint-dedicated=on,kvm-poll-control=on \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -25,6 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvm-features.xml
b/tests/qemuxml2argvdata/kvm-features.xml
index cd0f170ed3..78091064b1 100644
--- a/tests/qemuxml2argvdata/kvm-features.xml
+++ b/tests/qemuxml2argvdata/kvm-features.xml
@@ -25,7 +25,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/net-user-addr.args
b/tests/qemuxml2argvdata/net-user-addr.args
deleted file mode 100644
index a96e9fe3f1..0000000000
--- a/tests/qemuxml2argvdata/net-user-addr.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev
user,net=172.17.2.0/24,ipv6-prefix=2001:db8:ac10:fd01::,ipv6-prefixlen=64,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
b/tests/qemuxml2argvdata/net-user-addr.x86_64-latest.args
similarity index 56%
rename from tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
rename to tests/qemuxml2argvdata/net-user-addr.x86_64-latest.args
index d159e4d3a4..df5b4c63ab 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
+++ b/tests/qemuxml2argvdata/net-user-addr.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -23,16 +25,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev udp,id=charserial0,host=127.0.0.1,port=2222,localaddr=127.0.0.1,localport=1111
\
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--chardev socket,id=charserial1,host=127.0.0.1,port=5555 \
--device isa-serial,chardev=charserial1,id=serial1,index=1 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-netdev
'{"type":"user","net":"172.17.2.0/24","ipv6-prefix":"2001:db8:ac10:fd01::","ipv6-prefixlen":64,"id":"hostnet0"}'
\
+-device
'{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x3"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-user-addr.xml
b/tests/qemuxml2argvdata/net-user-addr.xml
index dd42c4451e..7b576a6256 100644
--- a/tests/qemuxml2argvdata/net-user-addr.xml
+++ b/tests/qemuxml2argvdata/net-user-addr.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.args
b/tests/qemuxml2argvdata/numatune-no-vcpu.args
deleted file mode 100644
index 4a64ce4e22..0000000000
--- a/tests/qemuxml2argvdata/numatune-no-vcpu.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.cache \
-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
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=12582912k \
--overcommit mem-lock=off \
--smp 12,sockets=12,cores=1,threads=1 \
--numa node,nodeid=0,cpus=0-3,mem=2048 \
--numa node,nodeid=1,cpus=4-7,mem=2048 \
--numa node,nodeid=2,cpus=8-11,mem=2048 \
--numa node,nodeid=3,mem=2048 \
--numa node,nodeid=4,mem=2048 \
--numa node,nodeid=5,mem=2048 \
--uuid c7a5fdb2-cdaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--usb \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.x86_64-latest.args
b/tests/qemuxml2argvdata/numatune-no-vcpu.x86_64-latest.args
new file mode 100644
index 0000000000..0a1a8033aa
--- /dev/null
+++ b/tests/qemuxml2argvdata/numatune-no-vcpu.x86_64-latest.args
@@ -0,0 +1,44 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.cache \
+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
'{"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,acpi=on \
+-accel tcg \
+-cpu qemu64 \
+-m size=12582912k \
+-overcommit mem-lock=off \
+-smp 12,sockets=12,cores=1,threads=1 \
+-object
'{"qom-type":"memory-backend-ram","id":"ram-node0","size":2147483648}'
\
+-numa node,nodeid=0,cpus=0-3,memdev=ram-node0 \
+-object
'{"qom-type":"memory-backend-ram","id":"ram-node1","size":2147483648}'
\
+-numa node,nodeid=1,cpus=4-7,memdev=ram-node1 \
+-object
'{"qom-type":"memory-backend-ram","id":"ram-node2","size":2147483648}'
\
+-numa node,nodeid=2,cpus=8-11,memdev=ram-node2 \
+-object
'{"qom-type":"memory-backend-ram","id":"ram-node3","size":2147483648}'
\
+-numa node,nodeid=3,memdev=ram-node3 \
+-object
'{"qom-type":"memory-backend-ram","id":"ram-node4","size":2147483648}'
\
+-numa node,nodeid=4,memdev=ram-node4 \
+-object
'{"qom-type":"memory-backend-ram","id":"ram-node5","size":2147483648}'
\
+-numa node,nodeid=5,memdev=ram-node5 \
+-uuid c7a5fdb2-cdaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.xml
b/tests/qemuxml2argvdata/numatune-no-vcpu.xml
index 7d2627997c..2dedc7f118 100644
--- a/tests/qemuxml2argvdata/numatune-no-vcpu.xml
+++ b/tests/qemuxml2argvdata/numatune-no-vcpu.xml
@@ -13,7 +13,8 @@
<apic/>
<pae/>
</features>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<numa>
<cell id='0' cpus='0-3' memory='2097152'
unit='KiB'/>
<cell id='1' cpus='4-7' memory='2097152'
unit='KiB'/>
@@ -29,7 +30,7 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
index 16734d9cce..1ab6612546 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.args
b/tests/qemuxml2argvdata/smbios-type-fwcfg.x86_64-latest.args
similarity index 70%
rename from tests/qemuxml2argvdata/smbios-type-fwcfg.args
rename to tests/qemuxml2argvdata/smbios-type-fwcfg.x86_64-latest.args
index 160f79adfa..a9a0eae4f5 100644
--- a/tests/qemuxml2argvdata/smbios-type-fwcfg.args
+++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -28,12 +30,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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,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=0x3 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.xml
b/tests/qemuxml2argvdata/smbios-type-fwcfg.xml
index a0864ad2e1..6a4d3c3781 100644
--- a/tests/qemuxml2argvdata/smbios-type-fwcfg.xml
+++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.xml
@@ -35,6 +35,9 @@
<boot dev='hd'/>
<smbios mode='sysinfo'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -50,7 +53,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 3191dcb7c7..fdaea8e3f1 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1092,7 +1092,7 @@ mymain(void)
DO_TEST_NOCAPS("cpu-host-kvmclock");
DO_TEST("kvmclock", QEMU_CAPS_KVM);
DO_TEST("clock-timer-hyperv-rtc", QEMU_CAPS_KVM);
- DO_TEST_NOCAPS("clock-realtime");
+ DO_TEST_CAPS_LATEST("clock-realtime");
DO_TEST_CAPS_LATEST("clock-absolute");
DO_TEST_CAPS_LATEST("controller-usb-order");
@@ -1123,8 +1123,8 @@ mymain(void)
DO_TEST_CAPS_LATEST("hyperv-passthrough");
DO_TEST_CAPS_LATEST("hyperv-stimer-direct");
- DO_TEST_NOCAPS("kvm-features");
- DO_TEST_NOCAPS("kvm-features-off");
+ DO_TEST_CAPS_LATEST("kvm-features");
+ DO_TEST_CAPS_LATEST("kvm-features-off");
DO_TEST_NOCAPS("pmu-feature");
DO_TEST_NOCAPS("pmu-feature-off");
@@ -1381,7 +1381,7 @@ mymain(void)
DO_TEST_FAILURE_NOCAPS("net-vhostuser-fail");
DO_TEST_NOCAPS("net-user");
DO_TEST_CAPS_ARCH_LATEST_FULL("net-user", "x86_64", ARG_FLAGS,
FLAG_SLIRP_HELPER);
- DO_TEST_NOCAPS("net-user-addr");
+ DO_TEST_CAPS_LATEST("net-user-addr");
DO_TEST_CAPS_LATEST("net-user-passt");
DO_TEST_CAPS_VER("net-user-passt", "7.2.0");
DO_TEST_CAPS_LATEST_PARSE_ERROR("net-user-slirp-portforward");
@@ -1488,8 +1488,6 @@ mymain(void)
QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev-verify");
driver.config->chardevTLSx509verify = 0;
- DO_TEST("serial-tcp-tlsx509-chardev-notls",
- QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev-notls");
driver.config->chardevTLSx509secretUUID =
g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea");
DO_TEST("serial-tcp-tlsx509-secret-chardev",
@@ -1667,7 +1665,7 @@ mymain(void)
DO_TEST_NOCAPS("smbios");
DO_TEST_PARSE_ERROR_NOCAPS("smbios-date");
DO_TEST_PARSE_ERROR_NOCAPS("smbios-uuid-match");
- DO_TEST_NOCAPS("smbios-type-fwcfg");
+ DO_TEST_CAPS_LATEST("smbios-type-fwcfg");
DO_TEST_CAPS_LATEST("watchdog");
DO_TEST_CAPS_LATEST("watchdog-device");
@@ -1873,7 +1871,7 @@ mymain(void)
DO_TEST_NOCAPS("numatune-memnode-no-memory");
DO_TEST_NOCAPS("numatune-distances");
- DO_TEST_NOCAPS("numatune-no-vcpu");
+ DO_TEST_CAPS_LATEST("numatune-no-vcpu");
DO_TEST_CAPS_LATEST("numatune-hmat");
DO_TEST_CAPS_LATEST("numatune-hmat-none");
diff --git a/tests/qemuxml2xmloutdata/clock-realtime.xml
b/tests/qemuxml2xmloutdata/clock-realtime.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/clock-realtime.xml
rename to tests/qemuxml2xmloutdata/clock-realtime.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/kvm-features-off.xml
b/tests/qemuxml2xmloutdata/kvm-features-off.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/kvm-features-off.xml
rename to tests/qemuxml2xmloutdata/kvm-features-off.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/kvm-features.xml
b/tests/qemuxml2xmloutdata/kvm-features.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/kvm-features.xml
rename to tests/qemuxml2xmloutdata/kvm-features.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-user-addr.xml
b/tests/qemuxml2xmloutdata/net-user-addr.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-user-addr.xml
rename to tests/qemuxml2xmloutdata/net-user-addr.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/numatune-no-vcpu.xml
b/tests/qemuxml2xmloutdata/numatune-no-vcpu.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numatune-no-vcpu.xml
rename to tests/qemuxml2xmloutdata/numatune-no-vcpu.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-notls.xml
b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-notls.xml
rename to tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/smbios-type-fwcfg.xml
b/tests/qemuxml2xmloutdata/smbios-type-fwcfg.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/smbios-type-fwcfg.xml
rename to tests/qemuxml2xmloutdata/smbios-type-fwcfg.x86_64-latest.xml
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 14d083b467..b3ace80be9 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -238,7 +238,7 @@ mymain(void)
DO_TEST_NOCAPS("kvmclock");
DO_TEST_NOCAPS("clock-timer-hyperv-rtc");
DO_TEST_CAPS_ARCH_LATEST("clock-timer-armvtimer", "aarch64");
- DO_TEST_NOCAPS("clock-realtime");
+ DO_TEST_CAPS_LATEST("clock-realtime");
DO_TEST_CAPS_LATEST("clock-absolute");
DO_TEST_NOCAPS("cpu-eoi-disabled");
@@ -254,8 +254,8 @@ mymain(void)
DO_TEST_NOCAPS("hyperv-passthrough");
DO_TEST_NOCAPS("hyperv-stimer-direct");
- DO_TEST_NOCAPS("kvm-features");
- DO_TEST_NOCAPS("kvm-features-off");
+ DO_TEST_CAPS_LATEST("kvm-features");
+ DO_TEST_CAPS_LATEST("kvm-features-off");
DO_TEST_NOCAPS("pmu-feature");
DO_TEST_NOCAPS("pmu-feature-off");
@@ -426,7 +426,7 @@ mymain(void)
DO_TEST_NOCAPS("misc-uuid");
DO_TEST_NOCAPS("net-vhostuser");
DO_TEST_NOCAPS("net-user");
- DO_TEST_NOCAPS("net-user-addr");
+ DO_TEST_CAPS_LATEST("net-user-addr");
DO_TEST_CAPS_LATEST("net-user-passt");
DO_TEST_NOCAPS("net-virtio");
DO_TEST_NOCAPS("net-virtio-device");
@@ -462,7 +462,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("net-virtio-rss");
DO_TEST_NOCAPS("serial-tcp-tlsx509-chardev");
- DO_TEST_NOCAPS("serial-tcp-tlsx509-chardev-notls");
+ DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev-notls");
cfg->spiceTLS = true;
DO_TEST("serial-spiceport",
@@ -854,7 +854,7 @@ mymain(void)
DO_TEST_NOCAPS("numatune-memnode");
DO_TEST_NOCAPS("numatune-memnode-no-memory");
DO_TEST_NOCAPS("numatune-distances");
- DO_TEST_NOCAPS("numatune-no-vcpu");
+ DO_TEST_CAPS_LATEST("numatune-no-vcpu");
DO_TEST("numatune-hmat", QEMU_CAPS_NUMA_HMAT);
DO_TEST_CAPS_LATEST("numatune-hmat-none");
DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode");
@@ -915,7 +915,7 @@ mymain(void)
QEMU_CAPS_DEVICE_IVSHMEM_PLAIN, QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL);
DO_TEST_NOCAPS("smbios");
DO_TEST_NOCAPS("smbios-multiple-type2");
- DO_TEST_NOCAPS("smbios-type-fwcfg");
+ DO_TEST_CAPS_LATEST("smbios-type-fwcfg");
DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio",
"aarch64");
DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-default",
"aarch64");
--
2.41.0
8:57 a.m.
New subject: [PATCH 04/24] qemuxml2(argv|xml)test: Convert certain tests to DO_TEST_CAPS_LATEST
On a Thursday in 2023, Peter Krempa wrote:
Convert tests which use DO_TEST_NOCAPS in both tests and the
qemuxml2xml variant has a symlink back to the qemuxml2argv input file.
This is done to separate the conversion before a patch converts all
DO_TEST_NOCAPS variants in qemuxml2xmltest to use real capabilities.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...args => clock-realtime.x86_64-latest.args} | 14 +++---
tests/qemuxml2argvdata/clock-realtime.xml | 5 ++-
...gs => kvm-features-off.x86_64-latest.args} | 10 +++--
tests/qemuxml2argvdata/kvm-features-off.xml | 2 +-
...s.args => kvm-features.x86_64-latest.args} | 10 +++--
tests/qemuxml2argvdata/kvm-features.xml | 2 +-
tests/qemuxml2argvdata/net-user-addr.args | 35 ---------------
....args => net-user-addr.x86_64-latest.args} | 19 ++++----
tests/qemuxml2argvdata/net-user-addr.xml | 5 ++-
tests/qemuxml2argvdata/numatune-no-vcpu.args | 36 ---------------
.../numatune-no-vcpu.x86_64-latest.args | 44 +++++++++++++++++++
tests/qemuxml2argvdata/numatune-no-vcpu.xml | 5 ++-
.../serial-tcp-tlsx509-chardev-notls.xml | 5 ++-
...s => smbios-type-fwcfg.x86_64-latest.args} | 14 +++---
tests/qemuxml2argvdata/smbios-type-fwcfg.xml | 5 ++-
tests/qemuxml2argvtest.c | 14 +++---
...e.xml => clock-realtime.x86_64-latest.xml} | 0
...xml => kvm-features-off.x86_64-latest.xml} | 0
...res.xml => kvm-features.x86_64-latest.xml} | 0
...dr.xml => net-user-addr.x86_64-latest.xml} | 0
...xml => numatune-no-vcpu.x86_64-latest.xml} | 0
...p-tlsx509-chardev-notls.x86_64-latest.xml} | 0
...ml => smbios-type-fwcfg.x86_64-latest.xml} | 0
tests/qemuxml2xmltest.c | 14 +++---
24 files changed, 115 insertions(+), 124 deletions(-)
rename tests/qemuxml2argvdata/{clock-realtime.args =>
clock-realtime.x86_64-latest.args} (61%)
rename tests/qemuxml2argvdata/{kvm-features-off.args =>
kvm-features-off.x86_64-latest.args} (61%)
rename tests/qemuxml2argvdata/{kvm-features.args => kvm-features.x86_64-latest.args}
(60%)
delete mode 100644 tests/qemuxml2argvdata/net-user-addr.args
rename tests/qemuxml2argvdata/{serial-tcp-tlsx509-chardev-notls.args =>
net-user-addr.x86_64-latest.args} (56%)
delete mode 100644 tests/qemuxml2argvdata/numatune-no-vcpu.args
create mode 100644 tests/qemuxml2argvdata/numatune-no-vcpu.x86_64-latest.args
rename tests/qemuxml2argvdata/{smbios-type-fwcfg.args =>
smbios-type-fwcfg.x86_64-latest.args} (70%)
rename tests/qemuxml2xmloutdata/{clock-realtime.xml =>
clock-realtime.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{kvm-features-off.xml =>
kvm-features-off.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{kvm-features.xml => kvm-features.x86_64-latest.xml}
(100%)
rename tests/qemuxml2xmloutdata/{net-user-addr.xml => net-user-addr.x86_64-latest.xml}
(100%)
rename tests/qemuxml2xmloutdata/{numatune-no-vcpu.xml =>
numatune-no-vcpu.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{serial-tcp-tlsx509-chardev-notls.xml =>
serial-tcp-tlsx509-chardev-notls.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{smbios-type-fwcfg.xml =>
smbios-type-fwcfg.x86_64-latest.xml} (100%)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 05/24] qemuxml2argvdata: Convert 'cpu' test cases to use 'x86_64'
Convert the rest of the files using 'qemu-system-i386' to
'qemu-system-x86_64'. The 'cpu*' tests are done separately to emphasisze
that there's no change in the output.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/cpu-host-model-features.xml | 4 ++--
tests/qemuxml2argvdata/cpu-host-passthrough-features.args | 2 +-
tests/qemuxml2argvdata/cpu-host-passthrough-features.xml | 4 ++--
tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +-
tests/qemuxml2argvdata/cpu-kvmclock.xml | 4 ++--
tests/qemuxml2argvdata/cpu-minimum1.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum1.xml | 4 ++--
tests/qemuxml2xmloutdata/cpu-host-model-features.xml | 4 ++--
tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml | 4 ++--
tests/qemuxml2xmloutdata/cpu-kvmclock.xml | 4 ++--
10 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/tests/qemuxml2argvdata/cpu-host-model-features.xml
b/tests/qemuxml2argvdata/cpu-host-model-features.xml
index 5de4c0cde1..6a00b34136 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-features.xml
+++ b/tests/qemuxml2argvdata/cpu-host-model-features.xml
@@ -10,7 +10,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='host-model'>
@@ -24,7 +24,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
index 663b1a29ad..fba3d076d2 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml
b/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml
index bb4dd87f65..d8bd36c1f2 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml
@@ -10,7 +10,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='host-passthrough'>
@@ -23,7 +23,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args
b/tests/qemuxml2argvdata/cpu-kvmclock.args
index 3f9396da4b..60bc63a2bf 100644
--- a/tests/qemuxml2argvdata/cpu-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-kvmclock.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.xml
b/tests/qemuxml2argvdata/cpu-kvmclock.xml
index 2be6066f89..a1848a8d47 100644
--- a/tests/qemuxml2argvdata/cpu-kvmclock.xml
+++ b/tests/qemuxml2argvdata/cpu-kvmclock.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>6</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
<cpu mode='custom' match='exact'>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args
b/tests/qemuxml2argvdata/cpu-minimum1.args
index cd5d39af20..fff3d02cfc 100644
--- a/tests/qemuxml2argvdata/cpu-minimum1.args
+++ b/tests/qemuxml2argvdata/cpu-minimum1.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
diff --git a/tests/qemuxml2argvdata/cpu-minimum1.xml
b/tests/qemuxml2argvdata/cpu-minimum1.xml
index 806bf2efb2..cea59d7ca6 100644
--- a/tests/qemuxml2argvdata/cpu-minimum1.xml
+++ b/tests/qemuxml2argvdata/cpu-minimum1.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>6</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
<cpu match='minimum'>
@@ -16,6 +16,6 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
b/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
index 3a61d47abd..3dffde20b2 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
@@ -10,7 +10,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='host-model' check='partial'>
@@ -23,7 +23,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
index 99f52bed9a..03a8f45019 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
@@ -10,7 +10,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='host-passthrough' check='none'
migratable='off'>
@@ -23,7 +23,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
b/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
index dcc3ccf8d3..40cf0db24b 100644
--- a/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
+++ b/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>6</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
<cpu mode='custom' match='exact' check='partial'>
@@ -18,7 +18,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
--
2.41.0
9:47 a.m.
New subject: [PATCH 05/24] qemuxml2argvdata: Convert 'cpu' test cases to use 'x86_64'
On a Thursday in 2023, Peter Krempa wrote:
Convert the rest of the files using 'qemu-system-i386' to
'qemu-system-x86_64'. The 'cpu*' tests are done separately to emphasisze
*emphasise or *emphasize
that there's no change in the output.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/cpu-host-model-features.xml | 4 ++--
tests/qemuxml2argvdata/cpu-host-passthrough-features.args | 2 +-
tests/qemuxml2argvdata/cpu-host-passthrough-features.xml | 4 ++--
tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +-
tests/qemuxml2argvdata/cpu-kvmclock.xml | 4 ++--
tests/qemuxml2argvdata/cpu-minimum1.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum1.xml | 4 ++--
tests/qemuxml2xmloutdata/cpu-host-model-features.xml | 4 ++--
tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml | 4 ++--
tests/qemuxml2xmloutdata/cpu-kvmclock.xml | 4 ++--
10 files changed, 17 insertions(+), 17 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 06/24] testutilsqemu: Drop fake data for VIR_ARCH_I686
There are no more tests depending on '/usr/bin/qemu-system-i386' thus we
don't have to carry the data any more.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/testutilsqemu.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 16b773a768..20bd8ee906 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -27,25 +27,18 @@ static virCPUDef *cpuPower10;
static const char *qemu_emulators[VIR_ARCH_LAST] = {
- [VIR_ARCH_I686] = "/usr/bin/qemu-system-i386",
[VIR_ARCH_X86_64] = "/usr/bin/qemu-system-x86_64",
};
-static const char *const i386_machines[] = {
- "pc", NULL
-};
-
static const char *const x86_64_machines[] = {
"pc", "q35", NULL
};
static const char *const *qemu_machines[VIR_ARCH_LAST] = {
- [VIR_ARCH_I686] = i386_machines,
[VIR_ARCH_X86_64] = x86_64_machines,
};
static const char *qemu_default_ram_id[VIR_ARCH_LAST] = {
- [VIR_ARCH_I686] = "pc.ram",
[VIR_ARCH_X86_64] = "pc.ram",
};
--
2.41.0
9:47 a.m.
New subject: [PATCH 06/24] testutilsqemu: Drop fake data for VIR_ARCH_I686
On a Thursday in 2023, Peter Krempa wrote:
There are no more tests depending on
'/usr/bin/qemu-system-i386' thus we
don't have to carry the data any more.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/testutilsqemu.c | 7 -------
1 file changed, 7 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 07/24] qemuxml2xmltest: Modernize all 'DO_TEST_NOCAPS' tests
Convert all tests using the 'DO_TEST_NOCAPS' "fake" capability
invocation to use DO_TEST_CAPS_LATEST and remove the DO_TEST_NOCAPS
macro to prevent further use.
Most of the output file changes are related to default USB controller
type and the CPU becoming defined in the XML.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
... => balloon-device-auto.x86_64-latest.xml} | 5 +-
...> balloon-device-period.x86_64-latest.xml} | 5 +-
...xml => blkiotune-device.x86_64-latest.xml} | 5 +-
...iotune.xml => blkiotune.x86_64-latest.xml} | 5 +-
...xml => channel-guestfwd.x86_64-latest.xml} | 5 +-
... => channel-virtio-auto.x86_64-latest.xml} | 5 +-
...nel-virtio-state-active.x86_64-latest.xml} | 5 +-
...l-virtio-state-inactive.x86_64-latest.xml} | 5 +-
...o.xml => channel-virtio.x86_64-latest.xml} | 5 +-
....xml => clock-localtime.x86_64-latest.xml} | 5 +-
... clock-timer-hyperv-rtc.x86_64-latest.xml} | 5 +-
...ck-utc.xml => clock-utc.x86_64-latest.xml} | 5 +-
....xml => console-compat2.x86_64-latest.xml} | 5 +-
... => console-virtio-many.x86_64-latest.xml} | 5 +-
...o.xml => console-virtio.x86_64-latest.xml} | 5 +-
...cpu-host-model-features.x86_64-latest.xml} | 2 +-
...st-passthrough-features.x86_64-latest.xml} | 4 +-
...ock.xml => cpu-kvmclock.x86_64-latest.xml} | 2 +-
...sk-active-commit-active.x86_64-latest.xml} | 5 +-
...-active-commit-inactive.x86_64-latest.xml} | 5 +-
...l => disk-mirror-active.x86_64-latest.xml} | 5 +-
...=> disk-mirror-inactive.x86_64-latest.xml} | 5 +-
... disk-mirror-old-active.x86_64-latest.xml} | 5 +-
...isk-mirror-old-inactive.x86_64-latest.xml} | 5 +-
...e.xml => input-usbmouse.x86_64-latest.xml} | 5 +-
....xml => input-usbtablet.x86_64-latest.xml} | 5 +-
...vmclock.xml => kvmclock.x86_64-latest.xml} | 5 +-
.../{lease.xml => lease.x86_64-latest.xml} | 5 +-
...xml => machine-core-off.x86_64-latest.xml} | 5 +-
....xml => machine-core-on.x86_64-latest.xml} | 5 +-
...g.xml => memory-hotplug.x86_64-latest.xml} | 5 +-
...ml => memorybacking-set.x86_64-latest.xml} | 5 +-
... => memorybacking-unset.x86_64-latest.xml} | 5 +-
...ml => memtune-unlimited.x86_64-latest.xml} | 5 +-
...{memtune.xml => memtune.x86_64-latest.xml} | 5 +-
...l => metadata-duplicate.x86_64-latest.xml} | 5 +-
...etadata.xml => metadata.x86_64-latest.xml} | 5 +-
...{migrate.xml => migrate.x86_64-latest.xml} | 5 +-
...{minimal.xml => minimal.x86_64-latest.xml} | 5 +-
...c-uuid.xml => misc-acpi.x86_64-latest.xml} | 5 +-
...c-acpi.xml => misc-uuid.x86_64-latest.xml} | 5 +-
...p.xml => net-eth-hostip.x86_64-latest.xml} | 5 +-
...e.xml => net-eth-ifname.x86_64-latest.xml} | 5 +-
...> net-eth-unmanaged-tap.x86_64-latest.xml} | 5 +-
...{net-eth.xml => net-eth.x86_64-latest.xml} | 5 +-
...> net-hostdev-bootorder.x86_64-latest.xml} | 5 +-
...tdev.xml => net-hostdev.x86_64-latest.xml} | 5 +-
...onet.xml => net-midonet.x86_64-latest.xml} | 5 +-
....xml => net-openvswitch.x86_64-latest.xml} | 5 +-
...erver.xml => net-server.x86_64-latest.xml} | 5 +-
...{net-udp.xml => net-udp.x86_64-latest.xml} | 5 +-
...ml => net-virtio-device.x86_64-latest.xml} | 5 +-
...virtio-disable-offloads.x86_64-latest.xml} | 5 +-
...irtio-network-portgroup.x86_64-latest.xml} | 5 +-
...et-virtio-rxtxqueuesize.x86_64-latest.xml} | 5 +-
...irtio.xml => net-virtio.x86_64-latest.xml} | 5 +-
...ges.xml => nosharepages.x86_64-latest.xml} | 5 +-
...auto-memory-vcpu-cpuset.x86_64-latest.xml} | 5 +-
...no-cpuset-and-placement.x86_64-latest.xml} | 5 +-
...d-auto-vcpu-no-numatune.x86_64-latest.xml} | 5 +-
...static-vcpu-no-numatune.x86_64-latest.xml} | 5 +-
...{pci-rom.xml => pci-rom.x86_64-latest.xml} | 5 +-
....xml => pmu-feature-off.x86_64-latest.xml} | 5 +-
...ture.xml => pmu-feature.x86_64-latest.xml} | 5 +-
...v.xml => qemu-ns-no-env.x86_64-latest.xml} | 5 +-
...reboot-timeout-disabled.x86_64-latest.xml} | 5 +-
... reboot-timeout-enabled.x86_64-latest.xml} | 5 +-
.../restore-v2.x86_64-latest.xml | 38 +++++
tests/qemuxml2xmloutdata/restore-v2.xml | 35 ----
...ml => seclabel-dac-none.x86_64-latest.xml} | 5 +-
...eclabel-device-multiple.x86_64-latest.xml} | 5 +-
...> seclabel-dynamic-none.x86_64-latest.xml} | 5 +-
...ne.xml => seclabel-none.x86_64-latest.xml} | 5 +-
...static-labelskip-active.x86_64-latest.xml} | 5 +-
...atic-labelskip-inactive.x86_64-latest.xml} | 5 +-
....xml => seclabel-static.x86_64-latest.xml} | 5 +-
...serial-target-port-auto.x86_64-latest.xml} | 5 +-
...> smbios-multiple-type2.x86_64-latest.xml} | 5 +-
.../{smbios.xml => smbios.x86_64-latest.xml} | 5 +-
.../{smp.xml => smp.x86_64-latest.xml} | 5 +-
...r.xml => usb-controller.x86_64-latest.xml} | 5 +-
...l => usb-ich9-ehci-addr.x86_64-latest.xml} | 3 +
...sb-none.xml => usb-none.x86_64-latest.xml} | 3 +
tests/qemuxml2xmltest.c | 154 +++++++++---------
84 files changed, 423 insertions(+), 198 deletions(-)
rename tests/qemuxml2xmloutdata/{balloon-device-auto.xml =>
balloon-device-auto.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{balloon-device-period.xml =>
balloon-device-period.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{blkiotune-device.xml =>
blkiotune-device.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{blkiotune.xml => blkiotune.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{channel-guestfwd.xml =>
channel-guestfwd.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{channel-virtio-auto.xml =>
channel-virtio-auto.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{channel-virtio-state-active.xml =>
channel-virtio-state-active.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{channel-virtio-state-inactive.xml =>
channel-virtio-state-inactive.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{channel-virtio.xml =>
channel-virtio.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{clock-localtime.xml =>
clock-localtime.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{clock-timer-hyperv-rtc.xml =>
clock-timer-hyperv-rtc.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{clock-utc.xml => clock-utc.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{console-compat2.xml =>
console-compat2.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{console-virtio-many.xml =>
console-virtio-many.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{console-virtio.xml =>
console-virtio.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{cpu-host-model-features.xml =>
cpu-host-model-features.x86_64-latest.xml} (96%)
rename tests/qemuxml2xmloutdata/{cpu-host-passthrough-features.xml =>
cpu-host-passthrough-features.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{cpu-kvmclock.xml => cpu-kvmclock.x86_64-latest.xml}
(94%)
rename tests/qemuxml2xmloutdata/{disk-active-commit-active.xml =>
disk-active-commit-active.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{disk-active-commit-inactive.xml =>
disk-active-commit-inactive.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{disk-mirror-active.xml =>
disk-mirror-active.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{disk-mirror-inactive.xml =>
disk-mirror-inactive.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{disk-mirror-old-active.xml =>
disk-mirror-old-active.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{disk-mirror-old-inactive.xml =>
disk-mirror-old-inactive.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{input-usbmouse.xml =>
input-usbmouse.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{input-usbtablet.xml =>
input-usbtablet.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{kvmclock.xml => kvmclock.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{lease.xml => lease.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{machine-core-off.xml =>
machine-core-off.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{machine-core-on.xml =>
machine-core-on.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{memory-hotplug.xml =>
memory-hotplug.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{memorybacking-set.xml =>
memorybacking-set.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{memorybacking-unset.xml =>
memorybacking-unset.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{memtune-unlimited.xml =>
memtune-unlimited.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{memtune.xml => memtune.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{metadata-duplicate.xml =>
metadata-duplicate.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{metadata.xml => metadata.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{migrate.xml => migrate.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{minimal.xml => minimal.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{misc-uuid.xml => misc-acpi.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{misc-acpi.xml => misc-uuid.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{net-eth-hostip.xml =>
net-eth-hostip.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{net-eth-ifname.xml =>
net-eth-ifname.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{net-eth-unmanaged-tap.xml =>
net-eth-unmanaged-tap.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{net-eth.xml => net-eth.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{net-hostdev-bootorder.xml =>
net-hostdev-bootorder.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{net-hostdev.xml => net-hostdev.x86_64-latest.xml}
(92%)
rename tests/qemuxml2xmloutdata/{net-midonet.xml => net-midonet.x86_64-latest.xml}
(91%)
rename tests/qemuxml2xmloutdata/{net-openvswitch.xml =>
net-openvswitch.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{net-server.xml => net-server.x86_64-latest.xml}
(90%)
rename tests/qemuxml2xmloutdata/{net-udp.xml => net-udp.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{net-virtio-device.xml =>
net-virtio-device.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{net-virtio-disable-offloads.xml =>
net-virtio-disable-offloads.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{net-virtio-network-portgroup.xml =>
net-virtio-network-portgroup.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{net-virtio-rxtxqueuesize.xml =>
net-virtio-rxtxqueuesize.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{net-virtio.xml => net-virtio.x86_64-latest.xml}
(89%)
rename tests/qemuxml2xmloutdata/{nosharepages.xml => nosharepages.x86_64-latest.xml}
(88%)
rename tests/qemuxml2xmloutdata/{numad-auto-memory-vcpu-cpuset.xml =>
numad-auto-memory-vcpu-cpuset.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{numad-auto-memory-vcpu-no-cpuset-and-placement.xml =>
numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{numad-auto-vcpu-no-numatune.xml =>
numad-auto-vcpu-no-numatune.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{numad-static-vcpu-no-numatune.xml =>
numad-static-vcpu-no-numatune.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{pci-rom.xml => pci-rom.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{pmu-feature-off.xml =>
pmu-feature-off.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{pmu-feature.xml => pmu-feature.x86_64-latest.xml}
(84%)
rename tests/qemuxml2xmloutdata/{qemu-ns-no-env.xml =>
qemu-ns-no-env.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{reboot-timeout-disabled.xml =>
reboot-timeout-disabled.x86_64-latest.xml} (84%)
rename tests/qemuxml2xmloutdata/{reboot-timeout-enabled.xml =>
reboot-timeout-enabled.x86_64-latest.xml} (84%)
create mode 100644 tests/qemuxml2xmloutdata/restore-v2.x86_64-latest.xml
delete mode 100644 tests/qemuxml2xmloutdata/restore-v2.xml
rename tests/qemuxml2xmloutdata/{seclabel-dac-none.xml =>
seclabel-dac-none.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{seclabel-device-multiple.xml =>
seclabel-device-multiple.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{seclabel-dynamic-none.xml =>
seclabel-dynamic-none.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{seclabel-none.xml => seclabel-none.x86_64-latest.xml}
(89%)
rename tests/qemuxml2xmloutdata/{seclabel-static-labelskip-active.xml =>
seclabel-static-labelskip-active.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{seclabel-static-labelskip-inactive.xml =>
seclabel-static-labelskip-inactive.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{seclabel-static.xml =>
seclabel-static.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{serial-target-port-auto.xml =>
serial-target-port-auto.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{smbios-multiple-type2.xml =>
smbios-multiple-type2.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{smbios.xml => smbios.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{smp.xml => smp.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{usb-controller.xml =>
usb-controller.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{usb-ich9-ehci-addr.xml =>
usb-ich9-ehci-addr.x86_64-latest.xml} (96%)
rename tests/qemuxml2xmloutdata/{usb-none.xml => usb-none.x86_64-latest.xml} (89%)
diff --git a/tests/qemuxml2xmloutdata/balloon-device-auto.xml
b/tests/qemuxml2xmloutdata/balloon-device-auto.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/balloon-device-auto.xml
rename to tests/qemuxml2xmloutdata/balloon-device-auto.x86_64-latest.xml
index 3480561192..3cb86d645c 100644
--- a/tests/qemuxml2xmloutdata/balloon-device-auto.xml
+++ b/tests/qemuxml2xmloutdata/balloon-device-auto.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/balloon-device-period.xml
b/tests/qemuxml2xmloutdata/balloon-device-period.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/balloon-device-period.xml
rename to tests/qemuxml2xmloutdata/balloon-device-period.x86_64-latest.xml
index 2c4409c3e5..a8ccf734d8 100644
--- a/tests/qemuxml2xmloutdata/balloon-device-period.xml
+++ b/tests/qemuxml2xmloutdata/balloon-device-period.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/blkiotune-device.xml
b/tests/qemuxml2xmloutdata/blkiotune-device.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/blkiotune-device.xml
rename to tests/qemuxml2xmloutdata/blkiotune-device.x86_64-latest.xml
index 917fcb18ae..6bd7f287be 100644
--- a/tests/qemuxml2xmloutdata/blkiotune-device.xml
+++ b/tests/qemuxml2xmloutdata/blkiotune-device.x86_64-latest.xml
@@ -27,6 +27,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -39,7 +42,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/blkiotune.xml
b/tests/qemuxml2xmloutdata/blkiotune.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/blkiotune.xml
rename to tests/qemuxml2xmloutdata/blkiotune.x86_64-latest.xml
index 087b18fa8d..5ca540d9d3 100644
--- a/tests/qemuxml2xmloutdata/blkiotune.xml
+++ b/tests/qemuxml2xmloutdata/blkiotune.x86_64-latest.xml
@@ -11,6 +11,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/channel-guestfwd.xml
b/tests/qemuxml2xmloutdata/channel-guestfwd.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/channel-guestfwd.xml
rename to tests/qemuxml2xmloutdata/channel-guestfwd.x86_64-latest.xml
index ef2932b0ca..f5e98b3b78 100644
--- a/tests/qemuxml2xmloutdata/channel-guestfwd.xml
+++ b/tests/qemuxml2xmloutdata/channel-guestfwd.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
b/tests/qemuxml2xmloutdata/channel-virtio-auto.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/channel-virtio-auto.xml
rename to tests/qemuxml2xmloutdata/channel-virtio-auto.x86_64-latest.xml
index 4011ab5034..0056916d3a 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-auto.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
b/tests/qemuxml2xmloutdata/channel-virtio-state-active.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
rename to tests/qemuxml2xmloutdata/channel-virtio-state-active.x86_64-latest.xml
index 285ac5947a..a4ffae81e8 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-state-active.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
rename to tests/qemuxml2xmloutdata/channel-virtio-state-inactive.x86_64-latest.xml
index 205a88b64a..40bd003c59 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio.xml
b/tests/qemuxml2xmloutdata/channel-virtio.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/channel-virtio.xml
rename to tests/qemuxml2xmloutdata/channel-virtio.x86_64-latest.xml
index 515746b44c..abc334734a 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/clock-localtime.xml
b/tests/qemuxml2xmloutdata/clock-localtime.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/clock-localtime.xml
rename to tests/qemuxml2xmloutdata/clock-localtime.x86_64-latest.xml
index 164c1c9192..9914ab69a8 100644
--- a/tests/qemuxml2xmloutdata/clock-localtime.xml
+++ b/tests/qemuxml2xmloutdata/clock-localtime.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='localtime'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
rename to tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.x86_64-latest.xml
index 1eabd0a87f..b62bd81a37 100644
--- a/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
+++ b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.x86_64-latest.xml
@@ -11,6 +11,9 @@
<features>
<pae/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'>
<timer name='hypervclock' present='yes'/>
</clock>
@@ -19,7 +22,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/clock-utc.xml
b/tests/qemuxml2xmloutdata/clock-utc.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/clock-utc.xml
rename to tests/qemuxml2xmloutdata/clock-utc.x86_64-latest.xml
index b41600b100..8634c475f3 100644
--- a/tests/qemuxml2xmloutdata/clock-utc.xml
+++ b/tests/qemuxml2xmloutdata/clock-utc.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/console-compat2.xml
b/tests/qemuxml2xmloutdata/console-compat2.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/console-compat2.xml
rename to tests/qemuxml2xmloutdata/console-compat2.x86_64-latest.xml
index 88b8f73f8f..81bbb554d0 100644
--- a/tests/qemuxml2xmloutdata/console-compat2.xml
+++ b/tests/qemuxml2xmloutdata/console-compat2.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/console-virtio-many.xml
b/tests/qemuxml2xmloutdata/console-virtio-many.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/console-virtio-many.xml
rename to tests/qemuxml2xmloutdata/console-virtio-many.x86_64-latest.xml
index be11dc68b9..067fda5574 100644
--- a/tests/qemuxml2xmloutdata/console-virtio-many.xml
+++ b/tests/qemuxml2xmloutdata/console-virtio-many.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/console-virtio.xml
b/tests/qemuxml2xmloutdata/console-virtio.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/console-virtio.xml
rename to tests/qemuxml2xmloutdata/console-virtio.x86_64-latest.xml
index a14ba28c8d..36392004f5 100644
--- a/tests/qemuxml2xmloutdata/console-virtio.xml
+++ b/tests/qemuxml2xmloutdata/console-virtio.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
b/tests/qemuxml2xmloutdata/cpu-host-model-features.x86_64-latest.xml
similarity index 96%
rename from tests/qemuxml2xmloutdata/cpu-host-model-features.xml
rename to tests/qemuxml2xmloutdata/cpu-host-model-features.x86_64-latest.xml
index 3dffde20b2..0d4b236371 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-features.x86_64-latest.xml
@@ -24,7 +24,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
rename to tests/qemuxml2xmloutdata/cpu-host-passthrough-features.x86_64-latest.xml
index 03a8f45019..35c99b533a 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.x86_64-latest.xml
@@ -13,7 +13,7 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu mode='host-passthrough' check='none'
migratable='off'>
+ <cpu mode='host-passthrough' check='none'
migratable='on'>
<feature policy='require' name='abm'/>
<feature policy='force' name='ds'/>
<feature policy='disable' name='invtsc'/>
@@ -30,7 +30,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
b/tests/qemuxml2xmloutdata/cpu-kvmclock.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-kvmclock.xml
rename to tests/qemuxml2xmloutdata/cpu-kvmclock.x86_64-latest.xml
index 40cf0db24b..cd3a2ef539 100644
--- a/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
+++ b/tests/qemuxml2xmloutdata/cpu-kvmclock.x86_64-latest.xml
@@ -19,7 +19,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
b/tests/qemuxml2xmloutdata/disk-active-commit-active.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/disk-active-commit-active.xml
rename to tests/qemuxml2xmloutdata/disk-active-commit-active.x86_64-latest.xml
index 03294b7a6c..cbe47150a9 100644
--- a/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-active-commit-active.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -29,7 +32,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
rename to tests/qemuxml2xmloutdata/disk-active-commit-inactive.x86_64-latest.xml
index 1803b844f8..10a9dace61 100644
--- a/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -25,7 +28,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-active.xml
b/tests/qemuxml2xmloutdata/disk-mirror-active.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/disk-mirror-active.xml
rename to tests/qemuxml2xmloutdata/disk-mirror-active.x86_64-latest.xml
index 732054c65c..0cd61afa5c 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-active.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -77,7 +80,7 @@
<target dev='vdc' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
b/tests/qemuxml2xmloutdata/disk-mirror-inactive.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
rename to tests/qemuxml2xmloutdata/disk-mirror-inactive.x86_64-latest.xml
index ae96a63a3b..f94cd6519f 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-inactive.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -50,7 +53,7 @@
<target dev='vdc' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
b/tests/qemuxml2xmloutdata/disk-mirror-old-active.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
rename to tests/qemuxml2xmloutdata/disk-mirror-old-active.x86_64-latest.xml
index ecff3883c2..0732cf9e9c 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-old-active.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -51,7 +54,7 @@
<target dev='vdb' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
rename to tests/qemuxml2xmloutdata/disk-mirror-old-inactive.x86_64-latest.xml
index e0deb1deda..ec598bfdbd 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -43,7 +46,7 @@
<target dev='vdb' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/input-usbmouse.xml
b/tests/qemuxml2xmloutdata/input-usbmouse.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/input-usbmouse.xml
rename to tests/qemuxml2xmloutdata/input-usbmouse.x86_64-latest.xml
index 554e1616d1..dc1c45005f 100644
--- a/tests/qemuxml2xmloutdata/input-usbmouse.xml
+++ b/tests/qemuxml2xmloutdata/input-usbmouse.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/input-usbtablet.xml
b/tests/qemuxml2xmloutdata/input-usbtablet.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/input-usbtablet.xml
rename to tests/qemuxml2xmloutdata/input-usbtablet.x86_64-latest.xml
index f5ad2cdcd8..b1c17ba209 100644
--- a/tests/qemuxml2xmloutdata/input-usbtablet.xml
+++ b/tests/qemuxml2xmloutdata/input-usbtablet.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/kvmclock.xml
b/tests/qemuxml2xmloutdata/kvmclock.x86_64-latest.xml
similarity index 85%
rename from tests/qemuxml2xmloutdata/kvmclock.xml
rename to tests/qemuxml2xmloutdata/kvmclock.x86_64-latest.xml
index 809e7b3295..7d385b3270 100644
--- a/tests/qemuxml2xmloutdata/kvmclock.xml
+++ b/tests/qemuxml2xmloutdata/kvmclock.x86_64-latest.xml
@@ -11,6 +11,9 @@
<features>
<pae/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'>
<timer name='kvmclock' present='no'/>
</clock>
@@ -19,7 +22,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/lease.xml
b/tests/qemuxml2xmloutdata/lease.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/lease.xml
rename to tests/qemuxml2xmloutdata/lease.x86_64-latest.xml
index 38d4c5c232..d400fb1fef 100644
--- a/tests/qemuxml2xmloutdata/lease.xml
+++ b/tests/qemuxml2xmloutdata/lease.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -27,7 +30,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/machine-core-off.xml
b/tests/qemuxml2xmloutdata/machine-core-off.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/machine-core-off.xml
rename to tests/qemuxml2xmloutdata/machine-core-off.x86_64-latest.xml
index 77527bfe64..a7636a953d 100644
--- a/tests/qemuxml2xmloutdata/machine-core-off.xml
+++ b/tests/qemuxml2xmloutdata/machine-core-off.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/machine-core-on.xml
b/tests/qemuxml2xmloutdata/machine-core-on.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/machine-core-on.xml
rename to tests/qemuxml2xmloutdata/machine-core-on.x86_64-latest.xml
index 025b88f2de..6e70f8c88b 100644
--- a/tests/qemuxml2xmloutdata/machine-core-on.xml
+++ b/tests/qemuxml2xmloutdata/machine-core-on.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.xml
b/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/memory-hotplug.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml
index 593542072a..083102e8d6 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml
@@ -9,7 +9,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='1'
threads='1'/>
<numa>
<cell id='0' cpus='0-1' memory='219136'
unit='KiB'/>
@@ -30,7 +31,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/memorybacking-set.xml
b/tests/qemuxml2xmloutdata/memorybacking-set.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/memorybacking-set.xml
rename to tests/qemuxml2xmloutdata/memorybacking-set.x86_64-latest.xml
index c5c64e3f1a..9825bae2a0 100644
--- a/tests/qemuxml2xmloutdata/memorybacking-set.xml
+++ b/tests/qemuxml2xmloutdata/memorybacking-set.x86_64-latest.xml
@@ -13,13 +13,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/memorybacking-unset.xml
b/tests/qemuxml2xmloutdata/memorybacking-unset.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/memorybacking-unset.xml
rename to tests/qemuxml2xmloutdata/memorybacking-unset.x86_64-latest.xml
index 2753412d32..d1f6214b5a 100644
--- a/tests/qemuxml2xmloutdata/memorybacking-unset.xml
+++ b/tests/qemuxml2xmloutdata/memorybacking-unset.x86_64-latest.xml
@@ -13,13 +13,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/memtune-unlimited.xml
b/tests/qemuxml2xmloutdata/memtune-unlimited.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/memtune-unlimited.xml
rename to tests/qemuxml2xmloutdata/memtune-unlimited.x86_64-latest.xml
index 032ddfc48d..576657ee94 100644
--- a/tests/qemuxml2xmloutdata/memtune-unlimited.xml
+++ b/tests/qemuxml2xmloutdata/memtune-unlimited.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/memtune.xml
b/tests/qemuxml2xmloutdata/memtune.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/memtune.xml
rename to tests/qemuxml2xmloutdata/memtune.x86_64-latest.xml
index ed6992ffde..e1bdad430e 100644
--- a/tests/qemuxml2xmloutdata/memtune.xml
+++ b/tests/qemuxml2xmloutdata/memtune.x86_64-latest.xml
@@ -13,6 +13,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -25,7 +28,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/metadata-duplicate.xml
b/tests/qemuxml2xmloutdata/metadata-duplicate.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/metadata-duplicate.xml
rename to tests/qemuxml2xmloutdata/metadata-duplicate.x86_64-latest.xml
index d77f4af6e1..f96228c234 100644
--- a/tests/qemuxml2xmloutdata/metadata-duplicate.xml
+++ b/tests/qemuxml2xmloutdata/metadata-duplicate.x86_64-latest.xml
@@ -12,6 +12,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -27,7 +30,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/metadata.xml
b/tests/qemuxml2xmloutdata/metadata.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/metadata.xml
rename to tests/qemuxml2xmloutdata/metadata.x86_64-latest.xml
index d77f4af6e1..f96228c234 100644
--- a/tests/qemuxml2xmloutdata/metadata.xml
+++ b/tests/qemuxml2xmloutdata/metadata.x86_64-latest.xml
@@ -12,6 +12,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -27,7 +30,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/migrate.xml
b/tests/qemuxml2xmloutdata/migrate.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/migrate.xml
rename to tests/qemuxml2xmloutdata/migrate.x86_64-latest.xml
index 82f5c9f9e8..f6963d383b 100644
--- a/tests/qemuxml2xmloutdata/migrate.xml
+++ b/tests/qemuxml2xmloutdata/migrate.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/minimal.xml
b/tests/qemuxml2xmloutdata/minimal.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/minimal.xml
rename to tests/qemuxml2xmloutdata/minimal.x86_64-latest.xml
index baed180b00..5f26f47508 100644
--- a/tests/qemuxml2xmloutdata/minimal.xml
+++ b/tests/qemuxml2xmloutdata/minimal.x86_64-latest.xml
@@ -13,6 +13,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -25,7 +28,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/misc-uuid.xml
b/tests/qemuxml2xmloutdata/misc-acpi.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/misc-uuid.xml
rename to tests/qemuxml2xmloutdata/misc-acpi.x86_64-latest.xml
index e92fa21b65..176926bb60 100644
--- a/tests/qemuxml2xmloutdata/misc-uuid.xml
+++ b/tests/qemuxml2xmloutdata/misc-acpi.x86_64-latest.xml
@@ -11,6 +11,9 @@
<features>
<acpi/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/misc-acpi.xml
b/tests/qemuxml2xmloutdata/misc-uuid.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/misc-acpi.xml
rename to tests/qemuxml2xmloutdata/misc-uuid.x86_64-latest.xml
index e92fa21b65..176926bb60 100644
--- a/tests/qemuxml2xmloutdata/misc-acpi.xml
+++ b/tests/qemuxml2xmloutdata/misc-uuid.x86_64-latest.xml
@@ -11,6 +11,9 @@
<features>
<acpi/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-eth-hostip.xml
b/tests/qemuxml2xmloutdata/net-eth-hostip.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/net-eth-hostip.xml
rename to tests/qemuxml2xmloutdata/net-eth-hostip.x86_64-latest.xml
index 08f4e2d13f..a306be0c5b 100644
--- a/tests/qemuxml2xmloutdata/net-eth-hostip.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-hostip.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-eth-ifname.xml
b/tests/qemuxml2xmloutdata/net-eth-ifname.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/net-eth-ifname.xml
rename to tests/qemuxml2xmloutdata/net-eth-ifname.x86_64-latest.xml
index d60e4c345e..53f3c34863 100644
--- a/tests/qemuxml2xmloutdata/net-eth-ifname.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-ifname.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
b/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
rename to tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.x86_64-latest.xml
index 216b745428..cc782e6424 100644
--- a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-eth.xml
b/tests/qemuxml2xmloutdata/net-eth.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/net-eth.xml
rename to tests/qemuxml2xmloutdata/net-eth.x86_64-latest.xml
index 15e49c152b..2f10115c9d 100644
--- a/tests/qemuxml2xmloutdata/net-eth.xml
+++ b/tests/qemuxml2xmloutdata/net-eth.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
rename to tests/qemuxml2xmloutdata/net-hostdev-bootorder.x86_64-latest.xml
index 8a5842c55a..a3de352ad1 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.x86_64-latest.xml
@@ -7,6 +7,9 @@
<os>
<type arch='x86_64' machine='pc'>hvm</type>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<boot order='2'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev.xml
b/tests/qemuxml2xmloutdata/net-hostdev.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/net-hostdev.xml
rename to tests/qemuxml2xmloutdata/net-hostdev.x86_64-latest.xml
index 3e751155bd..49464c0efa 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-midonet.xml
b/tests/qemuxml2xmloutdata/net-midonet.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/net-midonet.xml
rename to tests/qemuxml2xmloutdata/net-midonet.x86_64-latest.xml
index 2ddb6b8ad8..f4ed915764 100644
--- a/tests/qemuxml2xmloutdata/net-midonet.xml
+++ b/tests/qemuxml2xmloutdata/net-midonet.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-openvswitch.xml
b/tests/qemuxml2xmloutdata/net-openvswitch.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/net-openvswitch.xml
rename to tests/qemuxml2xmloutdata/net-openvswitch.x86_64-latest.xml
index ebc11a4542..1512b118a5 100644
--- a/tests/qemuxml2xmloutdata/net-openvswitch.xml
+++ b/tests/qemuxml2xmloutdata/net-openvswitch.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-server.xml
b/tests/qemuxml2xmloutdata/net-server.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/net-server.xml
rename to tests/qemuxml2xmloutdata/net-server.x86_64-latest.xml
index 9be587229c..ad1e13cf1e 100644
--- a/tests/qemuxml2xmloutdata/net-server.xml
+++ b/tests/qemuxml2xmloutdata/net-server.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/net-udp.xml
b/tests/qemuxml2xmloutdata/net-udp.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/net-udp.xml
rename to tests/qemuxml2xmloutdata/net-udp.x86_64-latest.xml
index 65eaabdaf5..f9298997ff 100644
--- a/tests/qemuxml2xmloutdata/net-udp.xml
+++ b/tests/qemuxml2xmloutdata/net-udp.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-device.xml
b/tests/qemuxml2xmloutdata/net-virtio-device.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/net-virtio-device.xml
rename to tests/qemuxml2xmloutdata/net-virtio-device.x86_64-latest.xml
index bff89186a9..905f55fa15 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-device.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-device.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
rename to tests/qemuxml2xmloutdata/net-virtio-disable-offloads.x86_64-latest.xml
index 7932c50269..c680b52b35 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
rename to tests/qemuxml2xmloutdata/net-virtio-network-portgroup.x86_64-latest.xml
index 11341c7d85..43c10ffc60 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
rename to tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.x86_64-latest.xml
index 7474141a6e..6129648c53 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio.xml
b/tests/qemuxml2xmloutdata/net-virtio.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/net-virtio.xml
rename to tests/qemuxml2xmloutdata/net-virtio.x86_64-latest.xml
index a39b9bb1df..5b0199ec40 100644
--- a/tests/qemuxml2xmloutdata/net-virtio.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/nosharepages.xml
b/tests/qemuxml2xmloutdata/nosharepages.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/nosharepages.xml
rename to tests/qemuxml2xmloutdata/nosharepages.x86_64-latest.xml
index 47157a59bd..1b3c099e2c 100644
--- a/tests/qemuxml2xmloutdata/nosharepages.xml
+++ b/tests/qemuxml2xmloutdata/nosharepages.x86_64-latest.xml
@@ -11,6 +11,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
rename to tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml
index 8d0cdb7cc4..2d04bc23c2 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml
@@ -11,7 +11,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='1'
threads='1'/>
</cpu>
<clock offset='utc'/>
@@ -29,7 +30,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
rename to
tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml
index 7d25196914..80f7284126 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
+++
b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml
@@ -11,7 +11,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='1'
threads='1'/>
</cpu>
<clock offset='utc'/>
@@ -29,7 +30,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
rename to tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml
index d905ec2978..724209f6e3 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml
@@ -11,7 +11,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='1'
threads='1'/>
</cpu>
<clock offset='utc'/>
@@ -29,7 +30,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
rename to tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml
index 83be2dd639..2a4ee0d496 100644
--- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml
@@ -8,7 +8,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='1'
threads='1'/>
</cpu>
<clock offset='utc'/>
@@ -26,7 +27,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/pci-rom.xml
b/tests/qemuxml2xmloutdata/pci-rom.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/pci-rom.xml
rename to tests/qemuxml2xmloutdata/pci-rom.x86_64-latest.xml
index f5f19669fa..c7d493bd33 100644
--- a/tests/qemuxml2xmloutdata/pci-rom.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/pmu-feature-off.xml
b/tests/qemuxml2xmloutdata/pmu-feature-off.x86_64-latest.xml
similarity index 84%
rename from tests/qemuxml2xmloutdata/pmu-feature-off.xml
rename to tests/qemuxml2xmloutdata/pmu-feature-off.x86_64-latest.xml
index 77bf61d1e2..f56a062d48 100644
--- a/tests/qemuxml2xmloutdata/pmu-feature-off.xml
+++ b/tests/qemuxml2xmloutdata/pmu-feature-off.x86_64-latest.xml
@@ -12,13 +12,16 @@
<acpi/>
<pmu state='off'/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/pmu-feature.xml
b/tests/qemuxml2xmloutdata/pmu-feature.x86_64-latest.xml
similarity index 84%
rename from tests/qemuxml2xmloutdata/pmu-feature.xml
rename to tests/qemuxml2xmloutdata/pmu-feature.x86_64-latest.xml
index 32a1813f6c..84b7fd3bc7 100644
--- a/tests/qemuxml2xmloutdata/pmu-feature.xml
+++ b/tests/qemuxml2xmloutdata/pmu-feature.x86_64-latest.xml
@@ -12,13 +12,16 @@
<acpi/>
<pmu state='on'/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
b/tests/qemuxml2xmloutdata/qemu-ns-no-env.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
rename to tests/qemuxml2xmloutdata/qemu-ns-no-env.x86_64-latest.xml
index 1a8efd598d..c6c548429c 100644
--- a/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
+++ b/tests/qemuxml2xmloutdata/qemu-ns-no-env.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
b/tests/qemuxml2xmloutdata/reboot-timeout-disabled.x86_64-latest.xml
similarity index 84%
rename from tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
rename to tests/qemuxml2xmloutdata/reboot-timeout-disabled.x86_64-latest.xml
index 74b8c753e5..2d98504634 100644
--- a/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
+++ b/tests/qemuxml2xmloutdata/reboot-timeout-disabled.x86_64-latest.xml
@@ -9,13 +9,16 @@
<boot dev='network'/>
<bios rebootTimeout='-1'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
b/tests/qemuxml2xmloutdata/reboot-timeout-enabled.x86_64-latest.xml
similarity index 84%
rename from tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
rename to tests/qemuxml2xmloutdata/reboot-timeout-enabled.x86_64-latest.xml
index 3b34928f2b..1d9ef67fb0 100644
--- a/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
+++ b/tests/qemuxml2xmloutdata/reboot-timeout-enabled.x86_64-latest.xml
@@ -9,13 +9,16 @@
<boot dev='network'/>
<bios rebootTimeout='128'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/restore-v2.x86_64-latest.xml
b/tests/qemuxml2xmloutdata/restore-v2.x86_64-latest.xml
new file mode 100644
index 0000000000..f6963d383b
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/restore-v2.x86_64-latest.xml
@@ -0,0 +1,38 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
+ <disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
+ <source dev='/dev/HostVG/QEMUGuest1'/>
+ <target dev='hda' bus='ide'/>
+ <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
+ </disk>
+ <controller type='usb' index='0' model='piix3-uhci'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
+ </controller>
+ <controller type='ide' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
+ </controller>
+ <controller type='pci' index='0' model='pci-root'/>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <audio id='1' type='none'/>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/restore-v2.xml
b/tests/qemuxml2xmloutdata/restore-v2.xml
deleted file mode 100644
index 82f5c9f9e8..0000000000
--- a/tests/qemuxml2xmloutdata/restore-v2.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest1</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219136</memory>
- <currentMemory unit='KiB'>219136</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='x86_64' machine='pc'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <disk type='block' device='disk'>
- <driver name='qemu' type='raw'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <controller type='usb' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
- </controller>
- <controller type='ide' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
- </controller>
- <controller type='pci' index='0' model='pci-root'/>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <audio id='1' type='none'/>
- <memballoon model='none'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
b/tests/qemuxml2xmloutdata/seclabel-dac-none.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/seclabel-dac-none.xml
rename to tests/qemuxml2xmloutdata/seclabel-dac-none.x86_64-latest.xml
index b5cc10d530..2e86805b10 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dac-none.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
b/tests/qemuxml2xmloutdata/seclabel-device-multiple.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
rename to tests/qemuxml2xmloutdata/seclabel-device-multiple.x86_64-latest.xml
index b571707422..e92a363374 100644
--- a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-device-multiple.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -25,7 +28,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-none.x86_64-latest.xml
index a2b4a3e19e..d94c33d47b 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-none.xml
b/tests/qemuxml2xmloutdata/seclabel-none.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/seclabel-none.xml
rename to tests/qemuxml2xmloutdata/seclabel-none.x86_64-latest.xml
index a2b4a3e19e..d94c33d47b 100644
--- a/tests/qemuxml2xmloutdata/seclabel-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-none.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
rename to tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.x86_64-latest.xml
index 3cc87b0b1f..986bf3db4e 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
rename to tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.x86_64-latest.xml
index ae03203ad3..d778416b04 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static.xml
b/tests/qemuxml2xmloutdata/seclabel-static.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/seclabel-static.xml
rename to tests/qemuxml2xmloutdata/seclabel-static.x86_64-latest.xml
index 391b8b57f8..aff629d759 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
b/tests/qemuxml2xmloutdata/serial-target-port-auto.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/serial-target-port-auto.xml
rename to tests/qemuxml2xmloutdata/serial-target-port-auto.x86_64-latest.xml
index b9241e6933..eeb78f7401 100644
--- a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
+++ b/tests/qemuxml2xmloutdata/serial-target-port-auto.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
b/tests/qemuxml2xmloutdata/smbios-multiple-type2.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
rename to tests/qemuxml2xmloutdata/smbios-multiple-type2.x86_64-latest.xml
index f4febb1784..dba587b330 100644
--- a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
+++ b/tests/qemuxml2xmloutdata/smbios-multiple-type2.x86_64-latest.xml
@@ -39,6 +39,9 @@
<boot dev='hd'/>
<smbios mode='sysinfo'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -54,7 +57,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/smbios.xml
b/tests/qemuxml2xmloutdata/smbios.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/smbios.xml
rename to tests/qemuxml2xmloutdata/smbios.x86_64-latest.xml
index 2207fab666..12d416960e 100644
--- a/tests/qemuxml2xmloutdata/smbios.xml
+++ b/tests/qemuxml2xmloutdata/smbios.x86_64-latest.xml
@@ -44,6 +44,9 @@
<boot dev='hd'/>
<smbios mode='sysinfo'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -59,7 +62,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/smp.xml
b/tests/qemuxml2xmloutdata/smp.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/smp.xml
rename to tests/qemuxml2xmloutdata/smp.x86_64-latest.xml
index 69126bfa7c..a7f324afba 100644
--- a/tests/qemuxml2xmloutdata/smp.xml
+++ b/tests/qemuxml2xmloutdata/smp.x86_64-latest.xml
@@ -8,7 +8,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='1'
threads='1'/>
</cpu>
<clock offset='utc'/>
@@ -23,7 +24,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/usb-controller.xml
b/tests/qemuxml2xmloutdata/usb-controller.x86_64-latest.xml
similarity index 85%
rename from tests/qemuxml2xmloutdata/usb-controller.xml
rename to tests/qemuxml2xmloutdata/usb-controller.x86_64-latest.xml
index d551a5b7ed..c74353b056 100644
--- a/tests/qemuxml2xmloutdata/usb-controller.xml
+++ b/tests/qemuxml2xmloutdata/usb-controller.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.x86_64-latest.xml
similarity index 96%
rename from tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
rename to tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.x86_64-latest.xml
index 5d0f68c324..058880b2c4 100644
--- a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
+++ b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/usb-none.xml
b/tests/qemuxml2xmloutdata/usb-none.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/usb-none.xml
rename to tests/qemuxml2xmloutdata/usb-none.x86_64-latest.xml
index bc06548ad7..880106d79a 100644
--- a/tests/qemuxml2xmloutdata/usb-none.xml
+++ b/tests/qemuxml2xmloutdata/usb-none.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index b3ace80be9..21eb43d00b 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -200,11 +200,11 @@ mymain(void)
g_unsetenv("QEMU_AUDIO_DRV");
g_unsetenv("SDL_AUDIODRIVER");
- DO_TEST_NOCAPS("minimal");
+ DO_TEST_CAPS_LATEST("minimal");
DO_TEST_CAPS_LATEST("genid");
DO_TEST_CAPS_LATEST("genid-auto");
- DO_TEST_NOCAPS("machine-core-on");
- DO_TEST_NOCAPS("machine-core-off");
+ DO_TEST_CAPS_LATEST("machine-core-on");
+ DO_TEST_CAPS_LATEST("machine-core-off");
DO_TEST_CAPS_LATEST("machine-smm-on");
DO_TEST_CAPS_LATEST("machine-smm-off");
DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-hostdev", "s390x");
@@ -223,20 +223,20 @@ mymain(void)
DO_TEST_NOCAPS("boot-menu-disable-with-timeout");
DO_TEST_NOCAPS("boot-order");
- DO_TEST_NOCAPS("reboot-timeout-enabled");
- DO_TEST_NOCAPS("reboot-timeout-disabled");
+ DO_TEST_CAPS_LATEST("reboot-timeout-enabled");
+ DO_TEST_CAPS_LATEST("reboot-timeout-disabled");
- DO_TEST_NOCAPS("clock-utc");
- DO_TEST_NOCAPS("clock-localtime");
+ DO_TEST_CAPS_LATEST("clock-utc");
+ DO_TEST_CAPS_LATEST("clock-localtime");
DO_TEST_NOCAPS("cpu-empty");
- DO_TEST_NOCAPS("cpu-kvmclock");
+ DO_TEST_CAPS_LATEST("cpu-kvmclock");
DO_TEST_NOCAPS("cpu-host-kvmclock");
- DO_TEST_NOCAPS("cpu-host-passthrough-features");
- DO_TEST_NOCAPS("cpu-host-model-features");
+ DO_TEST_CAPS_LATEST("cpu-host-passthrough-features");
+ DO_TEST_CAPS_LATEST("cpu-host-model-features");
DO_TEST_NOCAPS("cpu-host-model-vendor");
DO_TEST("clock-catchup", QEMU_CAPS_KVM_PIT_TICK_POLICY);
- DO_TEST_NOCAPS("kvmclock");
- DO_TEST_NOCAPS("clock-timer-hyperv-rtc");
+ DO_TEST_CAPS_LATEST("kvmclock");
+ DO_TEST_CAPS_LATEST("clock-timer-hyperv-rtc");
DO_TEST_CAPS_ARCH_LATEST("clock-timer-armvtimer", "aarch64");
DO_TEST_CAPS_LATEST("clock-realtime");
DO_TEST_CAPS_LATEST("clock-absolute");
@@ -257,8 +257,8 @@ mymain(void)
DO_TEST_CAPS_LATEST("kvm-features");
DO_TEST_CAPS_LATEST("kvm-features-off");
- DO_TEST_NOCAPS("pmu-feature");
- DO_TEST_NOCAPS("pmu-feature-off");
+ DO_TEST_CAPS_LATEST("pmu-feature");
+ DO_TEST_CAPS_LATEST("pmu-feature-off");
DO_TEST_NOCAPS("pages-discard");
DO_TEST_CAPS_LATEST("pages-discard-hugepages");
@@ -276,10 +276,10 @@ mymain(void)
DO_TEST_CAPS_LATEST("hugepages-memaccess2");
DO_TEST_CAPS_LATEST("hugepages-memaccess3");
DO_TEST_CAPS_LATEST("hugepages-nvdimm");
- DO_TEST_NOCAPS("nosharepages");
- DO_TEST_NOCAPS("restore-v2");
- DO_TEST_NOCAPS("migrate");
- DO_TEST_NOCAPS("qemu-ns-no-env");
+ DO_TEST_CAPS_LATEST("nosharepages");
+ DO_TEST_CAPS_LATEST("restore-v2");
+ DO_TEST_CAPS_LATEST("migrate");
+ DO_TEST_CAPS_LATEST("qemu-ns-no-env");
DO_TEST_CAPS_LATEST("qemu-ns");
DO_TEST_NOCAPS("disk-aio");
DO_TEST_CAPS_LATEST("disk-aio-io_uring");
@@ -324,9 +324,9 @@ mymain(void)
QEMU_CAPS_SCSI_BLOCK);
DO_TEST("controller-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI);
DO_TEST_CAPS_ARCH_LATEST("disk-virtio-s390-zpci", "s390x");
- DO_TEST_NOCAPS("disk-mirror-old");
- DO_TEST_NOCAPS("disk-mirror");
- DO_TEST_NOCAPS("disk-active-commit");
+ DO_TEST_CAPS_LATEST("disk-mirror-old");
+ DO_TEST_CAPS_LATEST("disk-mirror");
+ DO_TEST_CAPS_LATEST("disk-active-commit");
DO_TEST("graphics-listen-network",
QEMU_CAPS_DEVICE_CIRRUS_VGA,
QEMU_CAPS_VNC);
@@ -412,9 +412,9 @@ mymain(void)
QEMU_CAPS_EGL_HEADLESS_RENDERNODE,
QEMU_CAPS_EGL_HEADLESS);
- DO_TEST_NOCAPS("input-usbmouse");
- DO_TEST_NOCAPS("input-usbtablet");
- DO_TEST_NOCAPS("misc-acpi");
+ DO_TEST_CAPS_LATEST("input-usbmouse");
+ DO_TEST_CAPS_LATEST("input-usbtablet");
+ DO_TEST_CAPS_LATEST("misc-acpi");
DO_TEST("misc-disable-s3", QEMU_CAPS_PIIX_DISABLE_S3);
DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable");
DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-enable");
@@ -423,20 +423,20 @@ mymain(void)
QEMU_CAPS_PIIX_DISABLE_S4);
DO_TEST("misc-enable-s4", QEMU_CAPS_PIIX_DISABLE_S4);
DO_TEST_NOCAPS("misc-no-reboot");
- DO_TEST_NOCAPS("misc-uuid");
+ DO_TEST_CAPS_LATEST("misc-uuid");
DO_TEST_NOCAPS("net-vhostuser");
DO_TEST_NOCAPS("net-user");
DO_TEST_CAPS_LATEST("net-user-addr");
DO_TEST_CAPS_LATEST("net-user-passt");
- DO_TEST_NOCAPS("net-virtio");
- DO_TEST_NOCAPS("net-virtio-device");
- DO_TEST_NOCAPS("net-virtio-disable-offloads");
- DO_TEST_NOCAPS("net-eth");
- DO_TEST_NOCAPS("net-eth-ifname");
- DO_TEST_NOCAPS("net-eth-hostip");
- DO_TEST_NOCAPS("net-eth-unmanaged-tap");
- DO_TEST_NOCAPS("net-virtio-network-portgroup");
- DO_TEST_NOCAPS("net-virtio-rxtxqueuesize");
+ DO_TEST_CAPS_LATEST("net-virtio");
+ DO_TEST_CAPS_LATEST("net-virtio-device");
+ DO_TEST_CAPS_LATEST("net-virtio-disable-offloads");
+ DO_TEST_CAPS_LATEST("net-eth");
+ DO_TEST_CAPS_LATEST("net-eth-ifname");
+ DO_TEST_CAPS_LATEST("net-eth-hostip");
+ DO_TEST_CAPS_LATEST("net-eth-unmanaged-tap");
+ DO_TEST_CAPS_LATEST("net-virtio-network-portgroup");
+ DO_TEST_CAPS_LATEST("net-virtio-rxtxqueuesize");
DO_TEST("net-virtio-teaming",
QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST("net-virtio-teaming-network",
@@ -444,11 +444,11 @@ mymain(void)
DO_TEST("net-virtio-teaming-hostdev",
QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST_CAPS_LATEST("net-isolated-port");
- DO_TEST_NOCAPS("net-hostdev");
- DO_TEST_NOCAPS("net-hostdev-bootorder");
+ DO_TEST_CAPS_LATEST("net-hostdev");
+ DO_TEST_CAPS_LATEST("net-hostdev-bootorder");
DO_TEST("net-hostdev-vfio", QEMU_CAPS_DEVICE_VFIO_PCI);
- DO_TEST_NOCAPS("net-midonet");
- DO_TEST_NOCAPS("net-openvswitch");
+ DO_TEST_CAPS_LATEST("net-midonet");
+ DO_TEST_CAPS_LATEST("net-openvswitch");
DO_TEST_CAPS_LATEST("sound-device");
DO_TEST_NOCAPS("watchdog");
DO_TEST_CAPS_LATEST("watchdog-q35-multiple");
@@ -472,11 +472,11 @@ mymain(void)
DO_TEST_NOCAPS("serial-debugcon");
DO_TEST_NOCAPS("console-compat");
- DO_TEST_NOCAPS("console-compat2");
- DO_TEST_NOCAPS("console-virtio-many");
- DO_TEST_NOCAPS("channel-guestfwd");
- DO_TEST_NOCAPS("channel-virtio");
- DO_TEST_NOCAPS("channel-virtio-state");
+ DO_TEST_CAPS_LATEST("console-compat2");
+ DO_TEST_CAPS_LATEST("console-virtio-many");
+ DO_TEST_CAPS_LATEST("channel-guestfwd");
+ DO_TEST_CAPS_LATEST("channel-virtio");
+ DO_TEST_CAPS_LATEST("channel-virtio-state");
DO_TEST_NOCAPS("channel-unix-source-path");
@@ -499,7 +499,7 @@ mymain(void)
QEMU_CAPS_DEVICE_VFIO_PCI,
QEMU_CAPS_VNC);
DO_TEST_CAPS_LATEST("hostdev-mdev-display-ramfb");
- DO_TEST_NOCAPS("pci-rom");
+ DO_TEST_CAPS_LATEST("pci-rom");
DO_TEST_NOCAPS("pci-rom-disabled");
DO_TEST_NOCAPS("pci-rom-disabled-invalid");
DO_TEST_NOCAPS("pci-serial-dev-chardev");
@@ -512,10 +512,10 @@ mymain(void)
DO_TEST_CAPS_LATEST("luks-disks");
DO_TEST_CAPS_LATEST("luks-disks-source");
DO_TEST_CAPS_LATEST("luks-disks-source-qcow2");
- DO_TEST_NOCAPS("memtune");
- DO_TEST_NOCAPS("memtune-unlimited");
- DO_TEST_NOCAPS("blkiotune");
- DO_TEST_NOCAPS("blkiotune-device");
+ DO_TEST_CAPS_LATEST("memtune");
+ DO_TEST_CAPS_LATEST("memtune-unlimited");
+ DO_TEST_CAPS_LATEST("blkiotune");
+ DO_TEST_CAPS_LATEST("blkiotune-device");
DO_TEST_CAPS_LATEST("cputune");
DO_TEST_CAPS_LATEST("cputune-zero-shares");
DO_TEST_CAPS_LATEST("cputune-numatune");
@@ -523,7 +523,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("cputune-cpuset-big-id");
DO_TEST_CAPS_LATEST("numavcpus-topology-mismatch");
- DO_TEST_NOCAPS("smp");
+ DO_TEST_CAPS_LATEST("smp");
DO_TEST_CAPS_LATEST("iothreads-ids");
DO_TEST_CAPS_LATEST("iothreads-ids-pool-sizes");
DO_TEST_CAPS_LATEST("iothreads-ids-partial");
@@ -531,15 +531,15 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("iothreads-disk-virtio-ccw", "s390x");
DO_TEST_CAPS_LATEST("iothreads-virtio-scsi-pci");
DO_TEST_CAPS_ARCH_LATEST("iothreads-virtio-scsi-ccw", "s390x");
- DO_TEST_NOCAPS("lease");
+ DO_TEST_CAPS_LATEST("lease");
DO_TEST_NOCAPS("event_idx");
DO_TEST_NOCAPS("vhost_queues");
DO_TEST_NOCAPS("interface-driver");
- DO_TEST_NOCAPS("net-server");
+ DO_TEST_CAPS_LATEST("net-server");
DO_TEST_NOCAPS("virtio-lun");
- DO_TEST_NOCAPS("usb-none");
- DO_TEST_NOCAPS("usb-controller");
+ DO_TEST_CAPS_LATEST("usb-none");
+ DO_TEST_CAPS_LATEST("usb-controller");
DO_TEST("usb-piix3-controller",
QEMU_CAPS_PIIX3_USB_UHCI);
DO_TEST("usb-controller-default-q35",
@@ -580,17 +580,17 @@ mymain(void)
DO_TEST_FULL("seclabel-dynamic-override", "", WHEN_INACTIVE,
ARG_END);
DO_TEST_FULL("seclabel-dynamic-labelskip", "", WHEN_INACTIVE,
ARG_END);
DO_TEST_FULL("seclabel-dynamic-relabel", "", WHEN_INACTIVE,
ARG_END);
- DO_TEST_NOCAPS("seclabel-static");
- DO_TEST_NOCAPS("seclabel-static-labelskip");
- DO_TEST_NOCAPS("seclabel-none");
- DO_TEST_NOCAPS("seclabel-dac-none");
- DO_TEST_NOCAPS("seclabel-dynamic-none");
- DO_TEST_NOCAPS("seclabel-device-multiple");
+ DO_TEST_CAPS_LATEST("seclabel-static");
+ DO_TEST_CAPS_LATEST("seclabel-static-labelskip");
+ DO_TEST_CAPS_LATEST("seclabel-none");
+ DO_TEST_CAPS_LATEST("seclabel-dac-none");
+ DO_TEST_CAPS_LATEST("seclabel-dynamic-none");
+ DO_TEST_CAPS_LATEST("seclabel-device-multiple");
DO_TEST_FULL("seclabel-dynamic-none-relabel", "", WHEN_INACTIVE,
ARG_QEMU_CAPS, QEMU_CAPS_DEVICE_CIRRUS_VGA,
QEMU_CAPS_SPICE, QEMU_CAPS_LAST,
ARG_END);
- DO_TEST_NOCAPS("numad-static-vcpu-no-numatune");
+ DO_TEST_CAPS_LATEST("numad-static-vcpu-no-numatune");
DO_TEST("disk-scsi-disk-vpd",
QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI);
@@ -646,21 +646,21 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("mach-virt-console-native", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("mach-virt-console-virtio", "aarch64");
- DO_TEST_NOCAPS("balloon-device-auto");
- DO_TEST_NOCAPS("balloon-device-period");
- DO_TEST_NOCAPS("channel-virtio-auto");
+ DO_TEST_CAPS_LATEST("balloon-device-auto");
+ DO_TEST_CAPS_LATEST("balloon-device-period");
+ DO_TEST_CAPS_LATEST("channel-virtio-auto");
DO_TEST_NOCAPS("console-compat-auto");
DO_TEST("disk-scsi-device-auto",
QEMU_CAPS_SCSI_LSI);
- DO_TEST_NOCAPS("console-virtio");
- DO_TEST_NOCAPS("serial-target-port-auto");
+ DO_TEST_CAPS_LATEST("console-virtio");
+ DO_TEST_CAPS_LATEST("serial-target-port-auto");
DO_TEST("graphics-listen-network2",
QEMU_CAPS_DEVICE_CIRRUS_VGA,
QEMU_CAPS_VNC);
- DO_TEST_NOCAPS("numad-auto-vcpu-no-numatune");
- DO_TEST_NOCAPS("numad-auto-memory-vcpu-no-cpuset-and-placement");
- DO_TEST_NOCAPS("numad-auto-memory-vcpu-cpuset");
- DO_TEST_NOCAPS("usb-ich9-ehci-addr");
+ DO_TEST_CAPS_LATEST("numad-auto-vcpu-no-numatune");
+ DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-no-cpuset-and-placement");
+ DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-cpuset");
+ DO_TEST_CAPS_LATEST("usb-ich9-ehci-addr");
DO_TEST_NOCAPS("disk-copy_on_read");
DO_TEST_CAPS_LATEST("tpm-passthrough");
DO_TEST_CAPS_LATEST("tpm-passthrough-crb");
@@ -672,8 +672,8 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("aarch64-tpm", "aarch64");
DO_TEST_CAPS_LATEST("tpm-external");
- DO_TEST_NOCAPS("metadata");
- DO_TEST_NOCAPS("metadata-duplicate");
+ DO_TEST_CAPS_LATEST("metadata");
+ DO_TEST_CAPS_LATEST("metadata-duplicate");
DO_TEST("pci-bridge",
QEMU_CAPS_DEVICE_PCI_BRIDGE,
@@ -913,8 +913,8 @@ mymain(void)
DO_TEST("shmem", QEMU_CAPS_DEVICE_IVSHMEM);
DO_TEST("shmem-plain-doorbell",
QEMU_CAPS_DEVICE_IVSHMEM_PLAIN, QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL);
- DO_TEST_NOCAPS("smbios");
- DO_TEST_NOCAPS("smbios-multiple-type2");
+ DO_TEST_CAPS_LATEST("smbios");
+ DO_TEST_CAPS_LATEST("smbios-multiple-type2");
DO_TEST_CAPS_LATEST("smbios-type-fwcfg");
DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio",
"aarch64");
@@ -998,7 +998,7 @@ mymain(void)
DO_TEST_FULL("memory-hotplug-ppc64-nonuma-abi-update", "",
WHEN_BOTH,
ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
ARG_CAPS_ARCH, "ppc64", ARG_CAPS_VER, "latest",
ARG_END);
- DO_TEST_NOCAPS("memory-hotplug");
+ DO_TEST_CAPS_LATEST("memory-hotplug");
DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM);
DO_TEST_CAPS_LATEST("memory-hotplug-dimm-addr");
DO_TEST("memory-hotplug-nvdimm", QEMU_CAPS_DEVICE_NVDIMM);
@@ -1016,7 +1016,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("memory-hotplug-virtio-mem");
DO_TEST_CAPS_LATEST("memory-hotplug-multiple");
- DO_TEST_NOCAPS("net-udp");
+ DO_TEST_CAPS_LATEST("net-udp");
DO_TEST("video-virtio-gpu-device", QEMU_CAPS_DEVICE_VIRTIO_GPU);
DO_TEST("video-virtio-gpu-virgl",
@@ -1042,8 +1042,8 @@ mymain(void)
DO_TEST_CAPS_LATEST("input-linux");
- DO_TEST_NOCAPS("memorybacking-set");
- DO_TEST_NOCAPS("memorybacking-unset");
+ DO_TEST_CAPS_LATEST("memorybacking-set");
+ DO_TEST_CAPS_LATEST("memorybacking-unset");
DO_TEST_CAPS_LATEST("virtio-options");
--
2.41.0
7:48 a.m.
New subject: [PATCH 07/24] qemuxml2xmltest: Modernize all 'DO_TEST_NOCAPS' tests
On a Thursday in 2023, Peter Krempa wrote:
Convert all tests using the 'DO_TEST_NOCAPS' "fake"
capability
invocation to use DO_TEST_CAPS_LATEST and remove the DO_TEST_NOCAPS
macro to prevent further use.
Most of the output file changes are related to default USB controller
type and the CPU becoming defined in the XML.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
... => balloon-device-auto.x86_64-latest.xml} | 5 +-
...> balloon-device-period.x86_64-latest.xml} | 5 +-
...xml => blkiotune-device.x86_64-latest.xml} | 5 +-
[...]
...r.xml => usb-controller.x86_64-latest.xml} | 5 +-
...l => usb-ich9-ehci-addr.x86_64-latest.xml} | 3 +
...sb-none.xml => usb-none.x86_64-latest.xml} | 3 +
tests/qemuxml2xmltest.c | 154 +++++++++---------
84 files changed, 423 insertions(+), 198 deletions(-)
rename tests/qemuxml2xmloutdata/{balloon-device-auto.xml =>
balloon-device-auto.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{balloon-device-period.xml =>
balloon-device-period.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{blkiotune-device.xml =>
blkiotune-device.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{blkiotune.xml => blkiotune.x86_64-latest.xml} (89%)
[...]
rename tests/qemuxml2xmloutdata/{smp.xml => smp.x86_64-latest.xml}
(89%)
rename tests/qemuxml2xmloutdata/{usb-controller.xml =>
usb-controller.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{usb-ich9-ehci-addr.xml =>
usb-ich9-ehci-addr.x86_64-latest.xml} (96%)
rename tests/qemuxml2xmloutdata/{usb-none.xml => usb-none.x86_64-latest.xml} (89%)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 08/24] qemuxml2xmloutdata: Workaround wrong detection of 'disk-cdrom-empty-network-invalid' in virschematest
The 'disk-cdrom-empty-network-invalid' is a special case were the input
XML is invalid according to the schema, but after processing a valid XML
is produced.
This corner case doesn't play well with 'virschematest' which uses the
file suffix to determine whether the file is invalid.
Upcoming patch will change the 'virschematest' condition, which would
start detecting this XML as invalid.
Use the '-active'/'-inactive' suffix for the file, which is possible
with qemuxml2xmltest so that an upcoming patch will not cause test
failure.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
... disk-cdrom-empty-network-invalid-active.x86_64-latest.xml} | 0
...disk-cdrom-empty-network-invalid-inactive.x86_64-latest.xml | 1 +
tests/qemuxml2xmltest.c | 3 +++
3 files changed, 4 insertions(+)
rename tests/qemuxml2xmloutdata/{disk-cdrom-empty-network-invalid.x86_64-latest.xml =>
disk-cdrom-empty-network-invalid-active.x86_64-latest.xml} (100%)
create mode 120000
tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid-inactive.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml
b/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid-active.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml
rename to
tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid-active.x86_64-latest.xml
diff --git
a/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid-inactive.x86_64-latest.xml
b/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid-inactive.x86_64-latest.xml
new file mode 120000
index 0000000000..9733ff06a7
--- /dev/null
+++
b/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid-inactive.x86_64-latest.xml
@@ -0,0 +1 @@
+disk-cdrom-empty-network-invalid-active.x86_64-latest.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 21eb43d00b..10ea638366 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -284,6 +284,9 @@ mymain(void)
DO_TEST_NOCAPS("disk-aio");
DO_TEST_CAPS_LATEST("disk-aio-io_uring");
DO_TEST_NOCAPS("disk-cdrom");
+ /* The 'disk-cdrom-empty-network-invalid' test case uses separate
+ * '-active'/'-inactive' output files to work around
'virschematest'
+ * thinking the output file is invalid XML */
DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid");
DO_TEST_CAPS_LATEST("disk-cdrom-network");
DO_TEST("disk-cdrom-bus-other", QEMU_CAPS_DEVICE_USB_STORAGE);
--
2.41.0
7:51 a.m.
New subject: [PATCH 08/24] qemuxml2xmloutdata: Workaround wrong detection of 'disk-cdrom-empty-network-invalid' in virschematest
On a Thursday in 2023, Peter Krempa wrote:
The 'disk-cdrom-empty-network-invalid' is a special case were
the input
XML is invalid according to the schema, but after processing a valid XML
is produced.
This corner case doesn't play well with 'virschematest' which uses the
file suffix to determine whether the file is invalid.
Upcoming patch will change the 'virschematest' condition, which would
start detecting this XML as invalid.
Use the '-active'/'-inactive' suffix for the file, which is possible
with qemuxml2xmltest so that an upcoming patch will not cause test
failure.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
... disk-cdrom-empty-network-invalid-active.x86_64-latest.xml} | 0
...disk-cdrom-empty-network-invalid-inactive.x86_64-latest.xml | 1 +
tests/qemuxml2xmltest.c | 3 +++
3 files changed, 4 insertions(+)
rename tests/qemuxml2xmloutdata/{disk-cdrom-empty-network-invalid.x86_64-latest.xml =>
disk-cdrom-empty-network-invalid-active.x86_64-latest.xml} (100%)
create mode 120000
tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid-inactive.x86_64-latest.xml
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 09/24] virschematest: Improve detection of 'invalid' XMLs
The output files from 'qemuxml2argvtest' may have the real capability
suffix e.g. 'pci-rom-disabled-invalid.x86_64-latest.xml' which would not
be detected as being invalid and thus causing a test failure.
Change the logic to find '-invalid.' so that we can properly use
'virschematest' with test cases using real capabilities.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/virschematest.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/virschematest.c b/tests/virschematest.c
index fcf3838630..c8c1527613 100644
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -48,7 +48,9 @@ static int
testSchemaValidateXML(const void *args)
{
const struct testSchemaData *data = args;
- bool shouldFail = virStringHasSuffix(data->xml_path, "-invalid.xml");
+ /* invalid XMLs have a '-invalid.' suffix, but not necessarily at the end
+ * of the file name e.g. in case of qemuxml2xmltest with real capabilities */
+ bool shouldFail = !!strstr(data->xml_path, "-invalid.");
g_autoptr(xmlDoc) xml = NULL;
if (!(xml = virXMLParseFileCtxt(data->xml_path, NULL)))
--
2.41.0
7:51 a.m.
New subject: [PATCH 09/24] virschematest: Improve detection of 'invalid' XMLs
On a Thursday in 2023, Peter Krempa wrote:
The output files from 'qemuxml2argvtest' may have the real
capability
suffix e.g. 'pci-rom-disabled-invalid.x86_64-latest.xml' which would not
be detected as being invalid and thus causing a test failure.
Change the logic to find '-invalid.' so that we can properly use
'virschematest' with test cases using real capabilities.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/virschematest.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 10/24] qemuxml2xmltest: Use real caps for 'vxhs' disk tests
Version-lock the test to qemu-5.0.0 as it's the latest qemu that
supports 'vxhs' and thus the test can't use 'latest'.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...vxhs.xml => disk-network-tlsx509-vxhs.x86_64-5.0.0.xml} | 7 +++++--
...network-vxhs.xml => disk-network-vxhs.x86_64-5.0.0.xml} | 7 +++++--
tests/qemuxml2xmltest.c | 4 ++--
3 files changed, 12 insertions(+), 6 deletions(-)
rename tests/qemuxml2xmloutdata/{disk-network-tlsx509-vxhs.xml =>
disk-network-tlsx509-vxhs.x86_64-5.0.0.xml} (90%)
rename tests/qemuxml2xmloutdata/{disk-network-vxhs.xml =>
disk-network-vxhs.x86_64-5.0.0.xml} (84%)
diff --git a/tests/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.xml
b/tests/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.xml
rename to tests/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.xml
index c2e3370bd3..ef020d7de5 100644
--- a/tests/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.xml
@@ -5,9 +5,12 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='x86_64' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc-i440fx-5.0'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -41,7 +44,7 @@
<serial>eb90327c-8302-4725-9e1b-4e85ed4dc252</serial>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/disk-network-vxhs.xml
b/tests/qemuxml2xmloutdata/disk-network-vxhs.x86_64-5.0.0.xml
similarity index 84%
rename from tests/qemuxml2xmloutdata/disk-network-vxhs.xml
rename to tests/qemuxml2xmloutdata/disk-network-vxhs.x86_64-5.0.0.xml
index fe93a953d2..15293600ee 100644
--- a/tests/qemuxml2xmloutdata/disk-network-vxhs.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-vxhs.x86_64-5.0.0.xml
@@ -5,9 +5,12 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='i686' machine='pc-i440fx-5.0'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 10ea638366..2beb5b3ce9 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -312,11 +312,11 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-network-rbd-encryption-luks-any");
DO_TEST_NOCAPS("disk-network-source-auth");
DO_TEST_NOCAPS("disk-network-sheepdog");
- DO_TEST_NOCAPS("disk-network-vxhs");
+ DO_TEST_CAPS_VER("disk-network-vxhs", "5.0.0");
DO_TEST_CAPS_LATEST("disk-network-nfs");
DO_TEST_NOCAPS("disk-network-tlsx509-nbd");
DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname");
- DO_TEST_NOCAPS("disk-network-tlsx509-vxhs");
+ DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "5.0.0");
DO_TEST_CAPS_LATEST("disk-nvme");
DO_TEST_CAPS_LATEST("disk-vhostuser");
DO_TEST_CAPS_LATEST("disk-sata-device");
--
2.41.0
7:52 a.m.
New subject: [PATCH 10/24] qemuxml2xmltest: Use real caps for 'vxhs' disk tests
On a Thursday in 2023, Peter Krempa wrote:
Version-lock the test to qemu-5.0.0 as it's the latest qemu that
supports 'vxhs' and thus the test can't use 'latest'.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...vxhs.xml => disk-network-tlsx509-vxhs.x86_64-5.0.0.xml} | 7 +++++--
...network-vxhs.xml => disk-network-vxhs.x86_64-5.0.0.xml} | 7 +++++--
tests/qemuxml2xmltest.c | 4 ++--
3 files changed, 12 insertions(+), 6 deletions(-)
rename tests/qemuxml2xmloutdata/{disk-network-tlsx509-vxhs.xml =>
disk-network-tlsx509-vxhs.x86_64-5.0.0.xml} (90%)
rename tests/qemuxml2xmloutdata/{disk-network-vxhs.xml =>
disk-network-vxhs.x86_64-5.0.0.xml} (84%)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 11/24] qemuxml2xmltest: Convert rest of 'DO_TEST_NOCAPS' cases to 'DO_TEST_CAPS_LATEST'
Finish the conversion of cases which didn't need any special
capabilities to use real capabilities.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/net-mtu.xml | 5 +-
tests/qemuxml2argvdata/pages-discard.xml | 5 +-
...table.xml => acpi-table.x86_64-latest.xml} | 5 +-
...cdrom.xml => boot-cdrom.x86_64-latest.xml} | 5 +-
...oppy.xml => boot-floppy.x86_64-latest.xml} | 5 +-
...nu-disable-with-timeout.x86_64-latest.xml} | 5 +-
...ml => boot-menu-disable.x86_64-latest.xml} | 5 +-
...enu-enable-with-timeout.x86_64-latest.xml} | 5 +-
...multi.xml => boot-multi.x86_64-latest.xml} | 5 +-
...ork.xml => boot-network.x86_64-latest.xml} | 5 +-
...order.xml => boot-order.x86_64-latest.xml} | 5 +-
...unix-source-path-active.x86_64-latest.xml} | 5 +-
...ix-source-path-inactive.x86_64-latest.xml} | 5 +-
... => console-compat-auto.x86_64-latest.xml} | 5 +-
...t.xml => console-compat.x86_64-latest.xml} | 5 +-
... cpu-check-default-none.x86_64-latest.xml} | 4 +-
...cpu-check-default-none2.x86_64-latest.xml} | 2 +-
...u-check-default-partial.x86_64-latest.xml} | 2 +-
...-check-default-partial2.x86_64-latest.xml} | 2 +-
...l.xml => cpu-check-full.x86_64-latest.xml} | 2 +-
...e.xml => cpu-check-none.x86_64-latest.xml} | 2 +-
...ml => cpu-check-partial.x86_64-latest.xml} | 2 +-
...-empty.xml => cpu-empty.x86_64-latest.xml} | 5 +-
...xml => cpu-eoi-disabled.x86_64-latest.xml} | 2 +-
....xml => cpu-eoi-enabled.x86_64-latest.xml} | 2 +-
...ml => cpu-host-kvmclock.x86_64-latest.xml} | 4 +-
...> cpu-host-model-vendor.x86_64-latest.xml} | 2 +-
...ml => cpu-numa-disjoint.x86_64-latest.xml} | 5 +-
... => cpu-numa-disordered.x86_64-latest.xml} | 5 +-
...l => cpu-numa-memshared.x86_64-latest.xml} | 5 +-
...-numa-no-memory-element.x86_64-latest.xml} | 5 +-
...-numa2.xml => cpu-numa1.x86_64-latest.xml} | 5 +-
...lement.xml => cpu-numa2.x86_64-latest.xml} | 5 +-
...> default-kvm-host-arch.x86_64-latest.xml} | 7 +-
... default-qemu-host-arch.x86_64-latest.xml} | 7 +-
...isk-aio.xml => disk-aio.x86_64-latest.xml} | 5 +-
...ing-chains-index-active.x86_64-latest.xml} | 5 +-
...g-chains-index-inactive.x86_64-latest.xml} | 5 +-
...-backing-chains-noindex.x86_64-latest.xml} | 5 +-
....xml => disk-boot-cdrom.x86_64-latest.xml} | 5 +-
...k.xml => disk-boot-disk.x86_64-latest.xml} | 5 +-
...cdrom.xml => disk-cdrom.x86_64-latest.xml} | 5 +-
...ml => disk-copy_on_read.x86_64-latest.xml} | 5 +-
...ml => disk-error-policy.x86_64-latest.xml} | 5 +-
...oppy.xml => disk-floppy.x86_64-latest.xml} | 5 +-
...ow.xml => disk-fmt-qcow.x86_64-latest.xml} | 5 +-
...=> disk-network-gluster.x86_64-latest.xml} | 5 +-
...xml => disk-network-nbd.x86_64-latest.xml} | 5 +-
...xml => disk-network-rbd.x86_64-latest.xml} | 5 +-
...> disk-network-sheepdog.x86_64-latest.xml} | 5 +-
...isk-network-source-auth.x86_64-latest.xml} | 5 +-
...isk-network-tlsx509-nbd.x86_64-latest.xml} | 5 +-
...rial.xml => disk-serial.x86_64-latest.xml} | 5 +-
...> disk-source-pool-mode.x86_64-latest.xml} | 5 +-
...xml => disk-source-pool.x86_64-latest.xml} | 5 +-
...rtio.xml => disk-virtio.x86_64-latest.xml} | 5 +-
...cript.xml => downscript.x86_64-latest.xml} | 0
...led.xml => eoi-disabled.x86_64-latest.xml} | 5 +-
...bled.xml => eoi-enabled.x86_64-latest.xml} | 5 +-
...nt_idx.xml => event_idx.x86_64-latest.xml} | 5 +-
...xml => floppy-drive-fat.x86_64-latest.xml} | 5 +-
...v-off.xml => hyperv-off.x86_64-latest.xml} | 5 +-
...nic.xml => hyperv-panic.x86_64-latest.xml} | 5 +-
...l => hyperv-passthrough.x86_64-latest.xml} | 5 +-
...=> hyperv-stimer-direct.x86_64-latest.xml} | 5 +-
.../{hyperv.xml => hyperv.x86_64-latest.xml} | 5 +-
...xml => interface-driver.x86_64-latest.xml} | 5 +-
...t.xml => misc-no-reboot.x86_64-latest.xml} | 5 +-
...sce.xml => net-coalesce.x86_64-latest.xml} | 5 +-
...{net-mtu.xml => net-mtu.x86_64-latest.xml} | 0
...et-user.xml => net-user.x86_64-latest.xml} | 5 +-
...er.xml => net-vhostuser.x86_64-latest.xml} | 5 +-
...=> numatune-auto-prefer.x86_64-latest.xml} | 5 +-
...l => numatune-distances.x86_64-latest.xml} | 5 +-
...atune-memnode-no-memory.x86_64-latest.xml} | 5 +-
...xml => numatune-memnode.x86_64-latest.xml} | 5 +-
...rd.xml => pages-discard.x86_64-latest.xml} | 0
...ci-rom-disabled-invalid.x86_64-latest.xml} | 3 +
...xml => pci-rom-disabled.x86_64-latest.xml} | 3 +
... pci-serial-dev-chardev.x86_64-latest.xml} | 5 +-
...ib.xml => pcihole64-gib.x86_64-latest.xml} | 5 +-
...hole64.xml => pcihole64.x86_64-latest.xml} | 5 +-
...=> pv-spinlock-disabled.x86_64-latest.xml} | 5 +-
... => pv-spinlock-enabled.x86_64-latest.xml} | 5 +-
....xml => serial-debugcon.x86_64-latest.xml} | 5 +-
...ial-tcp-tlsx509-chardev.x86_64-latest.xml} | 5 +-
... => tap-vhost-incorrect.x86_64-latest.xml} | 5 +-
...-vhost.xml => tap-vhost.x86_64-latest.xml} | 5 +-
...ues.xml => vhost_queues.x86_64-latest.xml} | 5 +-
...o-lun.xml => virtio-lun.x86_64-latest.xml} | 5 +-
...atchdog.xml => watchdog.x86_64-latest.xml} | 5 +-
tests/qemuxml2xmltest.c | 178 +++++++++---------
92 files changed, 398 insertions(+), 191 deletions(-)
rename tests/qemuxml2xmloutdata/{acpi-table.xml => acpi-table.x86_64-latest.xml}
(87%)
rename tests/qemuxml2xmloutdata/{boot-cdrom.xml => boot-cdrom.x86_64-latest.xml}
(88%)
rename tests/qemuxml2xmloutdata/{boot-floppy.xml => boot-floppy.x86_64-latest.xml}
(90%)
rename tests/qemuxml2xmloutdata/{boot-menu-disable.xml =>
boot-menu-disable-with-timeout.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{boot-menu-disable-with-timeout.xml =>
boot-menu-disable.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{boot-menu-enable-with-timeout.xml =>
boot-menu-enable-with-timeout.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{boot-multi.xml => boot-multi.x86_64-latest.xml}
(89%)
rename tests/qemuxml2xmloutdata/{boot-network.xml => boot-network.x86_64-latest.xml}
(88%)
rename tests/qemuxml2xmloutdata/{boot-order.xml => boot-order.x86_64-latest.xml}
(93%)
rename tests/qemuxml2xmloutdata/{channel-unix-source-path-active.xml =>
channel-unix-source-path-active.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{channel-unix-source-path-inactive.xml =>
channel-unix-source-path-inactive.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{console-compat-auto.xml =>
console-compat-auto.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{console-compat.xml =>
console-compat.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{cpu-check-default-none.xml =>
cpu-check-default-none.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{cpu-check-default-none2.xml =>
cpu-check-default-none2.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{cpu-check-default-partial.xml =>
cpu-check-default-partial.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{cpu-check-partial.xml =>
cpu-check-default-partial2.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{cpu-check-full.xml =>
cpu-check-full.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{cpu-check-none.xml =>
cpu-check-none.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{cpu-check-default-partial2.xml =>
cpu-check-partial.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{cpu-empty.xml => cpu-empty.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{cpu-eoi-disabled.xml =>
cpu-eoi-disabled.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{cpu-eoi-enabled.xml =>
cpu-eoi-enabled.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{cpu-host-kvmclock.xml =>
cpu-host-kvmclock.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{cpu-host-model-vendor.xml =>
cpu-host-model-vendor.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{cpu-numa-disjoint.xml =>
cpu-numa-disjoint.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{cpu-numa-disordered.xml =>
cpu-numa-disordered.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{cpu-numa-memshared.xml =>
cpu-numa-memshared.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{cpu-numa1.xml =>
cpu-numa-no-memory-element.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{cpu-numa2.xml => cpu-numa1.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{cpu-numa-no-memory-element.xml =>
cpu-numa2.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{default-kvm-host-arch.xml =>
default-kvm-host-arch.x86_64-latest.xml} (79%)
rename tests/qemuxml2xmloutdata/{default-qemu-host-arch.xml =>
default-qemu-host-arch.x86_64-latest.xml} (79%)
rename tests/qemuxml2xmloutdata/{disk-aio.xml => disk-aio.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{disk-backing-chains-index-active.xml =>
disk-backing-chains-index-active.x86_64-latest.xml} (97%)
rename tests/qemuxml2xmloutdata/{disk-backing-chains-index-inactive.xml =>
disk-backing-chains-index-inactive.x86_64-latest.xml} (97%)
rename tests/qemuxml2xmloutdata/{disk-backing-chains-noindex.xml =>
disk-backing-chains-noindex.x86_64-latest.xml} (97%)
rename tests/qemuxml2xmloutdata/{disk-boot-cdrom.xml =>
disk-boot-cdrom.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{disk-boot-disk.xml =>
disk-boot-disk.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{disk-cdrom.xml => disk-cdrom.x86_64-latest.xml}
(92%)
rename tests/qemuxml2xmloutdata/{disk-copy_on_read.xml =>
disk-copy_on_read.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{disk-error-policy.xml =>
disk-error-policy.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{disk-floppy.xml => disk-floppy.x86_64-latest.xml}
(91%)
rename tests/qemuxml2xmloutdata/{disk-fmt-qcow.xml => disk-fmt-qcow.x86_64-latest.xml}
(90%)
rename tests/qemuxml2xmloutdata/{disk-network-gluster.xml =>
disk-network-gluster.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{disk-network-nbd.xml =>
disk-network-nbd.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{disk-network-rbd.xml =>
disk-network-rbd.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{disk-network-sheepdog.xml =>
disk-network-sheepdog.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{disk-network-source-auth.xml =>
disk-network-source-auth.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{disk-network-tlsx509-nbd.xml =>
disk-network-tlsx509-nbd.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{disk-serial.xml => disk-serial.x86_64-latest.xml}
(92%)
rename tests/qemuxml2xmloutdata/{disk-source-pool-mode.xml =>
disk-source-pool-mode.x86_64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{disk-source-pool.xml =>
disk-source-pool.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{disk-virtio.xml => disk-virtio.x86_64-latest.xml}
(92%)
rename tests/qemuxml2xmloutdata/{downscript.xml => downscript.x86_64-latest.xml}
(100%)
rename tests/qemuxml2xmloutdata/{eoi-disabled.xml => eoi-disabled.x86_64-latest.xml}
(86%)
rename tests/qemuxml2xmloutdata/{eoi-enabled.xml => eoi-enabled.x86_64-latest.xml}
(86%)
rename tests/qemuxml2xmloutdata/{event_idx.xml => event_idx.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{floppy-drive-fat.xml =>
floppy-drive-fat.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{hyperv-off.xml => hyperv-off.x86_64-latest.xml}
(89%)
rename tests/qemuxml2xmloutdata/{hyperv-panic.xml => hyperv-panic.x86_64-latest.xml}
(84%)
rename tests/qemuxml2xmloutdata/{hyperv-passthrough.xml =>
hyperv-passthrough.x86_64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{hyperv-stimer-direct.xml =>
hyperv-stimer-direct.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{hyperv.xml => hyperv.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{interface-driver.xml =>
interface-driver.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{misc-no-reboot.xml =>
misc-no-reboot.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{net-coalesce.xml => net-coalesce.x86_64-latest.xml}
(94%)
rename tests/qemuxml2xmloutdata/{net-mtu.xml => net-mtu.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{net-user.xml => net-user.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{net-vhostuser.xml => net-vhostuser.x86_64-latest.xml}
(91%)
rename tests/qemuxml2xmloutdata/{numatune-auto-prefer.xml =>
numatune-auto-prefer.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{numatune-distances.xml =>
numatune-distances.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{numatune-memnode-no-memory.xml =>
numatune-memnode-no-memory.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{numatune-memnode.xml =>
numatune-memnode.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{pages-discard.xml => pages-discard.x86_64-latest.xml}
(100%)
rename tests/qemuxml2xmloutdata/{pci-rom-disabled-invalid.xml =>
pci-rom-disabled-invalid.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{pci-rom-disabled.xml =>
pci-rom-disabled.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{pci-serial-dev-chardev.xml =>
pci-serial-dev-chardev.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{pcihole64-gib.xml => pcihole64-gib.x86_64-latest.xml}
(86%)
rename tests/qemuxml2xmloutdata/{pcihole64.xml => pcihole64.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{pv-spinlock-disabled.xml =>
pv-spinlock-disabled.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{pv-spinlock-enabled.xml =>
pv-spinlock-enabled.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{serial-debugcon.xml =>
serial-debugcon.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{serial-tcp-tlsx509-chardev.xml =>
serial-tcp-tlsx509-chardev.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{tap-vhost-incorrect.xml =>
tap-vhost-incorrect.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{tap-vhost.xml => tap-vhost.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{vhost_queues.xml => vhost_queues.x86_64-latest.xml}
(93%)
rename tests/qemuxml2xmloutdata/{virtio-lun.xml => virtio-lun.x86_64-latest.xml}
(92%)
rename tests/qemuxml2xmloutdata/{watchdog.xml => watchdog.x86_64-latest.xml} (88%)
diff --git a/tests/qemuxml2argvdata/net-mtu.xml b/tests/qemuxml2argvdata/net-mtu.xml
index 092978bea0..04fa1a2686 100644
--- a/tests/qemuxml2argvdata/net-mtu.xml
+++ b/tests/qemuxml2argvdata/net-mtu.xml
@@ -10,6 +10,9 @@
<boot dev='hd'/>
<bootmenu enable='yes'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -29,7 +32,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='virtio-serial' index='0'>
diff --git a/tests/qemuxml2argvdata/pages-discard.xml
b/tests/qemuxml2argvdata/pages-discard.xml
index 99b842dabf..7d7f3351f0 100644
--- a/tests/qemuxml2argvdata/pages-discard.xml
+++ b/tests/qemuxml2argvdata/pages-discard.xml
@@ -11,7 +11,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<numa>
<cell id='0' cpus='0' memory='1048576'
unit='KiB'/>
<cell id='1' cpus='1' memory='1048576'
unit='KiB' discard='no'/>
@@ -25,7 +26,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/acpi-table.xml
b/tests/qemuxml2xmloutdata/acpi-table.x86_64-latest.xml
similarity index 87%
rename from tests/qemuxml2xmloutdata/acpi-table.xml
rename to tests/qemuxml2xmloutdata/acpi-table.x86_64-latest.xml
index 5a6c859bad..577de310fc 100644
--- a/tests/qemuxml2xmloutdata/acpi-table.xml
+++ b/tests/qemuxml2xmloutdata/acpi-table.x86_64-latest.xml
@@ -14,13 +14,16 @@
<features>
<acpi/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/boot-cdrom.xml
b/tests/qemuxml2xmloutdata/boot-cdrom.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/boot-cdrom.xml
rename to tests/qemuxml2xmloutdata/boot-cdrom.x86_64-latest.xml
index 4666777e56..8589f05399 100644
--- a/tests/qemuxml2xmloutdata/boot-cdrom.xml
+++ b/tests/qemuxml2xmloutdata/boot-cdrom.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/boot-floppy.xml
b/tests/qemuxml2xmloutdata/boot-floppy.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/boot-floppy.xml
rename to tests/qemuxml2xmloutdata/boot-floppy.x86_64-latest.xml
index 7c163b5c99..97e3d6c17d 100644
--- a/tests/qemuxml2xmloutdata/boot-floppy.xml
+++ b/tests/qemuxml2xmloutdata/boot-floppy.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='fd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -26,7 +29,7 @@
<target dev='fda' bus='fdc'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='fdc' index='0'/>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable.xml
b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/boot-menu-disable.xml
rename to tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.x86_64-latest.xml
index 04c8d42513..62549d7ea0 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-disable.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.x86_64-latest.xml
@@ -9,6 +9,9 @@
<boot dev='cdrom'/>
<bootmenu enable='no'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -22,7 +25,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
b/tests/qemuxml2xmloutdata/boot-menu-disable.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
rename to tests/qemuxml2xmloutdata/boot-menu-disable.x86_64-latest.xml
index 04c8d42513..62549d7ea0 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-disable.x86_64-latest.xml
@@ -9,6 +9,9 @@
<boot dev='cdrom'/>
<bootmenu enable='no'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -22,7 +25,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
rename to tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.x86_64-latest.xml
index e951750af5..64888293bd 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.x86_64-latest.xml
@@ -9,6 +9,9 @@
<boot dev='cdrom'/>
<bootmenu enable='yes' timeout='3000'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -22,7 +25,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/boot-multi.xml
b/tests/qemuxml2xmloutdata/boot-multi.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/boot-multi.xml
rename to tests/qemuxml2xmloutdata/boot-multi.x86_64-latest.xml
index 8c16bd9d11..bb44173f60 100644
--- a/tests/qemuxml2xmloutdata/boot-multi.xml
+++ b/tests/qemuxml2xmloutdata/boot-multi.x86_64-latest.xml
@@ -12,6 +12,9 @@
<boot dev='fd'/>
<bootmenu enable='yes'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -25,7 +28,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/boot-network.xml
b/tests/qemuxml2xmloutdata/boot-network.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/boot-network.xml
rename to tests/qemuxml2xmloutdata/boot-network.x86_64-latest.xml
index 4722ede3b7..0e60dbe5ed 100644
--- a/tests/qemuxml2xmloutdata/boot-network.xml
+++ b/tests/qemuxml2xmloutdata/boot-network.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/boot-order.xml
b/tests/qemuxml2xmloutdata/boot-order.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/boot-order.xml
rename to tests/qemuxml2xmloutdata/boot-order.x86_64-latest.xml
index 843bebda9c..64f5880c8a 100644
--- a/tests/qemuxml2xmloutdata/boot-order.xml
+++ b/tests/qemuxml2xmloutdata/boot-order.x86_64-latest.xml
@@ -7,6 +7,9 @@
<os>
<type arch='x86_64' machine='pc'>hvm</type>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -43,7 +46,7 @@
<boot order='4'/>
<address type='drive' controller='0' bus='0'
target='0' unit='1'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml
b/tests/qemuxml2xmloutdata/channel-unix-source-path-active.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml
rename to tests/qemuxml2xmloutdata/channel-unix-source-path-active.x86_64-latest.xml
index 0d6a0295f8..3c56043751 100644
--- a/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml
+++ b/tests/qemuxml2xmloutdata/channel-unix-source-path-active.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml
b/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml
rename to tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.x86_64-latest.xml
index d02ea52408..fa0aa19dd4 100644
--- a/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml
+++ b/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/console-compat-auto.xml
b/tests/qemuxml2xmloutdata/console-compat-auto.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/console-compat-auto.xml
rename to tests/qemuxml2xmloutdata/console-compat-auto.x86_64-latest.xml
index 19c72f811d..59c454375c 100644
--- a/tests/qemuxml2xmloutdata/console-compat-auto.xml
+++ b/tests/qemuxml2xmloutdata/console-compat-auto.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/console-compat.xml
b/tests/qemuxml2xmloutdata/console-compat.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/console-compat.xml
rename to tests/qemuxml2xmloutdata/console-compat.x86_64-latest.xml
index ffa6eda9c6..fd9e073e7b 100644
--- a/tests/qemuxml2xmloutdata/console-compat.xml
+++ b/tests/qemuxml2xmloutdata/console-compat.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-none.xml
b/tests/qemuxml2xmloutdata/cpu-check-default-none.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-check-default-none.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-none.x86_64-latest.xml
index d2ec332183..9b17034cd2 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-none.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-none.x86_64-latest.xml
@@ -8,14 +8,14 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
- <cpu mode='host-passthrough' check='none'
migratable='off'/>
+ <cpu mode='host-passthrough' check='none'
migratable='on'/>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
b/tests/qemuxml2xmloutdata/cpu-check-default-none2.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-none2.x86_64-latest.xml
index a7b5932314..5e230fcf28 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-none2.x86_64-latest.xml
@@ -17,7 +17,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
b/tests/qemuxml2xmloutdata/cpu-check-default-partial.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-partial.x86_64-latest.xml
index ab1a42929d..8772918cdc 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-partial.x86_64-latest.xml
@@ -15,7 +15,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-partial.xml
b/tests/qemuxml2xmloutdata/cpu-check-default-partial2.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-partial.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-partial2.x86_64-latest.xml
index 98f2fc8fd0..1b45eecbef 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-partial.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-partial2.x86_64-latest.xml
@@ -17,7 +17,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-full.xml
b/tests/qemuxml2xmloutdata/cpu-check-full.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-full.xml
rename to tests/qemuxml2xmloutdata/cpu-check-full.x86_64-latest.xml
index 11fa1349a2..affa241df2 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-full.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-full.x86_64-latest.xml
@@ -17,7 +17,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-none.xml
b/tests/qemuxml2xmloutdata/cpu-check-none.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-none.xml
rename to tests/qemuxml2xmloutdata/cpu-check-none.x86_64-latest.xml
index 4bf679692c..cbe3910a4a 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-none.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-none.x86_64-latest.xml
@@ -17,7 +17,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
b/tests/qemuxml2xmloutdata/cpu-check-partial.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
rename to tests/qemuxml2xmloutdata/cpu-check-partial.x86_64-latest.xml
index 98f2fc8fd0..1b45eecbef 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-partial.x86_64-latest.xml
@@ -17,7 +17,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-empty.xml
b/tests/qemuxml2xmloutdata/cpu-empty.x86_64-latest.xml
similarity index 85%
rename from tests/qemuxml2xmloutdata/cpu-empty.xml
rename to tests/qemuxml2xmloutdata/cpu-empty.x86_64-latest.xml
index ee700da00d..3d64e0cfbf 100644
--- a/tests/qemuxml2xmloutdata/cpu-empty.xml
+++ b/tests/qemuxml2xmloutdata/cpu-empty.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
rename to tests/qemuxml2xmloutdata/cpu-eoi-disabled.x86_64-latest.xml
index acd17da598..67a5fa4e86 100644
--- a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.x86_64-latest.xml
@@ -22,7 +22,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
rename to tests/qemuxml2xmloutdata/cpu-eoi-enabled.x86_64-latest.xml
index 49900aea9a..fcde7a6877 100644
--- a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.x86_64-latest.xml
@@ -22,7 +22,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
b/tests/qemuxml2xmloutdata/cpu-host-kvmclock.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
rename to tests/qemuxml2xmloutdata/cpu-host-kvmclock.x86_64-latest.xml
index 8de03f032c..f789f34d3d 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-kvmclock.x86_64-latest.xml
@@ -8,7 +8,7 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
- <cpu mode='host-passthrough' check='none'
migratable='off'/>
+ <cpu mode='host-passthrough' check='none'
migratable='on'/>
<clock offset='utc'>
<timer name='kvmclock' present='no'/>
</clock>
@@ -17,7 +17,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
b/tests/qemuxml2xmloutdata/cpu-host-model-vendor.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
rename to tests/qemuxml2xmloutdata/cpu-host-model-vendor.x86_64-latest.xml
index 482edbeb3d..f1ef384558 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-vendor.x86_64-latest.xml
@@ -17,7 +17,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml
index 58707b0d11..fa2ec31463 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml
@@ -8,7 +8,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='4'
threads='2'/>
<numa>
<cell id='0' cpus='0-3,8-11' memory='109550'
unit='KiB'/>
@@ -21,7 +22,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
b/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml
index 3d57037bf1..1b4d0bfa67 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml
@@ -8,7 +8,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='4'
threads='2'/>
<numa>
<cell id='0' cpus='0-5' memory='109550'
unit='KiB'/>
@@ -22,7 +23,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
b/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml
index 1883a8368d..47ed9efd69 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml
@@ -8,7 +8,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='4'
threads='2'/>
<numa>
<cell id='0' cpus='0-7' memory='109550'
unit='KiB' memAccess='shared'/>
@@ -21,7 +22,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa1.xml
b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa1.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml
index 02c12542c0..57bbacdff0 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa1.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml
@@ -8,7 +8,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='4'
threads='2'/>
<numa>
<cell id='0' cpus='0-7' memory='109550'
unit='KiB'/>
@@ -21,7 +22,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa2.xml
b/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa2.xml
rename to tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml
index 02c12542c0..57bbacdff0 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa2.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml
@@ -8,7 +8,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='4'
threads='2'/>
<numa>
<cell id='0' cpus='0-7' memory='109550'
unit='KiB'/>
@@ -21,7 +22,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
b/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
rename to tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml
index 02c12542c0..57bbacdff0 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml
@@ -8,7 +8,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='network'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='4'
threads='2'/>
<numa>
<cell id='0' cpus='0-7' memory='109550'
unit='KiB'/>
@@ -21,7 +22,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
b/tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml
similarity index 79%
rename from tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
rename to tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml
index c9f09b2231..a9de07d41c 100644
--- a/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
+++ b/tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml
@@ -5,16 +5,19 @@
<currentMemory unit='KiB'>4194304</currentMemory>
<vcpu placement='static'>4</vcpu>
<os>
- <type arch='x86_64' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc-i440fx-8.1'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
b/tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml
similarity index 79%
rename from tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
rename to tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml
index 9e3cbab7f8..37673010f6 100644
--- a/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
+++ b/tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml
@@ -5,16 +5,19 @@
<currentMemory unit='KiB'>4194304</currentMemory>
<vcpu placement='static'>4</vcpu>
<os>
- <type arch='x86_64' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc-i440fx-8.1'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/disk-aio.xml
b/tests/qemuxml2xmloutdata/disk-aio.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-aio.xml
rename to tests/qemuxml2xmloutdata/disk-aio.x86_64-latest.xml
index b65bb70589..11e175d26a 100644
--- a/tests/qemuxml2xmloutdata/disk-aio.xml
+++ b/tests/qemuxml2xmloutdata/disk-aio.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -27,7 +30,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
b/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.x86_64-latest.xml
similarity index 97%
rename from tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
rename to tests/qemuxml2xmloutdata/disk-backing-chains-index-active.x86_64-latest.xml
index 4f30bc7111..52c8ad6f29 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -147,7 +150,7 @@
<target dev='vdf' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
b/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.x86_64-latest.xml
similarity index 97%
rename from tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
rename to tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.x86_64-latest.xml
index c992679b36..ad81cd4696 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -147,7 +150,7 @@
<target dev='vdf' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
b/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.x86_64-latest.xml
similarity index 97%
rename from tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
rename to tests/qemuxml2xmloutdata/disk-backing-chains-noindex.x86_64-latest.xml
index c992679b36..ad81cd4696 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -147,7 +150,7 @@
<target dev='vdf' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/disk-boot-cdrom.xml
b/tests/qemuxml2xmloutdata/disk-boot-cdrom.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-boot-cdrom.xml
rename to tests/qemuxml2xmloutdata/disk-boot-cdrom.x86_64-latest.xml
index 329e29b8db..a322bb4a0c 100644
--- a/tests/qemuxml2xmloutdata/disk-boot-cdrom.xml
+++ b/tests/qemuxml2xmloutdata/disk-boot-cdrom.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='cdrom'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -27,7 +30,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-boot-disk.xml
b/tests/qemuxml2xmloutdata/disk-boot-disk.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-boot-disk.xml
rename to tests/qemuxml2xmloutdata/disk-boot-disk.x86_64-latest.xml
index 55e94633dd..07020849a5 100644
--- a/tests/qemuxml2xmloutdata/disk-boot-disk.xml
+++ b/tests/qemuxml2xmloutdata/disk-boot-disk.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -27,7 +30,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-cdrom.xml
b/tests/qemuxml2xmloutdata/disk-cdrom.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/disk-cdrom.xml
rename to tests/qemuxml2xmloutdata/disk-cdrom.x86_64-latest.xml
index ff70ce4d97..0a6e32ada1 100644
--- a/tests/qemuxml2xmloutdata/disk-cdrom.xml
+++ b/tests/qemuxml2xmloutdata/disk-cdrom.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -40,7 +43,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='1'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
b/tests/qemuxml2xmloutdata/disk-copy_on_read.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/disk-copy_on_read.xml
rename to tests/qemuxml2xmloutdata/disk-copy_on_read.x86_64-latest.xml
index ae76cbafad..9a55b7e04a 100644
--- a/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
+++ b/tests/qemuxml2xmloutdata/disk-copy_on_read.x86_64-latest.xml
@@ -10,6 +10,9 @@
<boot dev='hd'/>
<bootmenu enable='yes'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -29,7 +32,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='virtio-serial' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-error-policy.xml
b/tests/qemuxml2xmloutdata/disk-error-policy.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/disk-error-policy.xml
rename to tests/qemuxml2xmloutdata/disk-error-policy.x86_64-latest.xml
index 7cc5bd3ca5..d50d7dd5c5 100644
--- a/tests/qemuxml2xmloutdata/disk-error-policy.xml
+++ b/tests/qemuxml2xmloutdata/disk-error-policy.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -32,7 +35,7 @@
<target dev='hdc' bus='ide'/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-floppy.xml
b/tests/qemuxml2xmloutdata/disk-floppy.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/disk-floppy.xml
rename to tests/qemuxml2xmloutdata/disk-floppy.x86_64-latest.xml
index 1599ad2180..3542fbb6a9 100644
--- a/tests/qemuxml2xmloutdata/disk-floppy.xml
+++ b/tests/qemuxml2xmloutdata/disk-floppy.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -32,7 +35,7 @@
<target dev='fdb' bus='fdc'/>
<address type='drive' controller='0' bus='0'
target='0' unit='1'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='fdc' index='0'/>
diff --git a/tests/qemuxml2xmloutdata/disk-fmt-qcow.xml
b/tests/qemuxml2xmloutdata/disk-fmt-qcow.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-fmt-qcow.xml
rename to tests/qemuxml2xmloutdata/disk-fmt-qcow.x86_64-latest.xml
index b177021d61..11ec85a9ed 100644
--- a/tests/qemuxml2xmloutdata/disk-fmt-qcow.xml
+++ b/tests/qemuxml2xmloutdata/disk-fmt-qcow.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -27,7 +30,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-network-gluster.xml
b/tests/qemuxml2xmloutdata/disk-network-gluster.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/disk-network-gluster.xml
rename to tests/qemuxml2xmloutdata/disk-network-gluster.x86_64-latest.xml
index 4be82efe35..3213a6d7c4 100644
--- a/tests/qemuxml2xmloutdata/disk-network-gluster.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-gluster.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -40,7 +43,7 @@
<target dev='vdc' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/disk-network-nbd.xml
b/tests/qemuxml2xmloutdata/disk-network-nbd.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/disk-network-nbd.xml
rename to tests/qemuxml2xmloutdata/disk-network-nbd.x86_64-latest.xml
index 38d1f290c8..26cb503b50 100644
--- a/tests/qemuxml2xmloutdata/disk-network-nbd.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-nbd.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -63,7 +66,7 @@
<target dev='vdf' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd.xml
b/tests/qemuxml2xmloutdata/disk-network-rbd.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/disk-network-rbd.xml
rename to tests/qemuxml2xmloutdata/disk-network-rbd.x86_64-latest.xml
index a8faca96ac..6da7185d18 100644
--- a/tests/qemuxml2xmloutdata/disk-network-rbd.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-rbd.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -76,7 +79,7 @@
<target dev='vdf' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
b/tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
rename to tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-latest.xml
index a36215b8df..094de3a4d5 100644
--- a/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -28,7 +31,7 @@
<target dev='vda' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-network-source-auth.xml
b/tests/qemuxml2xmloutdata/disk-network-source-auth.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/disk-network-source-auth.xml
rename to tests/qemuxml2xmloutdata/disk-network-source-auth.x86_64-latest.xml
index 13ebb1d5d7..1c7a2d7c40 100644
--- a/tests/qemuxml2xmloutdata/disk-network-source-auth.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-source-auth.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -51,7 +54,7 @@
<target dev='vdc' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.xml
b/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.x86_64-latest.xml
similarity index 87%
rename from tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.xml
rename to tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.x86_64-latest.xml
index 1810ed3505..cc542f1e19 100644
--- a/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -22,7 +25,7 @@
<target dev='vdd' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/disk-serial.xml
b/tests/qemuxml2xmloutdata/disk-serial.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/disk-serial.xml
rename to tests/qemuxml2xmloutdata/disk-serial.x86_64-latest.xml
index e430a10a93..9d3fc4bc95 100644
--- a/tests/qemuxml2xmloutdata/disk-serial.xml
+++ b/tests/qemuxml2xmloutdata/disk-serial.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -33,7 +36,7 @@
<source file='/some/file'/>
<target dev='sda' bus='sd'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
b/tests/qemuxml2xmloutdata/disk-source-pool-mode.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
rename to tests/qemuxml2xmloutdata/disk-source-pool-mode.x86_64-latest.xml
index c9b47a970e..fb863157d8 100644
--- a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
+++ b/tests/qemuxml2xmloutdata/disk-source-pool-mode.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -56,7 +59,7 @@
<readonly/>
<address type='drive' controller='0' bus='0'
target='0' unit='4'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-source-pool.xml
b/tests/qemuxml2xmloutdata/disk-source-pool.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/disk-source-pool.xml
rename to tests/qemuxml2xmloutdata/disk-source-pool.x86_64-latest.xml
index 5d38f1286b..9ca3ec70a3 100644
--- a/tests/qemuxml2xmloutdata/disk-source-pool.xml
+++ b/tests/qemuxml2xmloutdata/disk-source-pool.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -51,7 +54,7 @@
<readonly/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-virtio.xml
b/tests/qemuxml2xmloutdata/disk-virtio.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/disk-virtio.xml
rename to tests/qemuxml2xmloutdata/disk-virtio.x86_64-latest.xml
index b54c1915f7..68830c270e 100644
--- a/tests/qemuxml2xmloutdata/disk-virtio.xml
+++ b/tests/qemuxml2xmloutdata/disk-virtio.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -39,7 +42,7 @@
<target dev='vdb' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/downscript.xml
b/tests/qemuxml2xmloutdata/downscript.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/downscript.xml
rename to tests/qemuxml2xmloutdata/downscript.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/eoi-disabled.xml
b/tests/qemuxml2xmloutdata/eoi-disabled.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/eoi-disabled.xml
rename to tests/qemuxml2xmloutdata/eoi-disabled.x86_64-latest.xml
index 93cd197364..c62aa21f37 100644
--- a/tests/qemuxml2xmloutdata/eoi-disabled.xml
+++ b/tests/qemuxml2xmloutdata/eoi-disabled.x86_64-latest.xml
@@ -13,13 +13,16 @@
<apic eoi='off'/>
<pae/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/eoi-enabled.xml
b/tests/qemuxml2xmloutdata/eoi-enabled.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/eoi-enabled.xml
rename to tests/qemuxml2xmloutdata/eoi-enabled.x86_64-latest.xml
index 17f1fab061..1b9af7ee13 100644
--- a/tests/qemuxml2xmloutdata/eoi-enabled.xml
+++ b/tests/qemuxml2xmloutdata/eoi-enabled.x86_64-latest.xml
@@ -13,13 +13,16 @@
<apic eoi='on'/>
<pae/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/event_idx.xml
b/tests/qemuxml2xmloutdata/event_idx.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/event_idx.xml
rename to tests/qemuxml2xmloutdata/event_idx.x86_64-latest.xml
index 32a5e9ca7e..44f95a756b 100644
--- a/tests/qemuxml2xmloutdata/event_idx.xml
+++ b/tests/qemuxml2xmloutdata/event_idx.x86_64-latest.xml
@@ -10,6 +10,9 @@
<boot dev='hd'/>
<bootmenu enable='yes'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -29,7 +32,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='virtio-serial' index='0'>
diff --git a/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
b/tests/qemuxml2xmloutdata/floppy-drive-fat.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/floppy-drive-fat.xml
rename to tests/qemuxml2xmloutdata/floppy-drive-fat.x86_64-latest.xml
index 7b835b7269..f4d81dbe87 100644
--- a/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
+++ b/tests/qemuxml2xmloutdata/floppy-drive-fat.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='fd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
<readonly/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/hyperv-off.xml
b/tests/qemuxml2xmloutdata/hyperv-off.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/hyperv-off.xml
rename to tests/qemuxml2xmloutdata/hyperv-off.x86_64-latest.xml
index 88e97c3de0..5805fea7b7 100644
--- a/tests/qemuxml2xmloutdata/hyperv-off.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-off.x86_64-latest.xml
@@ -27,13 +27,16 @@
<evmcs state='off'/>
</hyperv>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/hyperv-panic.xml
b/tests/qemuxml2xmloutdata/hyperv-panic.x86_64-latest.xml
similarity index 84%
rename from tests/qemuxml2xmloutdata/hyperv-panic.xml
rename to tests/qemuxml2xmloutdata/hyperv-panic.x86_64-latest.xml
index 5f7a097ac9..28f11e9358 100644
--- a/tests/qemuxml2xmloutdata/hyperv-panic.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-panic.x86_64-latest.xml
@@ -11,13 +11,16 @@
<features>
<acpi/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/hyperv-passthrough.xml
b/tests/qemuxml2xmloutdata/hyperv-passthrough.x86_64-latest.xml
similarity index 85%
rename from tests/qemuxml2xmloutdata/hyperv-passthrough.xml
rename to tests/qemuxml2xmloutdata/hyperv-passthrough.x86_64-latest.xml
index de53cb9722..2cfae8fa4c 100644
--- a/tests/qemuxml2xmloutdata/hyperv-passthrough.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-passthrough.x86_64-latest.xml
@@ -13,13 +13,16 @@
<hyperv mode='passthrough'>
</hyperv>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml
b/tests/qemuxml2xmloutdata/hyperv-stimer-direct.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml
rename to tests/qemuxml2xmloutdata/hyperv-stimer-direct.x86_64-latest.xml
index d495193fad..efb9d0072e 100644
--- a/tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-stimer-direct.x86_64-latest.xml
@@ -18,13 +18,16 @@
</stimer>
</hyperv>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/hyperv.xml
b/tests/qemuxml2xmloutdata/hyperv.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/hyperv.xml
rename to tests/qemuxml2xmloutdata/hyperv.x86_64-latest.xml
index 4445c85118..4828177263 100644
--- a/tests/qemuxml2xmloutdata/hyperv.xml
+++ b/tests/qemuxml2xmloutdata/hyperv.x86_64-latest.xml
@@ -28,13 +28,16 @@
<avic state='on'/>
</hyperv>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/interface-driver.xml
b/tests/qemuxml2xmloutdata/interface-driver.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/interface-driver.xml
rename to tests/qemuxml2xmloutdata/interface-driver.x86_64-latest.xml
index 435489e009..be40782604 100644
--- a/tests/qemuxml2xmloutdata/interface-driver.xml
+++ b/tests/qemuxml2xmloutdata/interface-driver.x86_64-latest.xml
@@ -10,6 +10,9 @@
<boot dev='hd'/>
<bootmenu enable='yes'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -29,7 +32,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='virtio-serial' index='0'>
diff --git a/tests/qemuxml2xmloutdata/misc-no-reboot.xml
b/tests/qemuxml2xmloutdata/misc-no-reboot.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/misc-no-reboot.xml
rename to tests/qemuxml2xmloutdata/misc-no-reboot.x86_64-latest.xml
index 38bea7aa24..7f4211b94b 100644
--- a/tests/qemuxml2xmloutdata/misc-no-reboot.xml
+++ b/tests/qemuxml2xmloutdata/misc-no-reboot.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>destroy</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-coalesce.xml
b/tests/qemuxml2xmloutdata/net-coalesce.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/net-coalesce.xml
rename to tests/qemuxml2xmloutdata/net-coalesce.x86_64-latest.xml
index 9a53b1941a..c99ba6c6e5 100644
--- a/tests/qemuxml2xmloutdata/net-coalesce.xml
+++ b/tests/qemuxml2xmloutdata/net-coalesce.x86_64-latest.xml
@@ -10,6 +10,9 @@
<boot dev='hd'/>
<bootmenu enable='yes'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -29,7 +32,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='virtio-serial' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-mtu.xml
b/tests/qemuxml2xmloutdata/net-mtu.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-mtu.xml
rename to tests/qemuxml2xmloutdata/net-mtu.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-user.xml
b/tests/qemuxml2xmloutdata/net-user.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/net-user.xml
rename to tests/qemuxml2xmloutdata/net-user.x86_64-latest.xml
index 7c35a41709..e02b451bfe 100644
--- a/tests/qemuxml2xmloutdata/net-user.xml
+++ b/tests/qemuxml2xmloutdata/net-user.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-vhostuser.xml
b/tests/qemuxml2xmloutdata/net-vhostuser.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/net-vhostuser.xml
rename to tests/qemuxml2xmloutdata/net-vhostuser.x86_64-latest.xml
index 8081724535..c77d46147e 100644
--- a/tests/qemuxml2xmloutdata/net-vhostuser.xml
+++ b/tests/qemuxml2xmloutdata/net-vhostuser.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
b/tests/qemuxml2xmloutdata/numatune-auto-prefer.x86_64-latest.xml
similarity index 87%
rename from tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
rename to tests/qemuxml2xmloutdata/numatune-auto-prefer.x86_64-latest.xml
index cef9f8c5e6..cb34a420bc 100644
--- a/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
+++ b/tests/qemuxml2xmloutdata/numatune-auto-prefer.x86_64-latest.xml
@@ -11,7 +11,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<numa>
<cell id='0' cpus='0' memory='65536'
unit='KiB'/>
</numa>
@@ -22,7 +23,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/numatune-distances.xml
b/tests/qemuxml2xmloutdata/numatune-distances.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/numatune-distances.xml
rename to tests/qemuxml2xmloutdata/numatune-distances.x86_64-latest.xml
index 4f038931c3..b99d78daa3 100644
--- a/tests/qemuxml2xmloutdata/numatune-distances.xml
+++ b/tests/qemuxml2xmloutdata/numatune-distances.x86_64-latest.xml
@@ -13,7 +13,8 @@
<apic/>
<pae/>
</features>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<numa>
<cell id='0' cpus='0,11' memory='2097152'
unit='KiB'>
<distances>
@@ -83,7 +84,7 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
b/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
rename to tests/qemuxml2xmloutdata/numatune-memnode-no-memory.x86_64-latest.xml
index 78a643ec2d..360d176b2f 100644
--- a/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
+++ b/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.x86_64-latest.xml
@@ -11,7 +11,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<numa>
<cell id='0' cpus='0' memory='32768'
unit='KiB'/>
<cell id='1' cpus='1' memory='32768'
unit='KiB'/>
@@ -23,7 +24,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode.xml
b/tests/qemuxml2xmloutdata/numatune-memnode.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/numatune-memnode.xml
rename to tests/qemuxml2xmloutdata/numatune-memnode.x86_64-latest.xml
index a117745bfb..06564a5327 100644
--- a/tests/qemuxml2xmloutdata/numatune-memnode.xml
+++ b/tests/qemuxml2xmloutdata/numatune-memnode.x86_64-latest.xml
@@ -13,7 +13,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<numa>
<cell id='0' cpus='0' memory='20002'
unit='KiB'/>
<cell id='1' cpus='1-27,29' memory='660066'
unit='KiB'/>
@@ -26,7 +27,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/pages-discard.xml
b/tests/qemuxml2xmloutdata/pages-discard.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pages-discard.xml
rename to tests/qemuxml2xmloutdata/pages-discard.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml
b/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml
rename to tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.x86_64-latest.xml
index a59d837cc6..6410d6320e 100644
--- a/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/pci-rom-disabled.xml
b/tests/qemuxml2xmloutdata/pci-rom-disabled.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/pci-rom-disabled.xml
rename to tests/qemuxml2xmloutdata/pci-rom-disabled.x86_64-latest.xml
index e693145163..7c00018a12 100644
--- a/tests/qemuxml2xmloutdata/pci-rom-disabled.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom-disabled.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
rename to tests/qemuxml2xmloutdata/pci-serial-dev-chardev.x86_64-latest.xml
index c730a67cec..5e2b69b427 100644
--- a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
+++ b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/pcihole64-gib.xml
b/tests/qemuxml2xmloutdata/pcihole64-gib.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/pcihole64-gib.xml
rename to tests/qemuxml2xmloutdata/pcihole64-gib.x86_64-latest.xml
index 1ad7ca40d8..5ebd8787e9 100644
--- a/tests/qemuxml2xmloutdata/pcihole64-gib.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64-gib.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -17,7 +20,7 @@
<controller type='pci' index='0' model='pci-root'>
<pcihole64 unit='KiB'>1048576</pcihole64>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/pcihole64.xml
b/tests/qemuxml2xmloutdata/pcihole64.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/pcihole64.xml
rename to tests/qemuxml2xmloutdata/pcihole64.x86_64-latest.xml
index 5058107227..45c245e25b 100644
--- a/tests/qemuxml2xmloutdata/pcihole64.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -17,7 +20,7 @@
<controller type='pci' index='0' model='pci-root'>
<pcihole64 unit='KiB'>1048576</pcihole64>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
b/tests/qemuxml2xmloutdata/pv-spinlock-disabled.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
rename to tests/qemuxml2xmloutdata/pv-spinlock-disabled.x86_64-latest.xml
index ec1f4b77bd..f95daa63b4 100644
--- a/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
+++ b/tests/qemuxml2xmloutdata/pv-spinlock-disabled.x86_64-latest.xml
@@ -13,13 +13,16 @@
<pae/>
<pvspinlock state='off'/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
b/tests/qemuxml2xmloutdata/pv-spinlock-enabled.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
rename to tests/qemuxml2xmloutdata/pv-spinlock-enabled.x86_64-latest.xml
index c82d3af837..9093d9509d 100644
--- a/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
+++ b/tests/qemuxml2xmloutdata/pv-spinlock-enabled.x86_64-latest.xml
@@ -13,13 +13,16 @@
<pae/>
<pvspinlock state='on'/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/serial-debugcon.xml
b/tests/qemuxml2xmloutdata/serial-debugcon.x86_64-latest.xml
similarity index 87%
rename from tests/qemuxml2xmloutdata/serial-debugcon.xml
rename to tests/qemuxml2xmloutdata/serial-debugcon.x86_64-latest.xml
index 4084d3b2fe..b85824c5f2 100644
--- a/tests/qemuxml2xmloutdata/serial-debugcon.xml
+++ b/tests/qemuxml2xmloutdata/serial-debugcon.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
rename to tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.x86_64-latest.xml
index 4cdefed63d..6fdc0d0d73 100644
--- a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
+++ b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
b/tests/qemuxml2xmloutdata/tap-vhost-incorrect.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
rename to tests/qemuxml2xmloutdata/tap-vhost-incorrect.x86_64-latest.xml
index 1235588810..803136669b 100644
--- a/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
+++ b/tests/qemuxml2xmloutdata/tap-vhost-incorrect.x86_64-latest.xml
@@ -10,13 +10,16 @@
<boot dev='hd'/>
<bootmenu enable='yes'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='virtio-serial' index='0'>
diff --git a/tests/qemuxml2xmloutdata/tap-vhost.xml
b/tests/qemuxml2xmloutdata/tap-vhost.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/tap-vhost.xml
rename to tests/qemuxml2xmloutdata/tap-vhost.x86_64-latest.xml
index 7f5b192f86..e4f38179ce 100644
--- a/tests/qemuxml2xmloutdata/tap-vhost.xml
+++ b/tests/qemuxml2xmloutdata/tap-vhost.x86_64-latest.xml
@@ -10,6 +10,9 @@
<boot dev='hd'/>
<bootmenu enable='yes'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -29,7 +32,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='virtio-serial' index='0'>
diff --git a/tests/qemuxml2xmloutdata/vhost_queues.xml
b/tests/qemuxml2xmloutdata/vhost_queues.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/vhost_queues.xml
rename to tests/qemuxml2xmloutdata/vhost_queues.x86_64-latest.xml
index 46428b59e2..8fbc4ccc99 100644
--- a/tests/qemuxml2xmloutdata/vhost_queues.xml
+++ b/tests/qemuxml2xmloutdata/vhost_queues.x86_64-latest.xml
@@ -10,6 +10,9 @@
<boot dev='hd'/>
<bootmenu enable='yes'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -29,7 +32,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='virtio-serial' index='0'>
diff --git a/tests/qemuxml2xmloutdata/virtio-lun.xml
b/tests/qemuxml2xmloutdata/virtio-lun.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/virtio-lun.xml
rename to tests/qemuxml2xmloutdata/virtio-lun.x86_64-latest.xml
index cdb804e9a0..1b891bdb4e 100644
--- a/tests/qemuxml2xmloutdata/virtio-lun.xml
+++ b/tests/qemuxml2xmloutdata/virtio-lun.x86_64-latest.xml
@@ -10,6 +10,9 @@
<boot dev='hd'/>
<bootmenu enable='yes'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -28,7 +31,7 @@
<target dev='vdb' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='virtio-serial' index='0'>
diff --git a/tests/qemuxml2xmloutdata/watchdog.xml
b/tests/qemuxml2xmloutdata/watchdog.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/watchdog.xml
rename to tests/qemuxml2xmloutdata/watchdog.x86_64-latest.xml
index 1dde2ee700..b87d5c4fdf 100644
--- a/tests/qemuxml2xmloutdata/watchdog.xml
+++ b/tests/qemuxml2xmloutdata/watchdog.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 2beb5b3ce9..30c56b9e83 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -190,8 +190,6 @@ mymain(void)
#define DO_TEST(name, ...) \
DO_TEST_FULL(name, "", WHEN_BOTH, \
ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END)
-#define DO_TEST_NOCAPS(name) \
- DO_TEST_FULL(name, "", WHEN_BOTH, ARG_END)
/* Unset or set all envvars here that are copied in qemudBuildCommandLine
* using ADD_ENV_COPY, otherwise these tests may fail due to unexpected
@@ -209,31 +207,31 @@ mymain(void)
DO_TEST_CAPS_LATEST("machine-smm-off");
DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-hostdev", "s390x");
DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-multiple-disks-nets-s390",
"s390x");
- DO_TEST_NOCAPS("default-kvm-host-arch");
- DO_TEST_NOCAPS("default-qemu-host-arch");
- DO_TEST_NOCAPS("boot-cdrom");
- DO_TEST_NOCAPS("boot-network");
- DO_TEST_NOCAPS("boot-floppy");
+ DO_TEST_CAPS_LATEST("default-kvm-host-arch");
+ DO_TEST_CAPS_LATEST("default-qemu-host-arch");
+ DO_TEST_CAPS_LATEST("boot-cdrom");
+ DO_TEST_CAPS_LATEST("boot-network");
+ DO_TEST_CAPS_LATEST("boot-floppy");
DO_TEST("boot-floppy-q35",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI);
- DO_TEST_NOCAPS("boot-multi");
- DO_TEST_NOCAPS("boot-menu-enable-with-timeout");
- DO_TEST_NOCAPS("boot-menu-disable");
- DO_TEST_NOCAPS("boot-menu-disable-with-timeout");
- DO_TEST_NOCAPS("boot-order");
+ DO_TEST_CAPS_LATEST("boot-multi");
+ DO_TEST_CAPS_LATEST("boot-menu-enable-with-timeout");
+ DO_TEST_CAPS_LATEST("boot-menu-disable");
+ DO_TEST_CAPS_LATEST("boot-menu-disable-with-timeout");
+ DO_TEST_CAPS_LATEST("boot-order");
DO_TEST_CAPS_LATEST("reboot-timeout-enabled");
DO_TEST_CAPS_LATEST("reboot-timeout-disabled");
DO_TEST_CAPS_LATEST("clock-utc");
DO_TEST_CAPS_LATEST("clock-localtime");
- DO_TEST_NOCAPS("cpu-empty");
+ DO_TEST_CAPS_LATEST("cpu-empty");
DO_TEST_CAPS_LATEST("cpu-kvmclock");
- DO_TEST_NOCAPS("cpu-host-kvmclock");
+ DO_TEST_CAPS_LATEST("cpu-host-kvmclock");
DO_TEST_CAPS_LATEST("cpu-host-passthrough-features");
DO_TEST_CAPS_LATEST("cpu-host-model-features");
- DO_TEST_NOCAPS("cpu-host-model-vendor");
+ DO_TEST_CAPS_LATEST("cpu-host-model-vendor");
DO_TEST("clock-catchup", QEMU_CAPS_KVM_PIT_TICK_POLICY);
DO_TEST_CAPS_LATEST("kvmclock");
DO_TEST_CAPS_LATEST("clock-timer-hyperv-rtc");
@@ -241,18 +239,18 @@ mymain(void)
DO_TEST_CAPS_LATEST("clock-realtime");
DO_TEST_CAPS_LATEST("clock-absolute");
- DO_TEST_NOCAPS("cpu-eoi-disabled");
- DO_TEST_NOCAPS("cpu-eoi-enabled");
- DO_TEST_NOCAPS("eoi-disabled");
- DO_TEST_NOCAPS("eoi-enabled");
- DO_TEST_NOCAPS("pv-spinlock-disabled");
- DO_TEST_NOCAPS("pv-spinlock-enabled");
+ DO_TEST_CAPS_LATEST("cpu-eoi-disabled");
+ DO_TEST_CAPS_LATEST("cpu-eoi-enabled");
+ DO_TEST_CAPS_LATEST("eoi-disabled");
+ DO_TEST_CAPS_LATEST("eoi-enabled");
+ DO_TEST_CAPS_LATEST("pv-spinlock-disabled");
+ DO_TEST_CAPS_LATEST("pv-spinlock-enabled");
- DO_TEST_NOCAPS("hyperv");
- DO_TEST_NOCAPS("hyperv-off");
- DO_TEST_NOCAPS("hyperv-panic");
- DO_TEST_NOCAPS("hyperv-passthrough");
- DO_TEST_NOCAPS("hyperv-stimer-direct");
+ DO_TEST_CAPS_LATEST("hyperv");
+ DO_TEST_CAPS_LATEST("hyperv-off");
+ DO_TEST_CAPS_LATEST("hyperv-panic");
+ DO_TEST_CAPS_LATEST("hyperv-passthrough");
+ DO_TEST_CAPS_LATEST("hyperv-stimer-direct");
DO_TEST_CAPS_LATEST("kvm-features");
DO_TEST_CAPS_LATEST("kvm-features-off");
@@ -260,7 +258,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("pmu-feature");
DO_TEST_CAPS_LATEST("pmu-feature-off");
- DO_TEST_NOCAPS("pages-discard");
+ DO_TEST_CAPS_LATEST("pages-discard");
DO_TEST_CAPS_LATEST("pages-discard-hugepages");
DO_TEST_CAPS_LATEST("pages-dimm-discard");
DO_TEST_CAPS_LATEST("hugepages-default");
@@ -281,40 +279,40 @@ mymain(void)
DO_TEST_CAPS_LATEST("migrate");
DO_TEST_CAPS_LATEST("qemu-ns-no-env");
DO_TEST_CAPS_LATEST("qemu-ns");
- DO_TEST_NOCAPS("disk-aio");
+ DO_TEST_CAPS_LATEST("disk-aio");
DO_TEST_CAPS_LATEST("disk-aio-io_uring");
- DO_TEST_NOCAPS("disk-cdrom");
+ DO_TEST_CAPS_LATEST("disk-cdrom");
/* The 'disk-cdrom-empty-network-invalid' test case uses separate
* '-active'/'-inactive' output files to work around
'virschematest'
* thinking the output file is invalid XML */
DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid");
DO_TEST_CAPS_LATEST("disk-cdrom-network");
DO_TEST("disk-cdrom-bus-other", QEMU_CAPS_DEVICE_USB_STORAGE);
- DO_TEST_NOCAPS("disk-floppy");
+ DO_TEST_CAPS_LATEST("disk-floppy");
DO_TEST("disk-usb-device", QEMU_CAPS_DEVICE_USB_STORAGE);
- DO_TEST_NOCAPS("disk-virtio");
- DO_TEST_NOCAPS("floppy-drive-fat");
+ DO_TEST_CAPS_LATEST("disk-virtio");
+ DO_TEST_CAPS_LATEST("floppy-drive-fat");
DO_TEST_CAPS_LATEST("disk-virtio-queues");
- DO_TEST_NOCAPS("disk-boot-disk");
- DO_TEST_NOCAPS("disk-boot-cdrom");
- DO_TEST_NOCAPS("disk-error-policy");
+ DO_TEST_CAPS_LATEST("disk-boot-disk");
+ DO_TEST_CAPS_LATEST("disk-boot-cdrom");
+ DO_TEST_CAPS_LATEST("disk-error-policy");
DO_TEST_CAPS_LATEST("disk-transient");
- DO_TEST_NOCAPS("disk-fmt-qcow");
+ DO_TEST_CAPS_LATEST("disk-fmt-qcow");
DO_TEST_CAPS_LATEST("disk-cache");
DO_TEST_CAPS_LATEST("disk-metadata-cache");
- DO_TEST_NOCAPS("disk-network-nbd");
+ DO_TEST_CAPS_LATEST("disk-network-nbd");
DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_SCSI_BLOCK);
- DO_TEST_NOCAPS("disk-network-gluster");
- DO_TEST_NOCAPS("disk-network-rbd");
+ DO_TEST_CAPS_LATEST("disk-network-gluster");
+ DO_TEST_CAPS_LATEST("disk-network-rbd");
DO_TEST_CAPS_LATEST("disk-network-rbd-encryption");
DO_TEST_CAPS_LATEST("disk-network-rbd-encryption-layering");
DO_TEST_CAPS_LATEST("disk-network-rbd-encryption-luks-any");
- DO_TEST_NOCAPS("disk-network-source-auth");
- DO_TEST_NOCAPS("disk-network-sheepdog");
+ DO_TEST_CAPS_LATEST("disk-network-source-auth");
+ DO_TEST_CAPS_LATEST("disk-network-sheepdog");
DO_TEST_CAPS_VER("disk-network-vxhs", "5.0.0");
DO_TEST_CAPS_LATEST("disk-network-nfs");
- DO_TEST_NOCAPS("disk-network-tlsx509-nbd");
+ DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd");
DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname");
DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "5.0.0");
DO_TEST_CAPS_LATEST("disk-nvme");
@@ -425,10 +423,10 @@ mymain(void)
QEMU_CAPS_PIIX_DISABLE_S3,
QEMU_CAPS_PIIX_DISABLE_S4);
DO_TEST("misc-enable-s4", QEMU_CAPS_PIIX_DISABLE_S4);
- DO_TEST_NOCAPS("misc-no-reboot");
+ DO_TEST_CAPS_LATEST("misc-no-reboot");
DO_TEST_CAPS_LATEST("misc-uuid");
- DO_TEST_NOCAPS("net-vhostuser");
- DO_TEST_NOCAPS("net-user");
+ DO_TEST_CAPS_LATEST("net-vhostuser");
+ DO_TEST_CAPS_LATEST("net-user");
DO_TEST_CAPS_LATEST("net-user-addr");
DO_TEST_CAPS_LATEST("net-user-passt");
DO_TEST_CAPS_LATEST("net-virtio");
@@ -453,18 +451,18 @@ mymain(void)
DO_TEST_CAPS_LATEST("net-midonet");
DO_TEST_CAPS_LATEST("net-openvswitch");
DO_TEST_CAPS_LATEST("sound-device");
- DO_TEST_NOCAPS("watchdog");
+ DO_TEST_CAPS_LATEST("watchdog");
DO_TEST_CAPS_LATEST("watchdog-q35-multiple");
DO_TEST("net-bandwidth", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_VNC);
DO_TEST("net-bandwidth2", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_VNC);
- DO_TEST_NOCAPS("net-mtu");
- DO_TEST_NOCAPS("net-coalesce");
+ DO_TEST_CAPS_LATEST("net-mtu");
+ DO_TEST_CAPS_LATEST("net-coalesce");
DO_TEST_CAPS_LATEST("net-many-models");
DO_TEST("net-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA);
DO_TEST("net-vdpa-multiqueue", QEMU_CAPS_NETDEV_VHOST_VDPA);
DO_TEST_CAPS_LATEST("net-virtio-rss");
- DO_TEST_NOCAPS("serial-tcp-tlsx509-chardev");
+ DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev");
DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev-notls");
cfg->spiceTLS = true;
@@ -473,15 +471,15 @@ mymain(void)
QEMU_CAPS_SPICE);
cfg->spiceTLS = false;
- DO_TEST_NOCAPS("serial-debugcon");
- DO_TEST_NOCAPS("console-compat");
+ DO_TEST_CAPS_LATEST("serial-debugcon");
+ DO_TEST_CAPS_LATEST("console-compat");
DO_TEST_CAPS_LATEST("console-compat2");
DO_TEST_CAPS_LATEST("console-virtio-many");
DO_TEST_CAPS_LATEST("channel-guestfwd");
DO_TEST_CAPS_LATEST("channel-virtio");
DO_TEST_CAPS_LATEST("channel-virtio-state");
- DO_TEST_NOCAPS("channel-unix-source-path");
+ DO_TEST_CAPS_LATEST("channel-unix-source-path");
DO_TEST_CAPS_LATEST("hostdev-usb-address");
DO_TEST_CAPS_LATEST("hostdev-pci-address");
@@ -503,9 +501,9 @@ mymain(void)
QEMU_CAPS_VNC);
DO_TEST_CAPS_LATEST("hostdev-mdev-display-ramfb");
DO_TEST_CAPS_LATEST("pci-rom");
- DO_TEST_NOCAPS("pci-rom-disabled");
- DO_TEST_NOCAPS("pci-rom-disabled-invalid");
- DO_TEST_NOCAPS("pci-serial-dev-chardev");
+ DO_TEST_CAPS_LATEST("pci-rom-disabled");
+ DO_TEST_CAPS_LATEST("pci-rom-disabled-invalid");
+ DO_TEST_CAPS_LATEST("pci-serial-dev-chardev");
DO_TEST_CAPS_LATEST("disk-slices");
DO_TEST_CAPS_LATEST("disk-rotation");
@@ -535,11 +533,11 @@ mymain(void)
DO_TEST_CAPS_LATEST("iothreads-virtio-scsi-pci");
DO_TEST_CAPS_ARCH_LATEST("iothreads-virtio-scsi-ccw", "s390x");
DO_TEST_CAPS_LATEST("lease");
- DO_TEST_NOCAPS("event_idx");
- DO_TEST_NOCAPS("vhost_queues");
- DO_TEST_NOCAPS("interface-driver");
+ DO_TEST_CAPS_LATEST("event_idx");
+ DO_TEST_CAPS_LATEST("vhost_queues");
+ DO_TEST_CAPS_LATEST("interface-driver");
DO_TEST_CAPS_LATEST("net-server");
- DO_TEST_NOCAPS("virtio-lun");
+ DO_TEST_CAPS_LATEST("virtio-lun");
DO_TEST_CAPS_LATEST("usb-none");
DO_TEST_CAPS_LATEST("usb-controller");
@@ -597,14 +595,14 @@ mymain(void)
DO_TEST("disk-scsi-disk-vpd",
QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI);
- DO_TEST_NOCAPS("disk-source-pool");
- DO_TEST_NOCAPS("disk-source-pool-mode");
+ DO_TEST_CAPS_LATEST("disk-source-pool");
+ DO_TEST_CAPS_LATEST("disk-source-pool-mode");
DO_TEST_CAPS_LATEST("disk-discard");
DO_TEST_CAPS_LATEST("disk-detect-zeroes");
DO_TEST_CAPS_LATEST("disk-discard_no_unref");
- DO_TEST_NOCAPS("disk-serial");
+ DO_TEST_CAPS_LATEST("disk-serial");
DO_TEST_CAPS_ARCH_LATEST("disk-arm-virtio-sd", "aarch64");
@@ -652,7 +650,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("balloon-device-auto");
DO_TEST_CAPS_LATEST("balloon-device-period");
DO_TEST_CAPS_LATEST("channel-virtio-auto");
- DO_TEST_NOCAPS("console-compat-auto");
+ DO_TEST_CAPS_LATEST("console-compat-auto");
DO_TEST("disk-scsi-device-auto",
QEMU_CAPS_SCSI_LSI);
DO_TEST_CAPS_LATEST("console-virtio");
@@ -664,7 +662,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-no-cpuset-and-placement");
DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-cpuset");
DO_TEST_CAPS_LATEST("usb-ich9-ehci-addr");
- DO_TEST_NOCAPS("disk-copy_on_read");
+ DO_TEST_CAPS_LATEST("disk-copy_on_read");
DO_TEST_CAPS_LATEST("tpm-passthrough");
DO_TEST_CAPS_LATEST("tpm-passthrough-crb");
DO_TEST_CAPS_LATEST("tpm-emulator");
@@ -819,8 +817,8 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("s390-serial-2", "s390x");
DO_TEST_CAPS_ARCH_LATEST("s390-serial-console", "s390x");
- DO_TEST_NOCAPS("pcihole64");
- DO_TEST_NOCAPS("pcihole64-gib");
+ DO_TEST_CAPS_LATEST("pcihole64");
+ DO_TEST_CAPS_LATEST("pcihole64-gib");
DO_TEST("pcihole64-q35",
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
@@ -835,8 +833,8 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("pvpanic-pci-aarch64", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("pvpanic-pci-no-address-aarch64",
"aarch64");
- DO_TEST_NOCAPS("disk-backing-chains-index");
- DO_TEST_NOCAPS("disk-backing-chains-noindex");
+ DO_TEST_CAPS_LATEST("disk-backing-chains-index");
+ DO_TEST_CAPS_LATEST("disk-backing-chains-noindex");
DO_TEST_CAPS_LATEST("disk-source-fd");
@@ -846,17 +844,17 @@ mymain(void)
QEMU_CAPS_DEVICE_VIRTIO_RNG,
QEMU_CAPS_OBJECT_RNG_EGD);
- DO_TEST_NOCAPS("cpu-numa1");
- DO_TEST_NOCAPS("cpu-numa2");
- DO_TEST_NOCAPS("cpu-numa-no-memory-element");
- DO_TEST_NOCAPS("cpu-numa-disordered");
- DO_TEST_NOCAPS("cpu-numa-disjoint");
- DO_TEST_NOCAPS("cpu-numa-memshared");
-
- DO_TEST_NOCAPS("numatune-auto-prefer");
- DO_TEST_NOCAPS("numatune-memnode");
- DO_TEST_NOCAPS("numatune-memnode-no-memory");
- DO_TEST_NOCAPS("numatune-distances");
+ DO_TEST_CAPS_LATEST("cpu-numa1");
+ DO_TEST_CAPS_LATEST("cpu-numa2");
+ DO_TEST_CAPS_LATEST("cpu-numa-no-memory-element");
+ DO_TEST_CAPS_LATEST("cpu-numa-disordered");
+ DO_TEST_CAPS_LATEST("cpu-numa-disjoint");
+ DO_TEST_CAPS_LATEST("cpu-numa-memshared");
+
+ DO_TEST_CAPS_LATEST("numatune-auto-prefer");
+ DO_TEST_CAPS_LATEST("numatune-memnode");
+ DO_TEST_CAPS_LATEST("numatune-memnode-no-memory");
+ DO_TEST_CAPS_LATEST("numatune-distances");
DO_TEST_CAPS_LATEST("numatune-no-vcpu");
DO_TEST("numatune-hmat", QEMU_CAPS_NUMA_HMAT);
DO_TEST_CAPS_LATEST("numatune-hmat-none");
@@ -911,8 +909,8 @@ mymain(void)
DO_TEST_CAPS_LATEST("firmware-auto-efi-format-nvram-qcow2-network-nbd");
DO_TEST_CAPS_ARCH_LATEST("firmware-auto-efi-format-loader-raw",
"aarch64");
- DO_TEST_NOCAPS("tap-vhost");
- DO_TEST_NOCAPS("tap-vhost-incorrect");
+ DO_TEST_CAPS_LATEST("tap-vhost");
+ DO_TEST_CAPS_LATEST("tap-vhost-incorrect");
DO_TEST("shmem", QEMU_CAPS_DEVICE_IVSHMEM);
DO_TEST("shmem-plain-doorbell",
QEMU_CAPS_DEVICE_IVSHMEM_PLAIN, QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL);
@@ -1060,7 +1058,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("memfd-memory-numa");
DO_TEST_CAPS_LATEST("memfd-memory-default-hugepage");
- DO_TEST_NOCAPS("acpi-table");
+ DO_TEST_CAPS_LATEST("acpi-table");
DO_TEST("video-device-pciaddr-default",
QEMU_CAPS_KVM,
@@ -1086,13 +1084,13 @@ mymain(void)
DO_TEST_CAPS_LATEST("virtio-iommu-x86_64");
DO_TEST_CAPS_ARCH_LATEST("virtio-iommu-aarch64", "aarch64");
- DO_TEST_NOCAPS("cpu-check-none");
- DO_TEST_NOCAPS("cpu-check-partial");
- DO_TEST_NOCAPS("cpu-check-full");
- DO_TEST_NOCAPS("cpu-check-default-none");
- DO_TEST_NOCAPS("cpu-check-default-none2");
- DO_TEST_NOCAPS("cpu-check-default-partial");
- DO_TEST_NOCAPS("cpu-check-default-partial2");
+ DO_TEST_CAPS_LATEST("cpu-check-none");
+ DO_TEST_CAPS_LATEST("cpu-check-partial");
+ DO_TEST_CAPS_LATEST("cpu-check-full");
+ DO_TEST_CAPS_LATEST("cpu-check-default-none");
+ DO_TEST_CAPS_LATEST("cpu-check-default-none2");
+ DO_TEST_CAPS_LATEST("cpu-check-default-partial");
+ DO_TEST_CAPS_LATEST("cpu-check-default-partial2");
DO_TEST("vmcoreinfo", QEMU_CAPS_DEVICE_VMCOREINFO);
DO_TEST("smartcard-host", QEMU_CAPS_CCID_EMULATED);
@@ -1173,7 +1171,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("virtio-9p-multidevs");
DO_TEST_CAPS_LATEST("virtio-9p-createmode");
- DO_TEST_NOCAPS("downscript");
+ DO_TEST_CAPS_LATEST("downscript");
/* Simplest possible <audio>, all supported with ENV */
DO_TEST_CAPS_LATEST("audio-none-minimal");
--
2.41.0
7:53 a.m.
New subject: [PATCH 11/24] qemuxml2xmltest: Convert rest of 'DO_TEST_NOCAPS' cases to 'DO_TEST_CAPS_LATEST'
On a Thursday in 2023, Peter Krempa wrote:
Finish the conversion of cases which didn't need any special
capabilities to use real capabilities.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/net-mtu.xml | 5 +-
tests/qemuxml2argvdata/pages-discard.xml | 5 +-
...table.xml => acpi-table.x86_64-latest.xml} | 5 +-
...cdrom.xml => boot-cdrom.x86_64-latest.xml} | 5 +-
...oppy.xml => boot-floppy.x86_64-latest.xml} | 5 +-
[...]
...ues.xml => vhost_queues.x86_64-latest.xml} | 5 +-
...o-lun.xml => virtio-lun.x86_64-latest.xml} | 5 +-
...atchdog.xml => watchdog.x86_64-latest.xml} | 5 +-
tests/qemuxml2xmltest.c | 178 +++++++++---------
92 files changed, 398 insertions(+), 191 deletions(-)
rename tests/qemuxml2xmloutdata/{acpi-table.xml => acpi-table.x86_64-latest.xml}
(87%)
rename tests/qemuxml2xmloutdata/{boot-cdrom.xml => boot-cdrom.x86_64-latest.xml}
(88%)
rename tests/qemuxml2xmloutdata/{boot-floppy.xml => boot-floppy.x86_64-latest.xml}
(90%)
[...]
rename tests/qemuxml2xmloutdata/{tap-vhost.xml =>
tap-vhost.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{vhost_queues.xml => vhost_queues.x86_64-latest.xml}
(93%)
rename tests/qemuxml2xmloutdata/{virtio-lun.xml => virtio-lun.x86_64-latest.xml}
(92%)
rename tests/qemuxml2xmloutdata/{watchdog.xml => watchdog.x86_64-latest.xml} (88%)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 12/24] qemuxml2(argv|xml)test: Modernize 'graphics-dbus*' tests
Use latest caps for this rather recent graphics protocol.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
... graphics-dbus-address.x86_64-latest.args} | 12 ++++---
.../graphics-dbus-address.xml | 5 ++-
...=> graphics-dbus-audio.x86_64-latest.args} | 14 ++++----
.../qemuxml2argvdata/graphics-dbus-audio.xml | 5 ++-
... graphics-dbus-chardev.x86_64-latest.args} | 14 ++++----
.../graphics-dbus-chardev.xml | 5 ++-
tests/qemuxml2argvdata/graphics-dbus-p2p.args | 30 ----------------
...s => graphics-dbus-p2p.x86_64-latest.args} | 16 ++++-----
tests/qemuxml2argvdata/graphics-dbus-p2p.xml | 5 ++-
.../graphics-dbus-usbredir.x86_64-latest.args | 36 +++++++++++++++++++
....args => graphics-dbus.x86_64-latest.args} | 12 ++++---
tests/qemuxml2argvdata/graphics-dbus.xml | 5 ++-
tests/qemuxml2argvtest.c | 22 ++++--------
...> graphics-dbus-address.x86_64-latest.xml} | 0
... => graphics-dbus-audio.x86_64-latest.xml} | 0
...> graphics-dbus-chardev.x86_64-latest.xml} | 0
...ml => graphics-dbus-p2p.x86_64-latest.xml} | 0
...us.xml => graphics-dbus.x86_64-latest.xml} | 0
tests/qemuxml2xmltest.c | 20 +++--------
19 files changed, 104 insertions(+), 97 deletions(-)
rename tests/qemuxml2argvdata/{graphics-dbus-address.args =>
graphics-dbus-address.x86_64-latest.args} (59%)
rename tests/qemuxml2argvdata/{graphics-dbus-audio.args =>
graphics-dbus-audio.x86_64-latest.args} (63%)
rename tests/qemuxml2argvdata/{graphics-dbus-chardev.args =>
graphics-dbus-chardev.x86_64-latest.args} (56%)
delete mode 100644 tests/qemuxml2argvdata/graphics-dbus-p2p.args
rename tests/qemuxml2argvdata/{graphics-dbus-usbredir.args =>
graphics-dbus-p2p.x86_64-latest.args} (58%)
create mode 100644 tests/qemuxml2argvdata/graphics-dbus-usbredir.x86_64-latest.args
rename tests/qemuxml2argvdata/{graphics-dbus.args => graphics-dbus.x86_64-latest.args}
(60%)
rename tests/qemuxml2xmloutdata/{graphics-dbus-address.xml =>
graphics-dbus-address.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{graphics-dbus-audio.xml =>
graphics-dbus-audio.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{graphics-dbus-chardev.xml =>
graphics-dbus-chardev.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{graphics-dbus-p2p.xml =>
graphics-dbus-p2p.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{graphics-dbus.xml => graphics-dbus.x86_64-latest.xml}
(100%)
diff --git a/tests/qemuxml2argvdata/graphics-dbus-address.args
b/tests/qemuxml2argvdata/graphics-dbus-address.x86_64-latest.args
similarity index 59%
rename from tests/qemuxml2argvdata/graphics-dbus-address.args
rename to tests/qemuxml2argvdata/graphics-dbus-address.x86_64-latest.args
index 0dfdb37d0a..bcba7f8f64 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-address.args
+++ b/tests/qemuxml2argvdata/graphics-dbus-address.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -22,9 +24,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
-display dbus,addr=unix:path=/tmp/foo,gl=on,rendernode=/dev/dri/foo \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/graphics-dbus-address.xml
b/tests/qemuxml2argvdata/graphics-dbus-address.xml
index 18e8e71701..09e37e8f5f 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-address.xml
+++ b/tests/qemuxml2argvdata/graphics-dbus-address.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2argvdata/graphics-dbus-audio.args
b/tests/qemuxml2argvdata/graphics-dbus-audio.x86_64-latest.args
similarity index 63%
rename from tests/qemuxml2argvdata/graphics-dbus-audio.args
rename to tests/qemuxml2argvdata/graphics-dbus-audio.x86_64-latest.args
index 8cb0e6718c..a484978d1a 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-audio.args
+++ b/tests/qemuxml2argvdata/graphics-dbus-audio.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -22,13 +24,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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,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":"dbus","in":{"mixing-engine":false},"out":{"mixing-engine":false}}'
\
-display dbus,p2p=on,audiodev=audio1 \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/graphics-dbus-audio.xml
b/tests/qemuxml2argvdata/graphics-dbus-audio.xml
index b257370187..a8d0d5bbe9 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-audio.xml
+++ b/tests/qemuxml2argvdata/graphics-dbus-audio.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2argvdata/graphics-dbus-chardev.args
b/tests/qemuxml2argvdata/graphics-dbus-chardev.x86_64-latest.args
similarity index 56%
rename from tests/qemuxml2argvdata/graphics-dbus-chardev.args
rename to tests/qemuxml2argvdata/graphics-dbus-chardev.x86_64-latest.args
index d8ddc54b99..7ab1eb7787 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-chardev.args
+++ b/tests/qemuxml2argvdata/graphics-dbus-chardev.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -22,11 +24,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
-chardev dbus,id=charserial0,name=org.qemu.console.serial.0 \
--device isa-serial,chardev=charserial0,id=serial0,index=1 \
+-device
'{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":1}'
\
-display dbus,p2p=on \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/graphics-dbus-chardev.xml
b/tests/qemuxml2argvdata/graphics-dbus-chardev.xml
index 76f4b406db..c1348aeb3b 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-chardev.xml
+++ b/tests/qemuxml2argvdata/graphics-dbus-chardev.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2argvdata/graphics-dbus-p2p.args
b/tests/qemuxml2argvdata/graphics-dbus-p2p.args
deleted file mode 100644
index d2b335aa28..0000000000
--- a/tests/qemuxml2argvdata/graphics-dbus-p2p.args
+++ /dev/null
@@ -1,30 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--display dbus,p2p=on \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/graphics-dbus-usbredir.args
b/tests/qemuxml2argvdata/graphics-dbus-p2p.x86_64-latest.args
similarity index 58%
rename from tests/qemuxml2argvdata/graphics-dbus-usbredir.args
rename to tests/qemuxml2argvdata/graphics-dbus-p2p.x86_64-latest.args
index a42aca5305..9fda433320 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-usbredir.args
+++ b/tests/qemuxml2argvdata/graphics-dbus-p2p.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -22,13 +24,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
-display dbus,p2p=on \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
--chardev dbus,id=charredir0,name=org.qemu.usbredir \
--device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=1 \
--chardev dbus,id=charredir1,name=org.qemu.usbredir \
--device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=2 \
+-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/graphics-dbus-p2p.xml
b/tests/qemuxml2argvdata/graphics-dbus-p2p.xml
index 8d54d042b0..2de2b92efe 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-p2p.xml
+++ b/tests/qemuxml2argvdata/graphics-dbus-p2p.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2argvdata/graphics-dbus-usbredir.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-dbus-usbredir.x86_64-latest.args
new file mode 100644
index 0000000000..ceec8dbc89
--- /dev/null
+++ b/tests/qemuxml2argvdata/graphics-dbus-usbredir.x86_64-latest.args
@@ -0,0 +1,36 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-display dbus,p2p=on \
+-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
+-chardev dbus,id=charredir0,name=org.qemu.usbredir \
+-device
'{"driver":"usb-redir","chardev":"charredir0","id":"redir0","bus":"usb.0","port":"1"}'
\
+-chardev dbus,id=charredir1,name=org.qemu.usbredir \
+-device
'{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bus":"usb.0","port":"2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/graphics-dbus.args
b/tests/qemuxml2argvdata/graphics-dbus.x86_64-latest.args
similarity index 60%
rename from tests/qemuxml2argvdata/graphics-dbus.args
rename to tests/qemuxml2argvdata/graphics-dbus.x86_64-latest.args
index 56d926a0eb..33fb8b0e12 100644
--- a/tests/qemuxml2argvdata/graphics-dbus.args
+++ b/tests/qemuxml2argvdata/graphics-dbus.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -22,9 +24,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
-display dbus,addr=unix:path=/var/run/libvirt/qemu/dbus/-1-QEMUGuest1-dbus.sock \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
+-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/graphics-dbus.xml
b/tests/qemuxml2argvdata/graphics-dbus.xml
index 8dec42cde7..fbe1e7431a 100644
--- a/tests/qemuxml2argvdata/graphics-dbus.xml
+++ b/tests/qemuxml2argvdata/graphics-dbus.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index fdaea8e3f1..19ca1c0177 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1347,22 +1347,12 @@ mymain(void)
DO_TEST_CAPS_LATEST("graphics-spice-gl-auto-rendernode");
driver.config->spiceTLS = 0;
- DO_TEST("graphics-dbus",
- QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS);
- DO_TEST("graphics-dbus-address",
- QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS);
- DO_TEST("graphics-dbus-p2p",
- QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS);
- DO_TEST("graphics-dbus-audio",
- QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS);
- DO_TEST("graphics-dbus-chardev",
- QEMU_CAPS_DEVICE_ISA_SERIAL,
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_DISPLAY_DBUS);
- DO_TEST("graphics-dbus-usbredir",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_DISPLAY_DBUS,
- QEMU_CAPS_USB_REDIR);
+ DO_TEST_CAPS_LATEST("graphics-dbus");
+ DO_TEST_CAPS_LATEST("graphics-dbus-address");
+ DO_TEST_CAPS_LATEST("graphics-dbus-p2p");
+ DO_TEST_CAPS_LATEST("graphics-dbus-audio");
+ DO_TEST_CAPS_LATEST("graphics-dbus-chardev");
+ DO_TEST_CAPS_LATEST("graphics-dbus-usbredir");
DO_TEST_NOCAPS("input-usbmouse");
DO_TEST_NOCAPS("input-usbtablet");
diff --git a/tests/qemuxml2xmloutdata/graphics-dbus-address.xml
b/tests/qemuxml2xmloutdata/graphics-dbus-address.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-dbus-address.xml
rename to tests/qemuxml2xmloutdata/graphics-dbus-address.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-dbus-audio.xml
b/tests/qemuxml2xmloutdata/graphics-dbus-audio.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-dbus-audio.xml
rename to tests/qemuxml2xmloutdata/graphics-dbus-audio.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-dbus-chardev.xml
b/tests/qemuxml2xmloutdata/graphics-dbus-chardev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-dbus-chardev.xml
rename to tests/qemuxml2xmloutdata/graphics-dbus-chardev.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-dbus-p2p.xml
b/tests/qemuxml2xmloutdata/graphics-dbus-p2p.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-dbus-p2p.xml
rename to tests/qemuxml2xmloutdata/graphics-dbus-p2p.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-dbus.xml
b/tests/qemuxml2xmloutdata/graphics-dbus.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/graphics-dbus.xml
rename to tests/qemuxml2xmloutdata/graphics-dbus.x86_64-latest.xml
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 30c56b9e83..9063d3c593 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -365,21 +365,11 @@ mymain(void)
QEMU_CAPS_VNC,
QEMU_CAPS_EGL_HEADLESS);
- DO_TEST("graphics-dbus",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_DISPLAY_DBUS);
- DO_TEST("graphics-dbus-address",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_DISPLAY_DBUS);
- DO_TEST("graphics-dbus-p2p",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_DISPLAY_DBUS);
- DO_TEST("graphics-dbus-audio",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_DISPLAY_DBUS);
- DO_TEST("graphics-dbus-chardev",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_DISPLAY_DBUS);
+ DO_TEST_CAPS_LATEST("graphics-dbus");
+ DO_TEST_CAPS_LATEST("graphics-dbus-address");
+ DO_TEST_CAPS_LATEST("graphics-dbus-p2p");
+ DO_TEST_CAPS_LATEST("graphics-dbus-audio");
+ DO_TEST_CAPS_LATEST("graphics-dbus-chardev");
DO_TEST_CAPS_ARCH_LATEST("default-video-type-aarch64",
"aarch64");
DO_TEST_CAPS_ARCH_LATEST("default-video-type-ppc64", "ppc64");
--
2.41.0
7:54 a.m.
New subject: [PATCH 12/24] qemuxml2(argv|xml)test: Modernize 'graphics-dbus*' tests
On a Thursday in 2023, Peter Krempa wrote:
Use latest caps for this rather recent graphics protocol.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
... graphics-dbus-address.x86_64-latest.args} | 12 ++++---
.../graphics-dbus-address.xml | 5 ++-
...=> graphics-dbus-audio.x86_64-latest.args} | 14 ++++----
.../qemuxml2argvdata/graphics-dbus-audio.xml | 5 ++-
... graphics-dbus-chardev.x86_64-latest.args} | 14 ++++----
.../graphics-dbus-chardev.xml | 5 ++-
tests/qemuxml2argvdata/graphics-dbus-p2p.args | 30 ----------------
...s => graphics-dbus-p2p.x86_64-latest.args} | 16 ++++-----
tests/qemuxml2argvdata/graphics-dbus-p2p.xml | 5 ++-
.../graphics-dbus-usbredir.x86_64-latest.args | 36 +++++++++++++++++++
....args => graphics-dbus.x86_64-latest.args} | 12 ++++---
tests/qemuxml2argvdata/graphics-dbus.xml | 5 ++-
tests/qemuxml2argvtest.c | 22 ++++--------
...> graphics-dbus-address.x86_64-latest.xml} | 0
... => graphics-dbus-audio.x86_64-latest.xml} | 0
...> graphics-dbus-chardev.x86_64-latest.xml} | 0
...ml => graphics-dbus-p2p.x86_64-latest.xml} | 0
...us.xml => graphics-dbus.x86_64-latest.xml} | 0
tests/qemuxml2xmltest.c | 20 +++--------
19 files changed, 104 insertions(+), 97 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 13/24] qemuxml2(argv|xml)test: Sanitize testing of default video type on x86_64
Use real capabilities and remove the redundant test case.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../default-video-type-x86_64-caps-test-0.err | 1 -
.../default-video-type-x86_64-caps-test-1.xml | 16 ----------
...fault-video-type-x86_64.x86_64-latest.args | 32 +++++++++++++++++++
...st-0.xml => default-video-type-x86_64.xml} | 0
tests/qemuxml2argvtest.c | 2 +-
.../default-video-type-x86_64-caps-test-0.xml | 31 ------------------
...fault-video-type-x86_64.x86_64-latest.xml} | 3 ++
tests/qemuxml2xmltest.c | 7 +---
8 files changed, 37 insertions(+), 55 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-0.err
delete mode 100644 tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-1.xml
create mode 100644 tests/qemuxml2argvdata/default-video-type-x86_64.x86_64-latest.args
rename tests/qemuxml2argvdata/{default-video-type-x86_64-caps-test-0.xml =>
default-video-type-x86_64.xml} (100%)
delete mode 100644 tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-0.xml
rename tests/qemuxml2xmloutdata/{default-video-type-x86_64-caps-test-1.xml =>
default-video-type-x86_64.x86_64-latest.xml} (91%)
diff --git a/tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-0.err
b/tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-0.err
deleted file mode 100644
index 28ffb0c7a2..0000000000
--- a/tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-0.err
+++ /dev/null
@@ -1 +0,0 @@
-internal error: missing video model and cannot determine default
diff --git a/tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-1.xml
b/tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-1.xml
deleted file mode 100644
index 2142db8d1f..0000000000
--- a/tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-1.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<domain type='kvm'>
- <name>default-video-type-x86_64-test</name>
- <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
- <memory unit='KiB'>1048576</memory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='x86_64' machine='pc'>hvm</type>
- </os>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0' model='none'/>
- <controller type='pci' index='0' model='pci-root'/>
- <memballoon model='none'/>
- <graphics type='spice'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvdata/default-video-type-x86_64.x86_64-latest.args
b/tests/qemuxml2argvdata/default-video-type-x86_64.x86_64-latest.args
new file mode 100644
index 0000000000..247927f7bb
--- /dev/null
+++ b/tests/qemuxml2argvdata/default-video-type-x86_64.x86_64-latest.args
@@ -0,0 +1,32 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-default-video-type-x \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-default-video-type-x/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-default-video-type-x/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-default-video-type-x/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=default-video-type-x86_64-test,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-default-video-type-x/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel kvm \
+-cpu qemu64 \
+-m size=1048576k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"spice"}' \
+-spice port=0,seamless-migration=on \
+-device
'{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-0.xml
b/tests/qemuxml2argvdata/default-video-type-x86_64.xml
similarity index 100%
rename from tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-0.xml
rename to tests/qemuxml2argvdata/default-video-type-x86_64.xml
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 19ca1c0177..f1f86645f9 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2025,7 +2025,7 @@ mymain(void)
DO_TEST("video-none-device",
QEMU_CAPS_VNC);
DO_TEST_PARSE_ERROR_NOCAPS("video-invalid-multiple-devices");
- DO_TEST_PARSE_ERROR_NOCAPS("default-video-type-x86_64-caps-test-0");
+ DO_TEST_CAPS_LATEST("default-video-type-x86_64");
DO_TEST_CAPS_ARCH_LATEST("default-video-type-aarch64",
"aarch64");
DO_TEST_CAPS_ARCH_LATEST("default-video-type-ppc64", "ppc64");
diff --git a/tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-0.xml
b/tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-0.xml
deleted file mode 100644
index 596364f7a2..0000000000
--- a/tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-0.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='kvm'>
- <name>default-video-type-x86_64-test</name>
- <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
- <memory unit='KiB'>1048576</memory>
- <currentMemory unit='KiB'>1048576</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='x86_64' machine='pc'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0' model='none'/>
- <controller type='pci' index='0' model='pci-root'/>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='spice'>
- <listen type='none'/>
- </graphics>
- <audio id='1' type='spice'/>
- <video>
- <model type='vga' vram='16384' heads='1'
primary='yes'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
- </video>
- <memballoon model='none'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-1.xml
b/tests/qemuxml2xmloutdata/default-video-type-x86_64.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-1.xml
rename to tests/qemuxml2xmloutdata/default-video-type-x86_64.x86_64-latest.xml
index a86f785b44..b9b50bae84 100644
--- a/tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-1.xml
+++ b/tests/qemuxml2xmloutdata/default-video-type-x86_64.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 9063d3c593..20347f33a5 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -375,12 +375,7 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("default-video-type-ppc64", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("default-video-type-riscv64",
"riscv64");
DO_TEST_CAPS_ARCH_LATEST("default-video-type-s390x", "s390x");
- DO_TEST("default-video-type-x86_64-caps-test-0",
- QEMU_CAPS_DEVICE_VGA,
- QEMU_CAPS_SPICE);
- DO_TEST("default-video-type-x86_64-caps-test-1",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_SPICE);
+ DO_TEST_CAPS_LATEST("default-video-type-x86_64");
DO_TEST("graphics-sdl", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_SDL);
DO_TEST("graphics-sdl-fullscreen", QEMU_CAPS_DEVICE_CIRRUS_VGA,
QEMU_CAPS_SDL);
--
2.41.0
7:54 a.m.
New subject: [PATCH 13/24] qemuxml2(argv|xml)test: Sanitize testing of default video type on x86_64
On a Thursday in 2023, Peter Krempa wrote:
Use real capabilities and remove the redundant test case.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../default-video-type-x86_64-caps-test-0.err | 1 -
.../default-video-type-x86_64-caps-test-1.xml | 16 ----------
...fault-video-type-x86_64.x86_64-latest.args | 32 +++++++++++++++++++
...st-0.xml => default-video-type-x86_64.xml} | 0
tests/qemuxml2argvtest.c | 2 +-
.../default-video-type-x86_64-caps-test-0.xml | 31 ------------------
...fault-video-type-x86_64.x86_64-latest.xml} | 3 ++
tests/qemuxml2xmltest.c | 7 +---
8 files changed, 37 insertions(+), 55 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-0.err
delete mode 100644 tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-1.xml
create mode 100644 tests/qemuxml2argvdata/default-video-type-x86_64.x86_64-latest.args
rename tests/qemuxml2argvdata/{default-video-type-x86_64-caps-test-0.xml =>
default-video-type-x86_64.xml} (100%)
delete mode 100644 tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-0.xml
rename tests/qemuxml2xmloutdata/{default-video-type-x86_64-caps-test-1.xml =>
default-video-type-x86_64.x86_64-latest.xml} (91%)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 14/24] qemuValidateDomainVCpuTopology: Remove misconfiguration warning
VIR_WARN of a misconfiguration of a VM is not really going to be seen in
most cases as it's simply logged, and if the VM works users are not
likely to dig through logs.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_validate.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index d5c2b2cd44..c8937cad05 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -779,7 +779,6 @@ qemuValidateDomainVCpuTopology(const virDomainDef *def, virQEMUCaps
*qemuCaps)
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS)) {
unsigned int topologycpus;
unsigned int granularity;
- unsigned int numacpus;
/* Starting from QEMU 2.5, max vCPU count and overall vCPU topology
* must agree. We only actually enforce this with QEMU 2.7+, due
@@ -790,13 +789,6 @@ qemuValidateDomainVCpuTopology(const virDomainDef *def, virQEMUCaps
*qemuCaps)
_("CPU topology doesn't match maximum vcpu
count"));
return -1;
}
-
- numacpus = virDomainNumaGetCPUCountTotal(def->numa);
- if ((numacpus != 0) && (topologycpus != numacpus)) {
- VIR_WARN("CPU topology doesn't match numa CPU count; "
- "partial NUMA mapping is obsoleted and will "
- "be removed in future");
- }
}
/* vCPU hotplug granularity must be respected */
--
2.41.0
7:57 a.m.
New subject: [PATCH 14/24] qemuValidateDomainVCpuTopology: Remove misconfiguration warning
On a Thursday in 2023, Peter Krempa wrote:
VIR_WARN of a misconfiguration of a VM is not really going to be seen
in
most cases as it's simply logged, and if the VM works users are not
likely to dig through logs.
Should we put it under VIR_DOMAIN_START_WERROR? :)
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_validate.c | 8 --------
1 file changed, 8 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
9:16 a.m.
New subject: [PATCH 14/24] qemuValidateDomainVCpuTopology: Remove misconfiguration warning
On Mon, Aug 21, 2023 at 02:57:09PM +0200, Ján Tomko wrote:
On a Thursday in 2023, Peter Krempa wrote:
> VIR_WARN of a misconfiguration of a VM is not really going to be seen in
> most cases as it's simply logged, and if the VM works users are not
> likely to dig through logs.
Should we put it under VIR_DOMAIN_START_WERROR? :)
If a config scenario is explicitly deprecated and expected to be
remove, then we should be using the 'taint' mechanism to alert
users/apps. This is queryable by apps and also ends up in the per
VM log files as a warning.
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
6:57 a.m.
New subject: [PATCH 14/24] qemuValidateDomainVCpuTopology: Remove misconfiguration warning
On Mon, Aug 21, 2023 at 15:16:54 +0100, Daniel P. Berrangé wrote:
On Mon, Aug 21, 2023 at 02:57:09PM +0200, Ján Tomko wrote:
> On a Thursday in 2023, Peter Krempa wrote:
> > VIR_WARN of a misconfiguration of a VM is not really going to be seen in
> > most cases as it's simply logged, and if the VM works users are not
> > likely to dig through logs.
>
> Should we put it under VIR_DOMAIN_START_WERROR? :)
If a config scenario is explicitly deprecated and expected to be
remove, then we should be using the 'taint' mechanism to alert
users/apps. This is queryable by apps and also ends up in the per
VM log files as a warning.
That's a good idea in this case. I'll drop this patch and rebase the
next one and address this in a different patch.
6:41 a.m.
New subject: [PATCH 15/24] qemuValidateDomainVCpuTopology: Always validate vcpu count against topology
Historically we've used QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS as witness
that the topology must cover the maximum number ov vcpus. qemu started
to enforce this in qemu-2.5, thus we can now always do the check.
This change also requires aligning the topology in certain test files.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_validate.c | 42 ++++++++-----------
.../fd-memory-numa-topology2.args | 2 +-
.../fd-memory-numa-topology2.xml | 2 +-
.../fd-memory-numa-topology3.args | 2 +-
.../fd-memory-numa-topology3.xml | 2 +-
5 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index c8937cad05..de3aebb439 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -759,6 +759,8 @@ qemuValidateDomainVCpuTopology(const virDomainDef *def, virQEMUCaps
*qemuCaps)
{
unsigned int maxCpus = virQEMUCapsGetMachineMaxCpus(qemuCaps, def->virtType,
def->os.machine);
+ unsigned int topologycpus;
+ unsigned int granularity;
if (virDomainDefGetVcpus(def) == 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -773,34 +775,26 @@ qemuValidateDomainVCpuTopology(const virDomainDef *def, virQEMUCaps
*qemuCaps)
return -1;
}
- /* QEMU 2.7 (detected via the availability of query-hotpluggable-cpus)
- * enforces stricter rules than previous versions when it comes to guest
- * CPU topology. Verify known constraints are respected */
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS)) {
- unsigned int topologycpus;
- unsigned int granularity;
-
- /* Starting from QEMU 2.5, max vCPU count and overall vCPU topology
- * must agree. We only actually enforce this with QEMU 2.7+, due
- * to the capability check above */
- if (virDomainDefGetVcpusTopology(def, &topologycpus) == 0) {
- if (topologycpus != virDomainDefGetVcpusMax(def)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("CPU topology doesn't match maximum vcpu
count"));
- return -1;
- }
- }
-
- /* vCPU hotplug granularity must be respected */
- granularity = qemuValidateDefGetVcpuHotplugGranularity(def);
- if ((virDomainDefGetVcpus(def) % granularity) != 0) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("vCPUs count must be a multiple of the vCPU hotplug
granularity (%1$u)"),
- granularity);
+ /* Starting from QEMU 2.5, max vCPU count and overall vCPU topology
+ * must agree. We only actually enforce this with QEMU 2.7+, due
+ * to the capability check above */
+ if (virDomainDefGetVcpusTopology(def, &topologycpus) == 0) {
+ if (topologycpus != virDomainDefGetVcpusMax(def)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("CPU topology doesn't match maximum vcpu
count"));
return -1;
}
}
+ /* vCPU hotplug granularity must be respected */
+ granularity = qemuValidateDefGetVcpuHotplugGranularity(def);
+ if ((virDomainDefGetVcpus(def) % granularity) != 0) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("vCPUs count must be a multiple of the vCPU hotplug
granularity (%1$u)"),
+ granularity);
+ return -1;
+ }
+
if (ARCH_IS_X86(def->os.arch) &&
virDomainDefGetVcpusMax(def) > QEMU_MAX_VCPUS_WITHOUT_EIM) {
if (!qemuDomainIsQ35(def)) {
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
index eb88b27e16..7313dabf78 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
@@ -14,7 +14,7 @@
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
-accel kvm \
-m size=29360128k \
-overcommit mem-lock=off \
--smp 20,sockets=1,cores=8,threads=1 \
+-smp 20,sockets=1,cores=20,threads=1 \
-object
memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=off,prealloc=on,size=15032385536
\
-numa node,nodeid=0,cpus=0-7,cpus=16-19,memdev=ram-node0 \
-object
memory-backend-file,id=ram-node1,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share=on,prealloc=on,size=15032385536
\
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
index 5b84a49796..1572010ad8 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
@@ -14,7 +14,7 @@
<boot dev='hd'/>
</os>
<cpu>
- <topology sockets='1' dies='1' cores='8'
threads='1'/>
+ <topology sockets='1' dies='1' cores='20'
threads='1'/>
<numa>
<cell id='0' cpus='0-7,16-19' memory='14680064'
unit='KiB'/>
<cell id='1' cpus='8-15' memory='14680064'
unit='KiB' memAccess='shared'/>
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
index c10140a55d..f5d2aaf91b 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
@@ -14,7 +14,7 @@
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
-accel kvm \
-m size=44040192k \
-overcommit mem-lock=off \
--smp 32,sockets=1,cores=24,threads=1 \
+-smp 32,sockets=1,cores=32,threads=1 \
-object
memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=on,prealloc=on,size=15032385536
\
-numa node,nodeid=0,cpus=0-1,cpus=6-31,memdev=ram-node0 \
-object
memory-backend-file,id=ram-node1,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share=on,prealloc=on,size=15032385536
\
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
index 1b8fd7dfee..36a6b5c155 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
@@ -14,7 +14,7 @@
<boot dev='hd'/>
</os>
<cpu>
- <topology sockets='1' dies='1' cores='24'
threads='1'/>
+ <topology sockets='1' dies='1' cores='32'
threads='1'/>
<numa>
<cell id='0' cpus='0-1,6-31' memory='14680064'
unit='KiB'/>
<cell id='1' cpus='2-3' memory='14680064'
unit='KiB' memAccess='shared'/>
--
2.41.0
8:08 a.m.
New subject: [PATCH 15/24] qemuValidateDomainVCpuTopology: Always validate vcpu count against topology
On a Thursday in 2023, Peter Krempa wrote:
Historically we've used QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS as
witness
that the topology must cover the maximum number ov vcpus. qemu started
to enforce this in qemu-2.5, thus we can now always do the check.
This change also requires aligning the topology in certain test files.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_validate.c | 42 ++++++++-----------
.../fd-memory-numa-topology2.args | 2 +-
.../fd-memory-numa-topology2.xml | 2 +-
.../fd-memory-numa-topology3.args | 2 +-
.../fd-memory-numa-topology3.xml | 2 +-
5 files changed, 22 insertions(+), 28 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 16/24] qemuxml2(argv|xml)test: Modernize 'fd-memory*' test cases
Use latest real capabilities.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...emory-no-numa-topology.x86_64-latest.args} | 16 ++++----
.../fd-memory-no-numa-topology.xml | 5 ++-
...d-memory-numa-topology.x86_64-latest.args} | 15 ++++----
.../fd-memory-numa-topology.xml | 5 ++-
...-memory-numa-topology2.x86_64-latest.args} | 17 +++++----
.../fd-memory-numa-topology2.xml | 5 ++-
.../fd-memory-numa-topology3.args | 37 ------------------
...d-memory-numa-topology3.x86_64-latest.args | 38 +++++++++++++++++++
.../fd-memory-numa-topology3.xml | 5 ++-
tests/qemuxml2argvtest.c | 8 ++--
...memory-no-numa-topology.x86_64-latest.xml} | 0
...fd-memory-numa-topology.x86_64-latest.xml} | 0
...d-memory-numa-topology2.x86_64-latest.xml} | 0
...d-memory-numa-topology3.x86_64-latest.xml} | 0
tests/qemuxml2xmltest.c | 8 ++--
15 files changed, 83 insertions(+), 76 deletions(-)
rename tests/qemuxml2argvdata/{fd-memory-no-numa-topology.args =>
fd-memory-no-numa-topology.x86_64-latest.args} (51%)
rename tests/qemuxml2argvdata/{fd-memory-numa-topology.args =>
fd-memory-numa-topology.x86_64-latest.args} (55%)
rename tests/qemuxml2argvdata/{fd-memory-numa-topology2.args =>
fd-memory-numa-topology2.x86_64-latest.args} (51%)
delete mode 100644 tests/qemuxml2argvdata/fd-memory-numa-topology3.args
create mode 100644 tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args
rename tests/qemuxml2xmloutdata/{fd-memory-no-numa-topology.xml =>
fd-memory-no-numa-topology.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{fd-memory-numa-topology.xml =>
fd-memory-numa-topology.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{fd-memory-numa-topology2.xml =>
fd-memory-numa-topology2.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{fd-memory-numa-topology3.xml =>
fd-memory-numa-topology3.x86_64-latest.xml} (100%)
diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args
similarity index 51%
rename from tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
rename to tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args
index eaaf82c3f9..58b3c7b544 100644
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args
@@ -9,14 +9,14 @@
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=instance-00000092,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
+-cpu qemu64 \
-m size=14680064k \
--mem-prealloc \
--mem-path /var/lib/libvirt/qemu/ram/-1-instance-00000092/ram \
+-object
'{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/pc.ram","share":true,"x-use-canonical-path-for-ramblock-id":false,"prealloc":true,"size":15032385536}'
\
-overcommit mem-lock=off \
--smp 8,sockets=8,cores=1,threads=1 \
+-smp 8,sockets=8,dies=1,cores=1,threads=1 \
-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
-display none \
-no-user-config \
@@ -25,9 +25,9 @@
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-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=0x3 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
index 2a986e6d83..2090bb8288 100644
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
@@ -13,7 +13,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='8' dies='1' cores='1'
threads='1'/>
</cpu>
<clock offset='utc'/>
@@ -22,7 +23,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args
similarity index 55%
rename from tests/qemuxml2argvdata/fd-memory-numa-topology.args
rename to tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args
index b60f1dbf7d..21f9a16540 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args
@@ -9,13 +9,14 @@
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=instance-00000092,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,acpi=off \
-accel kvm \
+-cpu qemu64 \
-m size=14680064k \
-overcommit mem-lock=off \
--smp 8,sockets=1,cores=8,threads=1 \
--object
memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=on,prealloc=on,size=15032385536
\
+-smp 8,sockets=1,dies=1,cores=8,threads=1 \
+-object
'{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":true,"prealloc":true,"size":15032385536}'
\
-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
-display none \
@@ -25,9 +26,9 @@
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-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=0x3 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
index 22719b9545..2f94690656 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
@@ -13,7 +13,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='1' dies='1' cores='8'
threads='1'/>
<numa>
<cell id='0' cpus='0-7' memory='14680064'
unit='KiB'/>
@@ -25,7 +26,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args
similarity index 51%
rename from tests/qemuxml2argvdata/fd-memory-numa-topology2.args
rename to tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args
index 7313dabf78..3bf16f9caf 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args
@@ -9,15 +9,16 @@
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=instance-00000092,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,acpi=off \
-accel kvm \
+-cpu qemu64 \
-m size=29360128k \
-overcommit mem-lock=off \
--smp 20,sockets=1,cores=20,threads=1 \
--object
memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=off,prealloc=on,size=15032385536
\
+-smp 20,sockets=1,dies=1,cores=20,threads=1 \
+-object
'{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":false,"prealloc":true,"size":15032385536}'
\
-numa node,nodeid=0,cpus=0-7,cpus=16-19,memdev=ram-node0 \
--object
memory-backend-file,id=ram-node1,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share=on,prealloc=on,size=15032385536
\
+-object
'{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1","share":true,"prealloc":true,"size":15032385536}'
\
-numa node,nodeid=1,cpus=8-15,memdev=ram-node1 \
-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
-display none \
@@ -27,9 +28,9 @@
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-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=0x3 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
index 1572010ad8..3a4e9b478e 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
@@ -13,7 +13,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='1' dies='1' cores='20'
threads='1'/>
<numa>
<cell id='0' cpus='0-7,16-19' memory='14680064'
unit='KiB'/>
@@ -26,7 +27,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
deleted file mode 100644
index f5d2aaf91b..0000000000
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
+++ /dev/null
@@ -1,37 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=instance-00000092,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel kvm \
--m size=44040192k \
--overcommit mem-lock=off \
--smp 32,sockets=1,cores=32,threads=1 \
--object
memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=on,prealloc=on,size=15032385536
\
--numa node,nodeid=0,cpus=0-1,cpus=6-31,memdev=ram-node0 \
--object
memory-backend-file,id=ram-node1,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share=on,prealloc=on,size=15032385536
\
--numa node,nodeid=1,cpus=2-3,memdev=ram-node1 \
--object
memory-backend-file,id=ram-node2,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node2,share=off,prealloc=on,size=15032385536
\
--numa node,nodeid=2,cpus=4-5,memdev=ram-node2 \
--uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args
new file mode 100644
index 0000000000..3153e22d56
--- /dev/null
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=instance-00000092,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-instance-00000092/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,acpi=off \
+-accel kvm \
+-cpu qemu64 \
+-m size=44040192k \
+-overcommit mem-lock=off \
+-smp 32,sockets=1,dies=1,cores=32,threads=1 \
+-object
'{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":true,"prealloc":true,"size":15032385536}'
\
+-numa node,nodeid=0,cpus=0-1,cpus=6-31,memdev=ram-node0 \
+-object
'{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1","share":true,"prealloc":true,"size":15032385536}'
\
+-numa node,nodeid=1,cpus=2-3,memdev=ram-node1 \
+-object
'{"qom-type":"memory-backend-file","id":"ram-node2","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node2","share":false,"prealloc":true,"size":15032385536}'
\
+-numa node,nodeid=2,cpus=4-5,memdev=ram-node2 \
+-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
index 36a6b5c155..0f7f74283b 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
@@ -13,7 +13,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='1' dies='1' cores='32'
threads='1'/>
<numa>
<cell id='0' cpus='0-1,6-31' memory='14680064'
unit='KiB'/>
@@ -27,7 +28,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index f1f86645f9..5846380189 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2555,12 +2555,12 @@ mymain(void)
DO_TEST_CAPS_LATEST("virtio-options-video-packed");
DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-memballoon-freepage-reporting");
- DO_TEST("fd-memory-numa-topology", QEMU_CAPS_KVM);
- DO_TEST("fd-memory-numa-topology2", QEMU_CAPS_KVM);
- DO_TEST("fd-memory-numa-topology3", QEMU_CAPS_KVM);
+ DO_TEST_CAPS_LATEST("fd-memory-numa-topology");
+ DO_TEST_CAPS_LATEST("fd-memory-numa-topology2");
+ DO_TEST_CAPS_LATEST("fd-memory-numa-topology3");
DO_TEST_CAPS_LATEST("fd-memory-numa-topology4");
- DO_TEST("fd-memory-no-numa-topology", QEMU_CAPS_KVM);
+ DO_TEST_CAPS_LATEST("fd-memory-no-numa-topology");
DO_TEST_CAPS_LATEST("memfd-memory-numa");
DO_TEST_CAPS_LATEST("memfd-memory-default-hugepage");
diff --git a/tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.xml
b/tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.xml
rename to tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology.xml
b/tests/qemuxml2xmloutdata/fd-memory-numa-topology.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/fd-memory-numa-topology.xml
rename to tests/qemuxml2xmloutdata/fd-memory-numa-topology.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology2.xml
b/tests/qemuxml2xmloutdata/fd-memory-numa-topology2.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/fd-memory-numa-topology2.xml
rename to tests/qemuxml2xmloutdata/fd-memory-numa-topology2.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology3.xml
b/tests/qemuxml2xmloutdata/fd-memory-numa-topology3.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/fd-memory-numa-topology3.xml
rename to tests/qemuxml2xmloutdata/fd-memory-numa-topology3.x86_64-latest.xml
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 20347f33a5..f752e621ee 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1033,12 +1033,12 @@ mymain(void)
DO_TEST_CAPS_LATEST("virtio-options");
- DO_TEST("fd-memory-numa-topology", QEMU_CAPS_KVM);
- DO_TEST("fd-memory-numa-topology2", QEMU_CAPS_KVM);
- DO_TEST("fd-memory-numa-topology3", QEMU_CAPS_KVM);
+ DO_TEST_CAPS_LATEST("fd-memory-numa-topology");
+ DO_TEST_CAPS_LATEST("fd-memory-numa-topology2");
+ DO_TEST_CAPS_LATEST("fd-memory-numa-topology3");
DO_TEST_CAPS_LATEST("fd-memory-numa-topology4");
- DO_TEST("fd-memory-no-numa-topology", QEMU_CAPS_KVM);
+ DO_TEST_CAPS_LATEST("fd-memory-no-numa-topology");
DO_TEST_CAPS_LATEST("memfd-memory-numa");
DO_TEST_CAPS_LATEST("memfd-memory-default-hugepage");
--
2.41.0
8:10 a.m.
New subject: [PATCH 16/24] qemuxml2(argv|xml)test: Modernize 'fd-memory*' test cases
On a Thursday in 2023, Peter Krempa wrote:
Use latest real capabilities.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...emory-no-numa-topology.x86_64-latest.args} | 16 ++++----
.../fd-memory-no-numa-topology.xml | 5 ++-
...d-memory-numa-topology.x86_64-latest.args} | 15 ++++----
.../fd-memory-numa-topology.xml | 5 ++-
...-memory-numa-topology2.x86_64-latest.args} | 17 +++++----
.../fd-memory-numa-topology2.xml | 5 ++-
.../fd-memory-numa-topology3.args | 37 ------------------
...d-memory-numa-topology3.x86_64-latest.args | 38 +++++++++++++++++++
.../fd-memory-numa-topology3.xml | 5 ++-
tests/qemuxml2argvtest.c | 8 ++--
...memory-no-numa-topology.x86_64-latest.xml} | 0
...fd-memory-numa-topology.x86_64-latest.xml} | 0
...d-memory-numa-topology2.x86_64-latest.xml} | 0
...d-memory-numa-topology3.x86_64-latest.xml} | 0
tests/qemuxml2xmltest.c | 8 ++--
15 files changed, 83 insertions(+), 76 deletions(-)
rename tests/qemuxml2argvdata/{fd-memory-no-numa-topology.args =>
fd-memory-no-numa-topology.x86_64-latest.args} (51%)
rename tests/qemuxml2argvdata/{fd-memory-numa-topology.args =>
fd-memory-numa-topology.x86_64-latest.args} (55%)
rename tests/qemuxml2argvdata/{fd-memory-numa-topology2.args =>
fd-memory-numa-topology2.x86_64-latest.args} (51%)
delete mode 100644 tests/qemuxml2argvdata/fd-memory-numa-topology3.args
create mode 100644 tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args
rename tests/qemuxml2xmloutdata/{fd-memory-no-numa-topology.xml =>
fd-memory-no-numa-topology.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{fd-memory-numa-topology.xml =>
fd-memory-numa-topology.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{fd-memory-numa-topology2.xml =>
fd-memory-numa-topology2.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{fd-memory-numa-topology3.xml =>
fd-memory-numa-topology3.x86_64-latest.xml} (100%)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 17/24] qemuxml2(argv|xml)test: Modernize 'shmem' test cases
Upgrade the relevant test cases to use latest capabilities. Note that
the 'shmem' (ivshmem) device is no longer supported and will be dropped
later.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...> shmem-invalid-address.x86_64-latest.err} | 0
.../shmem-invalid-address.xml | 1 +
...r => shmem-invalid-size.x86_64-latest.err} | 0
tests/qemuxml2argvdata/shmem-invalid-size.xml | 1 +
...y.err => shmem-msi-only.x86_64-latest.err} | 0
tests/qemuxml2argvdata/shmem-msi-only.xml | 1 +
.../shmem-plain-doorbell.args | 46 ------------------
.../shmem-plain-doorbell.x86_64-latest.args | 48 +++++++++++++++++++
...err => shmem-small-size.x86_64-latest.err} | 0
tests/qemuxml2argvdata/shmem-small-size.xml | 1 +
tests/qemuxml2argvtest.c | 15 ++----
...=> shmem-plain-doorbell.x86_64-latest.xml} | 5 +-
tests/qemuxml2xmltest.c | 3 +-
13 files changed, 62 insertions(+), 59 deletions(-)
rename tests/qemuxml2argvdata/{shmem-invalid-address.err =>
shmem-invalid-address.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{shmem-invalid-size.err =>
shmem-invalid-size.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{shmem-msi-only.err => shmem-msi-only.x86_64-latest.err}
(100%)
delete mode 100644 tests/qemuxml2argvdata/shmem-plain-doorbell.args
create mode 100644 tests/qemuxml2argvdata/shmem-plain-doorbell.x86_64-latest.args
rename tests/qemuxml2argvdata/{shmem-small-size.err =>
shmem-small-size.x86_64-latest.err} (100%)
rename tests/qemuxml2xmloutdata/{shmem-plain-doorbell.xml =>
shmem-plain-doorbell.x86_64-latest.xml} (94%)
diff --git a/tests/qemuxml2argvdata/shmem-invalid-address.err
b/tests/qemuxml2argvdata/shmem-invalid-address.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/shmem-invalid-address.err
rename to tests/qemuxml2argvdata/shmem-invalid-address.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/shmem-invalid-address.xml
b/tests/qemuxml2argvdata/shmem-invalid-address.xml
index 0ef64483ac..e58f480f09 100644
--- a/tests/qemuxml2argvdata/shmem-invalid-address.xml
+++ b/tests/qemuxml2argvdata/shmem-invalid-address.xml
@@ -18,6 +18,7 @@
<controller type='pci' index='0' model='pci-root'/>
<memballoon model='none'/>
<shmem name='shmem0'>
+ <model type='ivshmem-plain'/>
<address type='isa'/>
</shmem>
</devices>
diff --git a/tests/qemuxml2argvdata/shmem-invalid-size.err
b/tests/qemuxml2argvdata/shmem-invalid-size.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/shmem-invalid-size.err
rename to tests/qemuxml2argvdata/shmem-invalid-size.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/shmem-invalid-size.xml
b/tests/qemuxml2argvdata/shmem-invalid-size.xml
index ff37e5ad68..6590de6471 100644
--- a/tests/qemuxml2argvdata/shmem-invalid-size.xml
+++ b/tests/qemuxml2argvdata/shmem-invalid-size.xml
@@ -18,6 +18,7 @@
<controller type='pci' index='0' model='pci-root'/>
<memballoon model='none'/>
<shmem name='shmem0'>
+ <model type='ivshmem-plain'/>
<size unit='K'>12345</size>
</shmem>
</devices>
diff --git a/tests/qemuxml2argvdata/shmem-msi-only.err
b/tests/qemuxml2argvdata/shmem-msi-only.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/shmem-msi-only.err
rename to tests/qemuxml2argvdata/shmem-msi-only.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/shmem-msi-only.xml
b/tests/qemuxml2argvdata/shmem-msi-only.xml
index e23e27a107..27af3c34a6 100644
--- a/tests/qemuxml2argvdata/shmem-msi-only.xml
+++ b/tests/qemuxml2argvdata/shmem-msi-only.xml
@@ -18,6 +18,7 @@
<controller type='pci' index='0' model='pci-root'/>
<memballoon model='none'/>
<shmem name='shmem0'>
+ <model type='ivshmem-plain'/>
<msi/>
</shmem>
</devices>
diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
deleted file mode 100644
index aec63db1cf..0000000000
--- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
+++ /dev/null
@@ -1,46 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--audiodev
'{"id":"audio1","driver":"none"}' \
--object
memory-backend-file,id=shmmem-shmem0,mem-path=/dev/shm/shmem0,size=4194304,share=on \
--device ivshmem-plain,id=shmem0,memdev=shmmem-shmem0,bus=pci.0,addr=0x2 \
--object
memory-backend-file,id=shmmem-shmem1,mem-path=/dev/shm/shmem1,size=134217728,share=on \
--device ivshmem-plain,id=shmem1,memdev=shmmem-shmem1,master=off,bus=pci.0,addr=0x3 \
--object
memory-backend-file,id=shmmem-shmem2,mem-path=/dev/shm/shmem2,size=268435456,share=on \
--device ivshmem-plain,id=shmem2,memdev=shmmem-shmem2,master=on,bus=pci.0,addr=0x4 \
--device ivshmem-doorbell,id=shmem3,chardev=charshmem3,ioeventfd=on,bus=pci.0,addr=0x5 \
--chardev socket,id=charshmem3,path=/var/lib/libvirt/shmem-shmem3-sock \
--device ivshmem-doorbell,id=shmem4,chardev=charshmem4,ioeventfd=on,bus=pci.0,addr=0x6 \
--chardev socket,id=charshmem4,path=/tmp/shmem4-sock \
--device ivshmem-doorbell,id=shmem5,chardev=charshmem5,ioeventfd=off,bus=pci.0,addr=0x7 \
--chardev socket,id=charshmem5,path=/tmp/shmem5-sock \
--device
ivshmem-doorbell,id=shmem6,chardev=charshmem6,vectors=16,ioeventfd=on,bus=pci.0,addr=0x8
\
--chardev socket,id=charshmem6,path=/tmp/shmem6-sock \
--device
ivshmem-doorbell,id=shmem7,chardev=charshmem7,vectors=32,ioeventfd=on,bus=pci.0,addr=0x9
\
--chardev socket,id=charshmem7,path=/tmp/shmem7-sock \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.x86_64-latest.args
b/tests/qemuxml2argvdata/shmem-plain-doorbell.x86_64-latest.args
new file mode 100644
index 0000000000..5894fa0e0c
--- /dev/null
+++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.x86_64-latest.args
@@ -0,0 +1,48 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-object
'{"qom-type":"memory-backend-file","id":"shmmem-shmem0","mem-path":"/dev/shm/shmem0","size":4194304,"share":true}'
\
+-device
'{"driver":"ivshmem-plain","id":"shmem0","memdev":"shmmem-shmem0","bus":"pci.0","addr":"0x2"}'
\
+-object
'{"qom-type":"memory-backend-file","id":"shmmem-shmem1","mem-path":"/dev/shm/shmem1","size":134217728,"share":true}'
\
+-device
'{"driver":"ivshmem-plain","id":"shmem1","memdev":"shmmem-shmem1","master":"off","bus":"pci.0","addr":"0x3"}'
\
+-object
'{"qom-type":"memory-backend-file","id":"shmmem-shmem2","mem-path":"/dev/shm/shmem2","size":268435456,"share":true}'
\
+-device
'{"driver":"ivshmem-plain","id":"shmem2","memdev":"shmmem-shmem2","master":"on","bus":"pci.0","addr":"0x4"}'
\
+-device
'{"driver":"ivshmem-doorbell","id":"shmem3","chardev":"charshmem3","ioeventfd":true,"bus":"pci.0","addr":"0x5"}'
\
+-chardev socket,id=charshmem3,path=/var/lib/libvirt/shmem-shmem3-sock \
+-device
'{"driver":"ivshmem-doorbell","id":"shmem4","chardev":"charshmem4","ioeventfd":true,"bus":"pci.0","addr":"0x6"}'
\
+-chardev socket,id=charshmem4,path=/tmp/shmem4-sock \
+-device
'{"driver":"ivshmem-doorbell","id":"shmem5","chardev":"charshmem5","ioeventfd":false,"bus":"pci.0","addr":"0x7"}'
\
+-chardev socket,id=charshmem5,path=/tmp/shmem5-sock \
+-device
'{"driver":"ivshmem-doorbell","id":"shmem6","chardev":"charshmem6","vectors":16,"ioeventfd":true,"bus":"pci.0","addr":"0x8"}'
\
+-chardev socket,id=charshmem6,path=/tmp/shmem6-sock \
+-device
'{"driver":"ivshmem-doorbell","id":"shmem7","chardev":"charshmem7","vectors":32,"ioeventfd":true,"bus":"pci.0","addr":"0x9"}'
\
+-chardev socket,id=charshmem7,path=/tmp/shmem7-sock \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/shmem-small-size.err
b/tests/qemuxml2argvdata/shmem-small-size.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/shmem-small-size.err
rename to tests/qemuxml2argvdata/shmem-small-size.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/shmem-small-size.xml
b/tests/qemuxml2argvdata/shmem-small-size.xml
index 257f3074c6..61eda0703a 100644
--- a/tests/qemuxml2argvdata/shmem-small-size.xml
+++ b/tests/qemuxml2argvdata/shmem-small-size.xml
@@ -18,6 +18,7 @@
<controller type='pci' index='0' model='pci-root'/>
<memballoon model='none'/>
<shmem name='shmem0'>
+ <model type='ivshmem-plain'/>
<size unit='K'>16</size>
</shmem>
</devices>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5846380189..beaeaf02ad 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2405,17 +2405,12 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST_FULL("fips-enabled", "x86_64",
ARG_FLAGS, FLAG_FIPS_HOST);
DO_TEST("shmem", QEMU_CAPS_DEVICE_IVSHMEM);
- DO_TEST("shmem-plain-doorbell", QEMU_CAPS_DEVICE_IVSHMEM,
- QEMU_CAPS_DEVICE_IVSHMEM_PLAIN,
- QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL);
DO_TEST_PARSE_ERROR_NOCAPS("shmem");
- DO_TEST_FAILURE("shmem-invalid-size",
- QEMU_CAPS_DEVICE_IVSHMEM);
- DO_TEST_FAILURE("shmem-invalid-address",
- QEMU_CAPS_DEVICE_IVSHMEM);
- DO_TEST_FAILURE("shmem-small-size",
- QEMU_CAPS_DEVICE_IVSHMEM);
- DO_TEST_PARSE_ERROR_NOCAPS("shmem-msi-only");
+ DO_TEST_CAPS_LATEST("shmem-plain-doorbell");
+ DO_TEST_CAPS_LATEST_FAILURE("shmem-invalid-size");
+ DO_TEST_CAPS_LATEST_FAILURE("shmem-invalid-address");
+ DO_TEST_CAPS_LATEST_FAILURE("shmem-small-size");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("shmem-msi-only");
DO_TEST("cpu-host-passthrough-features", QEMU_CAPS_KVM);
DO_TEST_FAILURE_NOCAPS("memory-align-fail");
diff --git a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
rename to tests/qemuxml2xmloutdata/shmem-plain-doorbell.x86_64-latest.xml
index a7c3e6cb22..579de58318 100644
--- a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
+++ b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index f752e621ee..bbecaa3064 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -897,8 +897,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("tap-vhost");
DO_TEST_CAPS_LATEST("tap-vhost-incorrect");
DO_TEST("shmem", QEMU_CAPS_DEVICE_IVSHMEM);
- DO_TEST("shmem-plain-doorbell",
- QEMU_CAPS_DEVICE_IVSHMEM_PLAIN, QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL);
+ DO_TEST_CAPS_LATEST("shmem-plain-doorbell");
DO_TEST_CAPS_LATEST("smbios");
DO_TEST_CAPS_LATEST("smbios-multiple-type2");
DO_TEST_CAPS_LATEST("smbios-type-fwcfg");
--
2.41.0
8:10 a.m.
New subject: [PATCH 17/24] qemuxml2(argv|xml)test: Modernize 'shmem' test cases
On a Thursday in 2023, Peter Krempa wrote:
Upgrade the relevant test cases to use latest capabilities. Note that
the 'shmem' (ivshmem) device is no longer supported and will be dropped
later.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...> shmem-invalid-address.x86_64-latest.err} | 0
.../shmem-invalid-address.xml | 1 +
...r => shmem-invalid-size.x86_64-latest.err} | 0
tests/qemuxml2argvdata/shmem-invalid-size.xml | 1 +
...y.err => shmem-msi-only.x86_64-latest.err} | 0
tests/qemuxml2argvdata/shmem-msi-only.xml | 1 +
.../shmem-plain-doorbell.args | 46 ------------------
.../shmem-plain-doorbell.x86_64-latest.args | 48 +++++++++++++++++++
...err => shmem-small-size.x86_64-latest.err} | 0
tests/qemuxml2argvdata/shmem-small-size.xml | 1 +
tests/qemuxml2argvtest.c | 15 ++----
...=> shmem-plain-doorbell.x86_64-latest.xml} | 5 +-
tests/qemuxml2xmltest.c | 3 +-
13 files changed, 62 insertions(+), 59 deletions(-)
rename tests/qemuxml2argvdata/{shmem-invalid-address.err =>
shmem-invalid-address.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{shmem-invalid-size.err =>
shmem-invalid-size.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{shmem-msi-only.err => shmem-msi-only.x86_64-latest.err}
(100%)
delete mode 100644 tests/qemuxml2argvdata/shmem-plain-doorbell.args
create mode 100644 tests/qemuxml2argvdata/shmem-plain-doorbell.x86_64-latest.args
rename tests/qemuxml2argvdata/{shmem-small-size.err =>
shmem-small-size.x86_64-latest.err} (100%)
rename tests/qemuxml2xmloutdata/{shmem-plain-doorbell.xml =>
shmem-plain-doorbell.x86_64-latest.xml} (94%)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 18/24] qemu: Retire 'ivshmem' device
The device was removed in qemu-4.0 and is superseded by 'ivshmem-plain'
and 'ivshmem-doorbell'.
Always report error when the old version is used and drop the irrelevant
tests.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 40 +---------------
src/qemu/qemu_hotplug.c | 14 +-----
src/qemu/qemu_migration.c | 5 --
src/qemu/qemu_validate.c | 10 ++--
tests/qemuxml2argvdata/shmem.args | 43 -----------------
tests/qemuxml2argvdata/shmem.err | 1 -
tests/qemuxml2argvdata/shmem.xml | 56 ----------------------
tests/qemuxml2argvtest.c | 2 -
tests/qemuxml2xmloutdata/shmem.xml | 74 ------------------------------
tests/qemuxml2xmltest.c | 1 -
10 files changed, 5 insertions(+), 241 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/shmem.args
delete mode 100644 tests/qemuxml2argvdata/shmem.err
delete mode 100644 tests/qemuxml2argvdata/shmem.xml
delete mode 100644 tests/qemuxml2xmloutdata/shmem.xml
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 77c5335bde..9a6840e870 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8873,44 +8873,6 @@ qemuBuildSmartcardCommandLine(virCommand *cmd,
}
-static virJSONValue *
-qemuBuildShmemDevLegacyProps(virDomainDef *def,
- virDomainShmemDef *shmem)
-{
- g_autoptr(virJSONValue) props = NULL;
- g_autofree char *size = NULL;
- const char *shm = NULL;
- g_autofree char *chardev = NULL;
-
- /* while this would result in a type error with newer qemus, the 'ivshmem'
- * device was removed in qemu-4.0, so for the sake of not changing the
- * commandline we do this hack */
- size = g_strdup_printf("%llum", shmem->size >> 20);
-
- if (shmem->server.enabled)
- chardev = g_strdup_printf("char%s", shmem->info.alias);
- else
- shm = shmem->name;
-
- if (virJSONValueObjectAdd(&props,
- "s:driver", "ivshmem",
- "s:id", shmem->info.alias,
- "s:size", size,
- "S:shm", shm,
- "S:chardev", chardev,
- "B:msi", shmem->msi.enabled,
- "p:vectors", shmem->msi.vectors,
- "T:ioeventfd", shmem->msi.ioeventfd,
- NULL) < 0)
- return NULL;
-
- if (qemuBuildDeviceAddressProps(props, def, &shmem->info) < 0)
- return NULL;
-
- return g_steal_pointer(&props);
-}
-
-
virJSONValue *
qemuBuildShmemDevProps(virDomainDef *def,
virDomainShmemDef *shmem)
@@ -9014,7 +8976,7 @@ qemuBuildShmemCommandLine(virCommand *cmd,
switch (shmem->model) {
case VIR_DOMAIN_SHMEM_MODEL_IVSHMEM:
- devProps = qemuBuildShmemDevLegacyProps(def, shmem);
+ /* unreachable, rejected by validation */
break;
case VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_PLAIN:
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 2e3c99760d..f3f0e23fa7 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2817,19 +2817,7 @@ qemuDomainAttachShmemDevice(virDomainObj *vm,
qemuDomainObjPrivate *priv = vm->privateData;
virDomainDeviceDef dev = { VIR_DOMAIN_DEVICE_SHMEM, { .shmem = shmem } };
- switch (shmem->model) {
- case VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_PLAIN:
- case VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_DOORBELL:
- break;
-
- case VIR_DOMAIN_SHMEM_MODEL_IVSHMEM:
- virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
- _("live attach of shmem model '%1$s' is not
supported"),
- virDomainShmemModelTypeToString(shmem->model));
- G_GNUC_FALLTHROUGH;
- case VIR_DOMAIN_SHMEM_MODEL_LAST:
- return -1;
- }
+ /* validation ensures that the legacy 'ivshmem' device is rejected */
qemuAssignDeviceShmemAlias(vm->def, shmem, -1);
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index d21551ab07..9b490a130d 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1503,11 +1503,6 @@ qemuMigrationSrcIsAllowed(virDomainObj *vm,
for (i = 0; i < vm->def->nshmems; i++) {
virDomainShmemDef *shmem = vm->def->shmems[i];
- if (shmem->model == VIR_DOMAIN_SHMEM_MODEL_IVSHMEM) {
- virReportError(VIR_ERR_OPERATION_INVALID, "%s",
- _("migration with legacy shmem device is not
supported"));
- return false;
- }
if (shmem->role != VIR_DOMAIN_SHMEM_ROLE_MASTER) {
virReportError(VIR_ERR_OPERATION_INVALID,
_("shmem device '%1$s' cannot be migrated,
only shmem with role='%2$s' can be migrated"),
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index de3aebb439..7fb104f238 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -5097,13 +5097,9 @@ qemuValidateDomainDeviceDefShmem(virDomainShmemDef *shmem,
{
switch (shmem->model) {
case VIR_DOMAIN_SHMEM_MODEL_IVSHMEM:
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("ivshmem device is not supported "
- "with this QEMU binary"));
- return -1;
- }
- break;
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("ivshmem device is no longer supported"));
+ return -1;
case VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_PLAIN:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_PLAIN)) {
diff --git a/tests/qemuxml2argvdata/shmem.args b/tests/qemuxml2argvdata/shmem.args
deleted file mode 100644
index 1ca9a3354f..0000000000
--- a/tests/qemuxml2argvdata/shmem.args
+++ /dev/null
@@ -1,43 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device ivshmem,id=shmem0,size=4m,shm=shmem0,bus=pci.0,addr=0x2 \
--device ivshmem,id=shmem1,size=128m,shm=shmem1,bus=pci.0,addr=0x3 \
--device ivshmem,id=shmem2,size=256m,shm=shmem2,bus=pci.0,addr=0x4 \
--device ivshmem,id=shmem3,size=512m,chardev=charshmem3,bus=pci.0,addr=0x5 \
--chardev socket,id=charshmem3,path=/var/lib/libvirt/shmem-shmem3-sock \
--device ivshmem,id=shmem4,size=1024m,chardev=charshmem4,bus=pci.0,addr=0x6 \
--chardev socket,id=charshmem4,path=/tmp/shmem4-sock \
--device
ivshmem,id=shmem5,size=2048m,chardev=charshmem5,msi=on,ioeventfd=off,bus=pci.0,addr=0x7 \
--chardev socket,id=charshmem5,path=/tmp/shmem5-sock \
--device
ivshmem,id=shmem6,size=4096m,chardev=charshmem6,msi=on,vectors=16,bus=pci.0,addr=0x8 \
--chardev socket,id=charshmem6,path=/tmp/shmem6-sock \
--device
ivshmem,id=shmem7,size=8192m,chardev=charshmem7,msi=on,vectors=32,ioeventfd=on,bus=pci.0,addr=0x9
\
--chardev socket,id=charshmem7,path=/tmp/shmem7-sock \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/shmem.err b/tests/qemuxml2argvdata/shmem.err
deleted file mode 100644
index b9e128edf3..0000000000
--- a/tests/qemuxml2argvdata/shmem.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: ivshmem device is not supported with this QEMU binary
diff --git a/tests/qemuxml2argvdata/shmem.xml b/tests/qemuxml2argvdata/shmem.xml
deleted file mode 100644
index b6dfe291df..0000000000
--- a/tests/qemuxml2argvdata/shmem.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest1</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219136</memory>
- <currentMemory unit='KiB'>219136</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='x86_64' machine='pc'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'/>
- <controller type='pci' index='0' model='pci-root'/>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <memballoon model='none'/>
- <shmem name='shmem0'/>
- <shmem name='shmem1'>
- <size unit='M'>128</size>
- </shmem>
- <shmem name='shmem2'>
- <size unit='M'>256</size>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
- </shmem>
- <shmem name='shmem3'>
- <model type='ivshmem'/>
- <size unit='M'>512</size>
- <server/>
- </shmem>
- <shmem name='shmem4'>
- <size unit='M'>1024</size>
- <server path='/tmp/shmem4-sock'/>
- </shmem>
- <shmem name='shmem5'>
- <size unit='M'>2048</size>
- <server path='/tmp/shmem5-sock'/>
- <msi ioeventfd='off'/>
- </shmem>
- <shmem name='shmem6'>
- <model type='ivshmem'/>
- <size unit='M'>4096</size>
- <server path='/tmp/shmem6-sock'/>
- <msi vectors='16'/>
- </shmem>
- <shmem name='shmem7'>
- <size unit='M'>8192</size>
- <server path='/tmp/shmem7-sock'/>
- <msi vectors='32' ioeventfd='on'/>
- </shmem>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index beaeaf02ad..e45f3828c8 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2404,8 +2404,6 @@ mymain(void)
DO_TEST_CAPS_ARCH_VER_FULL("fips-enabled", "x86_64",
"5.1.0", ARG_FLAGS, FLAG_FIPS_HOST);
DO_TEST_CAPS_ARCH_LATEST_FULL("fips-enabled", "x86_64",
ARG_FLAGS, FLAG_FIPS_HOST);
- DO_TEST("shmem", QEMU_CAPS_DEVICE_IVSHMEM);
- DO_TEST_PARSE_ERROR_NOCAPS("shmem");
DO_TEST_CAPS_LATEST("shmem-plain-doorbell");
DO_TEST_CAPS_LATEST_FAILURE("shmem-invalid-size");
DO_TEST_CAPS_LATEST_FAILURE("shmem-invalid-address");
diff --git a/tests/qemuxml2xmloutdata/shmem.xml b/tests/qemuxml2xmloutdata/shmem.xml
deleted file mode 100644
index bdd273de17..0000000000
--- a/tests/qemuxml2xmloutdata/shmem.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest1</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219136</memory>
- <currentMemory unit='KiB'>219136</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='x86_64' machine='pc'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
- </controller>
- <controller type='pci' index='0' model='pci-root'/>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <audio id='1' type='none'/>
- <memballoon model='none'/>
- <shmem name='shmem0'>
- <model type='ivshmem'/>
- <size unit='M'>4</size>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
- </shmem>
- <shmem name='shmem1'>
- <model type='ivshmem'/>
- <size unit='M'>128</size>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
- </shmem>
- <shmem name='shmem2'>
- <model type='ivshmem'/>
- <size unit='M'>256</size>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
- </shmem>
- <shmem name='shmem3'>
- <model type='ivshmem'/>
- <size unit='M'>512</size>
- <server/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
- </shmem>
- <shmem name='shmem4'>
- <model type='ivshmem'/>
- <size unit='M'>1024</size>
- <server path='/tmp/shmem4-sock'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
- </shmem>
- <shmem name='shmem5'>
- <model type='ivshmem'/>
- <size unit='M'>2048</size>
- <server path='/tmp/shmem5-sock'/>
- <msi ioeventfd='off'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
- </shmem>
- <shmem name='shmem6'>
- <model type='ivshmem'/>
- <size unit='M'>4096</size>
- <server path='/tmp/shmem6-sock'/>
- <msi vectors='16'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
- </shmem>
- <shmem name='shmem7'>
- <model type='ivshmem'/>
- <size unit='M'>8192</size>
- <server path='/tmp/shmem7-sock'/>
- <msi vectors='32' ioeventfd='on'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
- </shmem>
- </devices>
-</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index bbecaa3064..0471a0cceb 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -896,7 +896,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("tap-vhost");
DO_TEST_CAPS_LATEST("tap-vhost-incorrect");
- DO_TEST("shmem", QEMU_CAPS_DEVICE_IVSHMEM);
DO_TEST_CAPS_LATEST("shmem-plain-doorbell");
DO_TEST_CAPS_LATEST("smbios");
DO_TEST_CAPS_LATEST("smbios-multiple-type2");
--
2.41.0
8:11 a.m.
New subject: [PATCH 18/24] qemu: Retire 'ivshmem' device
On a Thursday in 2023, Peter Krempa wrote:
The device was removed in qemu-4.0 and is superseded by
'ivshmem-plain'
and 'ivshmem-doorbell'.
Always report error when the old version is used and drop the irrelevant
tests.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 40 +---------------
src/qemu/qemu_hotplug.c | 14 +-----
src/qemu/qemu_migration.c | 5 --
src/qemu/qemu_validate.c | 10 ++--
tests/qemuxml2argvdata/shmem.args | 43 -----------------
tests/qemuxml2argvdata/shmem.err | 1 -
tests/qemuxml2argvdata/shmem.xml | 56 ----------------------
tests/qemuxml2argvtest.c | 2 -
tests/qemuxml2xmloutdata/shmem.xml | 74 ------------------------------
tests/qemuxml2xmltest.c | 1 -
10 files changed, 5 insertions(+), 241 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/shmem.args
delete mode 100644 tests/qemuxml2argvdata/shmem.err
delete mode 100644 tests/qemuxml2argvdata/shmem.xml
delete mode 100644 tests/qemuxml2xmloutdata/shmem.xml
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 19/24] qemu: capabilities: Retire unused QEMU_CAPS_DEVICE_IVSHMEM
qemu removed the support for the old 'ivshmem' device in 4.0 release.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f80bdb579d..40eacf0f4d 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -312,7 +312,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 175 */
"migrate-rdma", /* QEMU_CAPS_MIGRATE_RDMA */
- "ivshmem", /* QEMU_CAPS_DEVICE_IVSHMEM */
+ "ivshmem", /* X_QEMU_CAPS_DEVICE_IVSHMEM */
"drive-iotune-max", /* X_QEMU_CAPS_DRIVE_IOTUNE_MAX */
"VGA.vgamem_mb", /* QEMU_CAPS_VGA_VGAMEM */
"vmware-svga.vgamem_mb", /* QEMU_CAPS_VMWARE_SVGA_VGAMEM */
@@ -1270,7 +1270,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "pvpanic", QEMU_CAPS_DEVICE_PANIC },
{ "usb-kbd", QEMU_CAPS_DEVICE_USB_KBD },
{ "usb-audio", QEMU_CAPS_OBJECT_USB_AUDIO },
- { "ivshmem", QEMU_CAPS_DEVICE_IVSHMEM },
{ "pc-dimm", QEMU_CAPS_DEVICE_PC_DIMM },
{ "pci-serial", QEMU_CAPS_DEVICE_PCI_SERIAL },
{ "gpex-pcihost", QEMU_CAPS_OBJECT_GPEX},
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index c72f73a161..2198b94cf2 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -290,7 +290,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 175 */
QEMU_CAPS_MIGRATE_RDMA, /* have rdma migration */
- QEMU_CAPS_DEVICE_IVSHMEM, /* -device ivshmem */
+ X_QEMU_CAPS_DEVICE_IVSHMEM, /* -device ivshmem */
X_QEMU_CAPS_DRIVE_IOTUNE_MAX, /* -drive bps_max= and friends */
QEMU_CAPS_VGA_VGAMEM, /* -device VGA.vgamem_mb */
QEMU_CAPS_VMWARE_SVGA_VGAMEM, /* -device vmware-svga.vgamem_mb */
--
2.41.0
8:11 a.m.
New subject: [PATCH 19/24] qemu: capabilities: Retire unused QEMU_CAPS_DEVICE_IVSHMEM
On a Thursday in 2023, Peter Krempa wrote:
qemu removed the support for the old 'ivshmem' device in 4.0
release.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 20/24] qemuxml2argvtest: Moderinze 'video-*' cases
Use latest capabilities for all tests.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../video-device-pciaddr-default.args | 37 ----------
...-device-pciaddr-default.x86_64-latest.args | 39 +++++++++++
...nvalid-multiple-devices.x86_64-latest.err} | 0
...ideo-multiple-primaries.x86_64-latest.err} | 0
...s => video-none-device.x86_64-latest.args} | 14 ++--
...video-qxl-device-vgamem.x86_64-latest.args | 37 ++++++++++
.../video-qxl-device.x86_64-latest.args | 37 ++++++++++
.../video-qxl-heads.x86_64-latest.args | 39 +++++++++++
tests/qemuxml2argvdata/video-qxl-noheads.args | 35 ----------
...s => video-qxl-noheads.x86_64-latest.args} | 18 ++---
.../video-qxl-resolution.args | 35 ----------
...> video-qxl-resolution.x86_64-latest.args} | 18 ++---
...o-qxl-sec-device-vgamem.x86_64-latest.args | 38 ++++++++++
.../video-qxl-sec-device.x86_64-latest.args | 38 ++++++++++
...ideo-vga-device-vgamem.x86_64-latest.args} | 17 ++---
tests/qemuxml2argvdata/video-vga-device.args | 35 ----------
...gs => video-vga-device.x86_64-latest.args} | 17 ++---
.../video-vga-qxl-heads.x86_64-latest.args | 39 +++++++++++
.../video-virtio-gpu-device.args | 35 ----------
...ideo-virtio-gpu-device.x86_64-latest.args} | 16 +++--
...ideo-virtio-gpu-sdl-gl.x86_64-latest.args} | 16 +++--
.../video-virtio-gpu-secondary.args | 33 ---------
...o-virtio-gpu-secondary.x86_64-latest.args} | 18 ++---
...eo-virtio-gpu-spice-gl.x86_64-latest.args} | 16 +++--
.../video-virtio-gpu-virgl.args | 35 ----------
.../video-virtio-gpu-virgl.x86_64-latest.args | 37 ++++++++++
tests/qemuxml2argvdata/video-virtio-vga.args | 35 ----------
...gs => video-virtio-vga.x86_64-latest.args} | 16 +++--
tests/qemuxml2argvtest.c | 69 ++++++-------------
29 files changed, 413 insertions(+), 406 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/video-device-pciaddr-default.args
create mode 100644
tests/qemuxml2argvdata/video-device-pciaddr-default.x86_64-latest.args
rename tests/qemuxml2argvdata/{video-invalid-multiple-devices.err =>
video-invalid-multiple-devices.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{video-multiple-primaries.err =>
video-multiple-primaries.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{video-none-device.args =>
video-none-device.x86_64-latest.args} (61%)
create mode 100644 tests/qemuxml2argvdata/video-qxl-device-vgamem.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/video-qxl-device.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/video-qxl-heads.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/video-qxl-noheads.args
rename tests/qemuxml2argvdata/{video-qxl-heads.args =>
video-qxl-noheads.x86_64-latest.args} (55%)
delete mode 100644 tests/qemuxml2argvdata/video-qxl-resolution.args
rename tests/qemuxml2argvdata/{video-vga-qxl-heads.args =>
video-qxl-resolution.x86_64-latest.args} (55%)
create mode 100644 tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/video-qxl-sec-device.x86_64-latest.args
rename tests/qemuxml2argvdata/{video-qxl-sec-device.args =>
video-vga-device-vgamem.x86_64-latest.args} (59%)
delete mode 100644 tests/qemuxml2argvdata/video-vga-device.args
rename tests/qemuxml2argvdata/{video-qxl-sec-device-vgamem.args =>
video-vga-device.x86_64-latest.args} (59%)
create mode 100644 tests/qemuxml2argvdata/video-vga-qxl-heads.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-device.args
rename tests/qemuxml2argvdata/{video-qxl-device-vgamem.args =>
video-virtio-gpu-device.x86_64-latest.args} (59%)
rename tests/qemuxml2argvdata/{video-virtio-gpu-sdl-gl.args =>
video-virtio-gpu-sdl-gl.x86_64-latest.args} (58%)
delete mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
rename tests/qemuxml2argvdata/{video-vga-device-vgamem.args =>
video-virtio-gpu-secondary.x86_64-latest.args} (51%)
rename tests/qemuxml2argvdata/{video-virtio-gpu-spice-gl.args =>
video-virtio-gpu-spice-gl.x86_64-latest.args} (60%)
delete mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-virgl.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/video-virtio-vga.args
rename tests/qemuxml2argvdata/{video-qxl-device.args =>
video-virtio-vga.x86_64-latest.args} (59%)
diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
deleted file mode 100644
index e7d8f18b84..0000000000
--- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
+++ /dev/null
@@ -1,37 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel kvm \
--m size=1048576k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid cdbebdfa-1d6d-65c3-be0f-fd74b978a773 \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
--device
ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \
--audiodev
'{"id":"audio1","driver":"none"}' \
--vnc 127.0.0.1:0,audiodev=audio1 \
--device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x3 \
--device
qxl,id=video1,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
--device
qxl,id=video2,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x5 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.x86_64-latest.args
b/tests/qemuxml2argvdata/video-device-pciaddr-default.x86_64-latest.args
new file mode 100644
index 0000000000..b6fd9f4efa
--- /dev/null
+++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.x86_64-latest.args
@@ -0,0 +1,39 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel kvm \
+-cpu qemu64 \
+-m size=1048576k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid cdbebdfa-1d6d-65c3-be0f-fd74b978a773 \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1,"write-cache":"on"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
+-device
'{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","addr":"0x3"}'
\
+-device
'{"driver":"qxl","id":"video1","max_outputs":1,"ram_size":67108864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","addr":"0x4"}'
\
+-device
'{"driver":"qxl","id":"video2","max_outputs":1,"ram_size":67108864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","addr":"0x5"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-invalid-multiple-devices.err
b/tests/qemuxml2argvdata/video-invalid-multiple-devices.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/video-invalid-multiple-devices.err
rename to tests/qemuxml2argvdata/video-invalid-multiple-devices.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/video-multiple-primaries.err
b/tests/qemuxml2argvdata/video-multiple-primaries.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/video-multiple-primaries.err
rename to tests/qemuxml2argvdata/video-multiple-primaries.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/video-none-device.args
b/tests/qemuxml2argvdata/video-none-device.x86_64-latest.args
similarity index 61%
rename from tests/qemuxml2argvdata/video-none-device.args
rename to tests/qemuxml2argvdata/video-none-device.x86_64-latest.args
index 1ea72106d7..d7cd40c422 100644
--- a/tests/qemuxml2argvdata/video-none-device.args
+++ b/tests/qemuxml2argvdata/video-none-device.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -22,13 +24,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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,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"}' \
-vnc 127.0.0.1:0,audiodev=audio1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.x86_64-latest.args
b/tests/qemuxml2argvdata/video-qxl-device-vgamem.x86_64-latest.args
new file mode 100644
index 0000000000..d9c66dc396
--- /dev/null
+++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.x86_64-latest.args
@@ -0,0 +1,37 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=1048576k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1,"write-cache":"on"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-device.x86_64-latest.args
b/tests/qemuxml2argvdata/video-qxl-device.x86_64-latest.args
new file mode 100644
index 0000000000..d9c66dc396
--- /dev/null
+++ b/tests/qemuxml2argvdata/video-qxl-device.x86_64-latest.args
@@ -0,0 +1,37 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=1048576k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1,"write-cache":"on"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-heads.x86_64-latest.args
b/tests/qemuxml2argvdata/video-qxl-heads.x86_64-latest.args
new file mode 100644
index 0000000000..e0fe7397e6
--- /dev/null
+++ b/tests/qemuxml2argvdata/video-qxl-heads.x86_64-latest.args
@@ -0,0 +1,39 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"qxl","id":"video1","max_outputs":3,"ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","addr":"0x4"}'
\
+-device
'{"driver":"qxl","id":"video2","max_outputs":7,"ram_size":67108864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","addr":"0x5"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args
b/tests/qemuxml2argvdata/video-qxl-noheads.args
deleted file mode 100644
index 7cec45cb49..0000000000
--- a/tests/qemuxml2argvdata/video-qxl-noheads.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args
b/tests/qemuxml2argvdata/video-qxl-noheads.x86_64-latest.args
similarity index 55%
rename from tests/qemuxml2argvdata/video-qxl-heads.args
rename to tests/qemuxml2argvdata/video-qxl-noheads.x86_64-latest.args
index 9c063e4ee6..32d58cc4b2 100644
--- a/tests/qemuxml2argvdata/video-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-qxl-noheads.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -23,15 +25,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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,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
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
--device
qxl,id=video1,max_outputs=3,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
--device
qxl,id=video2,max_outputs=7,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x5 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args
b/tests/qemuxml2argvdata/video-qxl-resolution.args
deleted file mode 100644
index 6343d15e6b..0000000000
--- a/tests/qemuxml2argvdata/video-qxl-resolution.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=8,xres=1280,yres=720,bus=pci.0,addr=0x2
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
b/tests/qemuxml2argvdata/video-qxl-resolution.x86_64-latest.args
similarity index 55%
rename from tests/qemuxml2argvdata/video-vga-qxl-heads.args
rename to tests/qemuxml2argvdata/video-qxl-resolution.x86_64-latest.args
index 9c063e4ee6..0a2d18443d 100644
--- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-qxl-resolution.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -23,15 +25,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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,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
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
--device
qxl,id=video1,max_outputs=3,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
--device
qxl,id=video2,max_outputs=7,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x5 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":8,"xres":1280,"yres":720,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.x86_64-latest.args
b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.x86_64-latest.args
new file mode 100644
index 0000000000..045c124005
--- /dev/null
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=1048576k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1,"write-cache":"on"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"qxl","id":"video1","max_outputs":1,"ram_size":67108864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","addr":"0x4"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.x86_64-latest.args
b/tests/qemuxml2argvdata/video-qxl-sec-device.x86_64-latest.args
new file mode 100644
index 0000000000..045c124005
--- /dev/null
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=1048576k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1,"write-cache":"on"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"qxl","id":"video1","max_outputs":1,"ram_size":67108864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pci.0","addr":"0x4"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args
b/tests/qemuxml2argvdata/video-vga-device-vgamem.x86_64-latest.args
similarity index 59%
rename from tests/qemuxml2argvdata/video-qxl-sec-device.args
rename to tests/qemuxml2argvdata/video-vga-device-vgamem.x86_64-latest.args
index bab9844498..0f2b1ec023 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device.args
+++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=1048576k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -23,14 +25,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
--device
ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1,"write-cache":"on"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
--device
qxl,id=video1,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"VGA","id":"video0","vgamem_mb":16,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-vga-device.args
b/tests/qemuxml2argvdata/video-vga-device.args
deleted file mode 100644
index 8277171a78..0000000000
--- a/tests/qemuxml2argvdata/video-vga-device.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=1048576k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
--device
ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device VGA,id=video0,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
b/tests/qemuxml2argvdata/video-vga-device.x86_64-latest.args
similarity index 59%
rename from tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
rename to tests/qemuxml2argvdata/video-vga-device.x86_64-latest.args
index 9c125f24e4..0f2b1ec023 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-vga-device.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=1048576k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -23,14 +25,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
--device
ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1,"write-cache":"on"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x2
\
--device
qxl,id=video1,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x4
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"VGA","id":"video0","vgamem_mb":16,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.x86_64-latest.args
b/tests/qemuxml2argvdata/video-vga-qxl-heads.x86_64-latest.args
new file mode 100644
index 0000000000..e0fe7397e6
--- /dev/null
+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.x86_64-latest.args
@@ -0,0 +1,39 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"qxl","id":"video1","max_outputs":3,"ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","addr":"0x4"}'
\
+-device
'{"driver":"qxl","id":"video2","max_outputs":7,"ram_size":67108864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pci.0","addr":"0x5"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
deleted file mode 100644
index 46aa2ebc30..0000000000
--- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=1048576k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
--device
ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
b/tests/qemuxml2argvdata/video-virtio-gpu-device.x86_64-latest.args
similarity index 59%
rename from tests/qemuxml2argvdata/video-qxl-device-vgamem.args
rename to tests/qemuxml2argvdata/video-virtio-gpu-device.x86_64-latest.args
index 62782829ab..c7e867cfcd 100644
--- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=1048576k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -23,13 +25,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
--device
ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1,"write-cache":"on"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x2
\
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"virtio-vga","id":"video0","max_outputs":1,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.x86_64-latest.args
similarity index 58%
rename from tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
rename to tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.x86_64-latest.args
index 88ede23a04..84215bb370 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=1048576k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -22,13 +24,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
--device
ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1,"write-cache":"on"}'
\
-display sdl,gl=on \
--device virtio-gpu-pci,id=video0,virgl=on,max_outputs=1,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"virtio-vga-gl","id":"video0","max_outputs":1,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
deleted file mode 100644
index 670058e7ac..0000000000
--- a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=1048576k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.0,addr=0x2 \
--device virtio-gpu-pci,id=video1,max_outputs=1,bus=pci.0,addr=0x4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.x86_64-latest.args
similarity index 51%
rename from tests/qemuxml2argvdata/video-vga-device-vgamem.args
rename to tests/qemuxml2argvdata/video-virtio-gpu-secondary.x86_64-latest.args
index 92de05bf2c..68aabbec28 100644
--- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=1048576k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -23,13 +25,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
--blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
--device
ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device VGA,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"virtio-vga","id":"video0","max_outputs":1,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-gpu-pci","id":"video1","max_outputs":1,"bus":"pci.0","addr":"0x4"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.x86_64-latest.args
similarity index 60%
rename from tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
rename to tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.x86_64-latest.args
index dd02a3aea3..a7c40489ec 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=1048576k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -22,14 +24,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
--device
ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1,"write-cache":"on"}'
\
-audiodev
'{"id":"audio1","driver":"spice"}' \
-spice port=0,gl=on,rendernode=/dev/dri/foo,seamless-migration=on \
--device virtio-gpu-pci,id=video0,virgl=on,max_outputs=1,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"virtio-vga-gl","id":"video0","max_outputs":1,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
deleted file mode 100644
index c4b373e48b..0000000000
--- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=1048576k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
--device
ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-gpu-pci,id=video0,virgl=on,max_outputs=1,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.x86_64-latest.args
b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.x86_64-latest.args
new file mode 100644
index 0000000000..3b6bcceb8d
--- /dev/null
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.x86_64-latest.args
@@ -0,0 +1,37 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=1048576k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1,"write-cache":"on"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-vga-gl","id":"video0","max_outputs":1,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args
b/tests/qemuxml2argvdata/video-virtio-vga.args
deleted file mode 100644
index 2c9acd9422..0000000000
--- a/tests/qemuxml2argvdata/video-virtio-vga.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=1048576k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
--device
ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-vga,id=video0,max_outputs=1,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-device.args
b/tests/qemuxml2argvdata/video-virtio-vga.x86_64-latest.args
similarity index 59%
rename from tests/qemuxml2argvdata/video-qxl-device.args
rename to tests/qemuxml2argvdata/video-virtio-vga.x86_64-latest.args
index 018aa11299..c7e867cfcd 100644
--- a/tests/qemuxml2argvdata/video-qxl-device.args
+++ b/tests/qemuxml2argvdata/video-virtio-vga.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=1048576k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -23,13 +25,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}'
\
-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}'
\
--device
ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1,"write-cache":"on"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"virtio-vga","id":"video0","max_outputs":1,"bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index e45f3828c8..76c4c1ea6d 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1971,60 +1971,33 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("mach-virt-console-virtio", "aarch64");
DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("mach-virt-serial-invalid-machine",
"x86_64");
- DO_TEST("video-device-pciaddr-default",
- QEMU_CAPS_KVM,
- QEMU_CAPS_VNC,
- QEMU_CAPS_DEVICE_QXL);
- DO_TEST("video-vga-device", QEMU_CAPS_DEVICE_VGA);
- DO_TEST("video-vga-device-vgamem", QEMU_CAPS_DEVICE_VGA,
- QEMU_CAPS_VGA_VGAMEM);
- DO_TEST("video-qxl-device",
- QEMU_CAPS_DEVICE_QXL);
- DO_TEST("video-qxl-device-vgamem",
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_QXL_VGAMEM);
+ DO_TEST_CAPS_LATEST("video-device-pciaddr-default");
+ DO_TEST_CAPS_LATEST("video-vga-device");
+ DO_TEST_CAPS_LATEST("video-vga-device-vgamem");
+ DO_TEST_CAPS_LATEST("video-qxl-device");
+ DO_TEST_CAPS_LATEST("video-qxl-device-vgamem");
DO_TEST_CAPS_LATEST("video-qxl-device-vram64");
- DO_TEST("video-qxl-sec-device",
- QEMU_CAPS_DEVICE_QXL);
- DO_TEST("video-qxl-sec-device-vgamem",
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_QXL_VGAMEM);
+ DO_TEST_CAPS_LATEST("video-qxl-sec-device");
+ DO_TEST_CAPS_LATEST("video-qxl-sec-device-vgamem");
DO_TEST_CAPS_LATEST("video-qxl-sec-device-vram64");
- DO_TEST("video-qxl-heads", QEMU_CAPS_DEVICE_QXL);
- DO_TEST("video-vga-qxl-heads", QEMU_CAPS_DEVICE_QXL);
- DO_TEST("video-qxl-noheads", QEMU_CAPS_DEVICE_QXL);
- DO_TEST("video-qxl-resolution",
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_QXL_VGAMEM);
- DO_TEST("video-virtio-gpu-device",
- QEMU_CAPS_DEVICE_VIRTIO_GPU);
- DO_TEST("video-virtio-gpu-virgl",
- QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_VIRTIO_GPU_VIRGL);
- DO_TEST("video-virtio-gpu-spice-gl",
- QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_VIRTIO_GPU_VIRGL,
- QEMU_CAPS_SPICE,
- QEMU_CAPS_SPICE_GL,
- QEMU_CAPS_SPICE_RENDERNODE);
- DO_TEST("video-virtio-gpu-sdl-gl",
- QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_VIRTIO_GPU_VIRGL,
- QEMU_CAPS_SDL);
- DO_TEST("video-virtio-gpu-secondary",
- QEMU_CAPS_DEVICE_VIRTIO_GPU);
- DO_TEST("video-virtio-vga",
- QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_DEVICE_VIRTIO_VGA);
+ DO_TEST_CAPS_LATEST("video-qxl-heads");
+ DO_TEST_CAPS_LATEST("video-vga-qxl-heads");
+ DO_TEST_CAPS_LATEST("video-qxl-noheads");
+ DO_TEST_CAPS_LATEST("video-qxl-resolution");
+ DO_TEST_CAPS_LATEST("video-virtio-gpu-device");
+ DO_TEST_CAPS_LATEST("video-virtio-gpu-virgl");
+ DO_TEST_CAPS_LATEST("video-virtio-gpu-spice-gl");
+ DO_TEST_CAPS_LATEST("video-virtio-gpu-sdl-gl");
+ DO_TEST_CAPS_LATEST("video-virtio-gpu-secondary");
+ DO_TEST_CAPS_LATEST("video-virtio-vga");
DO_TEST_CAPS_LATEST("video-virtio-blob-on");
DO_TEST_CAPS_LATEST("video-virtio-blob-off");
DO_TEST_CAPS_LATEST("video-virtio-vga-gpu-gl");
DO_TEST_CAPS_LATEST("video-bochs-display-device");
DO_TEST_CAPS_LATEST("video-ramfb-display-device");
DO_TEST_CAPS_LATEST_PARSE_ERROR("video-ramfb-display-device-pci-address");
- DO_TEST("video-none-device",
- QEMU_CAPS_VNC);
- DO_TEST_PARSE_ERROR_NOCAPS("video-invalid-multiple-devices");
+ DO_TEST_CAPS_LATEST("video-none-device");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("video-invalid-multiple-devices");
DO_TEST_CAPS_LATEST("default-video-type-x86_64");
DO_TEST_CAPS_ARCH_LATEST("default-video-type-aarch64",
"aarch64");
@@ -2032,9 +2005,7 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("default-video-type-riscv64",
"riscv64");
DO_TEST_CAPS_ARCH_LATEST("default-video-type-s390x", "s390x");
- DO_TEST_PARSE_ERROR("video-multiple-primaries",
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_DEVICE_VGA);
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("video-multiple-primaries");
DO_TEST("virtio-rng-default",
QEMU_CAPS_DEVICE_VIRTIO_RNG,
--
2.41.0
8:12 a.m.
New subject: [PATCH 20/24] qemuxml2argvtest: Moderinze 'video-*' cases
On a Thursday in 2023, Peter Krempa wrote:
Use latest capabilities for all tests.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../video-device-pciaddr-default.args | 37 ----------
...-device-pciaddr-default.x86_64-latest.args | 39 +++++++++++
...nvalid-multiple-devices.x86_64-latest.err} | 0
...ideo-multiple-primaries.x86_64-latest.err} | 0
...s => video-none-device.x86_64-latest.args} | 14 ++--
...video-qxl-device-vgamem.x86_64-latest.args | 37 ++++++++++
.../video-qxl-device.x86_64-latest.args | 37 ++++++++++
.../video-qxl-heads.x86_64-latest.args | 39 +++++++++++
tests/qemuxml2argvdata/video-qxl-noheads.args | 35 ----------
...s => video-qxl-noheads.x86_64-latest.args} | 18 ++---
.../video-qxl-resolution.args | 35 ----------
...> video-qxl-resolution.x86_64-latest.args} | 18 ++---
...o-qxl-sec-device-vgamem.x86_64-latest.args | 38 ++++++++++
.../video-qxl-sec-device.x86_64-latest.args | 38 ++++++++++
...ideo-vga-device-vgamem.x86_64-latest.args} | 17 ++---
tests/qemuxml2argvdata/video-vga-device.args | 35 ----------
...gs => video-vga-device.x86_64-latest.args} | 17 ++---
.../video-vga-qxl-heads.x86_64-latest.args | 39 +++++++++++
.../video-virtio-gpu-device.args | 35 ----------
...ideo-virtio-gpu-device.x86_64-latest.args} | 16 +++--
...ideo-virtio-gpu-sdl-gl.x86_64-latest.args} | 16 +++--
.../video-virtio-gpu-secondary.args | 33 ---------
...o-virtio-gpu-secondary.x86_64-latest.args} | 18 ++---
...eo-virtio-gpu-spice-gl.x86_64-latest.args} | 16 +++--
.../video-virtio-gpu-virgl.args | 35 ----------
.../video-virtio-gpu-virgl.x86_64-latest.args | 37 ++++++++++
tests/qemuxml2argvdata/video-virtio-vga.args | 35 ----------
...gs => video-virtio-vga.x86_64-latest.args} | 16 +++--
tests/qemuxml2argvtest.c | 69 ++++++-------------
29 files changed, 413 insertions(+), 406 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/video-device-pciaddr-default.args
create mode 100644
tests/qemuxml2argvdata/video-device-pciaddr-default.x86_64-latest.args
rename tests/qemuxml2argvdata/{video-invalid-multiple-devices.err =>
video-invalid-multiple-devices.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{video-multiple-primaries.err =>
video-multiple-primaries.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{video-none-device.args =>
video-none-device.x86_64-latest.args} (61%)
create mode 100644 tests/qemuxml2argvdata/video-qxl-device-vgamem.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/video-qxl-device.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/video-qxl-heads.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/video-qxl-noheads.args
rename tests/qemuxml2argvdata/{video-qxl-heads.args =>
video-qxl-noheads.x86_64-latest.args} (55%)
delete mode 100644 tests/qemuxml2argvdata/video-qxl-resolution.args
rename tests/qemuxml2argvdata/{video-vga-qxl-heads.args =>
video-qxl-resolution.x86_64-latest.args} (55%)
create mode 100644 tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/video-qxl-sec-device.x86_64-latest.args
rename tests/qemuxml2argvdata/{video-qxl-sec-device.args =>
video-vga-device-vgamem.x86_64-latest.args} (59%)
delete mode 100644 tests/qemuxml2argvdata/video-vga-device.args
rename tests/qemuxml2argvdata/{video-qxl-sec-device-vgamem.args =>
video-vga-device.x86_64-latest.args} (59%)
create mode 100644 tests/qemuxml2argvdata/video-vga-qxl-heads.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-device.args
rename tests/qemuxml2argvdata/{video-qxl-device-vgamem.args =>
video-virtio-gpu-device.x86_64-latest.args} (59%)
rename tests/qemuxml2argvdata/{video-virtio-gpu-sdl-gl.args =>
video-virtio-gpu-sdl-gl.x86_64-latest.args} (58%)
delete mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
rename tests/qemuxml2argvdata/{video-vga-device-vgamem.args =>
video-virtio-gpu-secondary.x86_64-latest.args} (51%)
rename tests/qemuxml2argvdata/{video-virtio-gpu-spice-gl.args =>
video-virtio-gpu-spice-gl.x86_64-latest.args} (60%)
delete mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-virgl.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/video-virtio-vga.args
rename tests/qemuxml2argvdata/{video-qxl-device.args =>
video-virtio-vga.x86_64-latest.args} (59%)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 21/24] qemuxml2xmltest: Modernize all 'video-*' cases
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../qemuxml2argvdata/video-qxl-resolution.xml | 5 ++-
...-device-pciaddr-default.x86_64-latest.xml} | 5 ++-
...ml => video-none-device.x86_64-latest.xml} | 5 ++-
....xml => video-qxl-heads.x86_64-latest.xml} | 5 ++-
...ml => video-qxl-noheads.x86_64-latest.xml} | 5 ++-
...=> video-qxl-resolution.x86_64-latest.xml} | 0
...video-virtio-gpu-device.x86_64-latest.xml} | 5 ++-
...video-virtio-gpu-sdl-gl.x86_64-latest.xml} | 5 ++-
...eo-virtio-gpu-secondary.x86_64-latest.xml} | 5 ++-
...deo-virtio-gpu-spice-gl.x86_64-latest.xml} | 5 ++-
... video-virtio-gpu-virgl.x86_64-latest.xml} | 5 ++-
tests/qemuxml2xmltest.c | 33 ++++++-------------
12 files changed, 50 insertions(+), 33 deletions(-)
rename tests/qemuxml2xmloutdata/{video-device-pciaddr-default.xml =>
video-device-pciaddr-default.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{video-none-device.xml =>
video-none-device.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{video-qxl-heads.xml =>
video-qxl-heads.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{video-qxl-noheads.xml =>
video-qxl-noheads.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{video-qxl-resolution.xml =>
video-qxl-resolution.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{video-virtio-gpu-device.xml =>
video-virtio-gpu-device.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{video-virtio-gpu-sdl-gl.xml =>
video-virtio-gpu-sdl-gl.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{video-virtio-gpu-secondary.xml =>
video-virtio-gpu-secondary.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{video-virtio-gpu-spice-gl.xml =>
video-virtio-gpu-spice-gl.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{video-virtio-gpu-virgl.xml =>
video-virtio-gpu-virgl.x86_64-latest.xml} (90%)
diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.xml
b/tests/qemuxml2argvdata/video-qxl-resolution.xml
index 5715f9daa4..f0f8f76a99 100644
--- a/tests/qemuxml2argvdata/video-qxl-resolution.xml
+++ b/tests/qemuxml2argvdata/video-qxl-resolution.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml
b/tests/qemuxml2xmloutdata/video-device-pciaddr-default.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml
rename to tests/qemuxml2xmloutdata/video-device-pciaddr-default.x86_64-latest.xml
index 431661e29d..1d71995af0 100644
--- a/tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml
+++ b/tests/qemuxml2xmloutdata/video-device-pciaddr-default.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/video-none-device.xml
b/tests/qemuxml2xmloutdata/video-none-device.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/video-none-device.xml
rename to tests/qemuxml2xmloutdata/video-none-device.x86_64-latest.xml
index 1c6c417bc8..e39c617b91 100644
--- a/tests/qemuxml2xmloutdata/video-none-device.xml
+++ b/tests/qemuxml2xmloutdata/video-none-device.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/video-qxl-heads.xml
b/tests/qemuxml2xmloutdata/video-qxl-heads.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/video-qxl-heads.xml
rename to tests/qemuxml2xmloutdata/video-qxl-heads.x86_64-latest.xml
index 9a8e1fca0b..6d93ba1330 100644
--- a/tests/qemuxml2xmloutdata/video-qxl-heads.xml
+++ b/tests/qemuxml2xmloutdata/video-qxl-heads.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
b/tests/qemuxml2xmloutdata/video-qxl-noheads.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/video-qxl-noheads.xml
rename to tests/qemuxml2xmloutdata/video-qxl-noheads.x86_64-latest.xml
index 6243e29075..39d2f83422 100644
--- a/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
+++ b/tests/qemuxml2xmloutdata/video-qxl-noheads.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/video-qxl-resolution.xml
b/tests/qemuxml2xmloutdata/video-qxl-resolution.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-qxl-resolution.xml
rename to tests/qemuxml2xmloutdata/video-qxl-resolution.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
b/tests/qemuxml2xmloutdata/video-virtio-gpu-device.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-device.x86_64-latest.xml
index c1fc9c7f67..0c31cfb927 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-device.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml
b/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.x86_64-latest.xml
index 5a233f527c..401fdaf697 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.xml
b/tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.x86_64-latest.xml
index 413296a925..7eae993cc0 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -15,7 +18,7 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='pci' index='0' model='pci-root'/>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
b/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.x86_64-latest.xml
index 411462bebf..89da83de01 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
b/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.x86_64-latest.xml
index d26ada53a3..48b1d833ff 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 0471a0cceb..172d19ecfd 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1002,20 +1002,10 @@ mymain(void)
DO_TEST_CAPS_LATEST("net-udp");
- DO_TEST("video-virtio-gpu-device", QEMU_CAPS_DEVICE_VIRTIO_GPU);
- DO_TEST("video-virtio-gpu-virgl",
- QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_VIRTIO_GPU_VIRGL);
- DO_TEST("video-virtio-gpu-spice-gl",
- QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_VIRTIO_GPU_VIRGL,
- QEMU_CAPS_SPICE,
- QEMU_CAPS_SPICE_GL,
- QEMU_CAPS_SPICE_RENDERNODE);
- DO_TEST("video-virtio-gpu-sdl-gl",
- QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_VIRTIO_GPU_VIRGL,
- QEMU_CAPS_SDL);
+ DO_TEST_CAPS_LATEST("video-virtio-gpu-device");
+ DO_TEST_CAPS_LATEST("video-virtio-gpu-virgl");
+ DO_TEST_CAPS_LATEST("video-virtio-gpu-spice-gl");
+ DO_TEST_CAPS_LATEST("video-virtio-gpu-sdl-gl");
DO_TEST("virtio-input",
QEMU_CAPS_VIRTIO_KEYBOARD,
@@ -1043,17 +1033,14 @@ mymain(void)
DO_TEST_CAPS_LATEST("acpi-table");
- DO_TEST("video-device-pciaddr-default",
- QEMU_CAPS_KVM,
- QEMU_CAPS_VNC,
- QEMU_CAPS_DEVICE_QXL);
- DO_TEST("video-qxl-heads", QEMU_CAPS_DEVICE_QXL);
- DO_TEST("video-qxl-noheads", QEMU_CAPS_DEVICE_QXL);
- DO_TEST("video-qxl-resolution", QEMU_CAPS_DEVICE_QXL);
- DO_TEST("video-virtio-gpu-secondary", QEMU_CAPS_DEVICE_VIRTIO_GPU);
+ DO_TEST_CAPS_LATEST("video-device-pciaddr-default");
+ DO_TEST_CAPS_LATEST("video-qxl-heads");
+ DO_TEST_CAPS_LATEST("video-qxl-noheads");
+ DO_TEST_CAPS_LATEST("video-qxl-resolution");
+ DO_TEST_CAPS_LATEST("video-virtio-gpu-secondary");
DO_TEST_CAPS_ARCH_LATEST("video-virtio-gpu-ccw", "s390x");
DO_TEST_CAPS_ARCH_LATEST("video-virtio-gpu-ccw-auto", "s390x");
- DO_TEST("video-none-device", QEMU_CAPS_VNC);
+ DO_TEST_CAPS_LATEST("video-none-device");
DO_TEST_CAPS_LATEST("video-virtio-vga-gpu-gl");
DO_TEST_CAPS_LATEST("video-virtio-blob-on");
DO_TEST_CAPS_LATEST("video-virtio-blob-off");
--
2.41.0
8:13 a.m.
New subject: [PATCH 21/24] qemuxml2xmltest: Modernize all 'video-*' cases
On a Thursday in 2023, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../qemuxml2argvdata/video-qxl-resolution.xml | 5 ++-
...-device-pciaddr-default.x86_64-latest.xml} | 5 ++-
...ml => video-none-device.x86_64-latest.xml} | 5 ++-
....xml => video-qxl-heads.x86_64-latest.xml} | 5 ++-
...ml => video-qxl-noheads.x86_64-latest.xml} | 5 ++-
...=> video-qxl-resolution.x86_64-latest.xml} | 0
...video-virtio-gpu-device.x86_64-latest.xml} | 5 ++-
...video-virtio-gpu-sdl-gl.x86_64-latest.xml} | 5 ++-
...eo-virtio-gpu-secondary.x86_64-latest.xml} | 5 ++-
...deo-virtio-gpu-spice-gl.x86_64-latest.xml} | 5 ++-
... video-virtio-gpu-virgl.x86_64-latest.xml} | 5 ++-
tests/qemuxml2xmltest.c | 33 ++++++-------------
12 files changed, 50 insertions(+), 33 deletions(-)
rename tests/qemuxml2xmloutdata/{video-device-pciaddr-default.xml =>
video-device-pciaddr-default.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{video-none-device.xml =>
video-none-device.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{video-qxl-heads.xml =>
video-qxl-heads.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{video-qxl-noheads.xml =>
video-qxl-noheads.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{video-qxl-resolution.xml =>
video-qxl-resolution.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{video-virtio-gpu-device.xml =>
video-virtio-gpu-device.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{video-virtio-gpu-sdl-gl.xml =>
video-virtio-gpu-sdl-gl.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{video-virtio-gpu-secondary.xml =>
video-virtio-gpu-secondary.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{video-virtio-gpu-spice-gl.xml =>
video-virtio-gpu-spice-gl.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{video-virtio-gpu-virgl.xml =>
video-virtio-gpu-virgl.x86_64-latest.xml} (90%)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 22/24] qemuxml2argvtest: Modernize 'net-*'
Convert all tests using fake capabilities to use DO_TEST_CAPS_LATEST.
Note that rename detection in git didn't work too well here and the
files may not correspond.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../net-client.x86_64-latest.args | 38 ++++++++++++
...args => net-eth-hostip.x86_64-latest.args} | 16 ++---
...args => net-eth-ifname.x86_64-latest.args} | 19 +++---
.../net-eth-names.x86_64-latest.args | 40 ++++++++++++
.../net-eth-unmanaged-tap.args | 35 -----------
.../net-eth-unmanaged-tap.x86_64-latest.args | 37 +++++++++++
tests/qemuxml2argvdata/net-eth.args | 35 -----------
.../net-eth.x86_64-latest.args | 37 +++++++++++
.../net-hostdev-bootorder.args | 34 -----------
... net-hostdev-bootorder.x86_64-latest.args} | 16 ++---
...err => net-hostdev-fail.x86_64-latest.err} | 0
.../net-hostdev-multidomain.args | 35 -----------
...net-hostdev-multidomain.x86_64-latest.args | 37 +++++++++++
.../net-hostdev-vfio-multidomain.args | 35 -----------
...ostdev-vfio-multidomain.x86_64-latest.args | 37 +++++++++++
tests/qemuxml2argvdata/net-hostdev-vfio.args | 35 -----------
.../net-hostdev-vfio.x86_64-latest.args | 37 +++++++++++
tests/qemuxml2argvdata/net-hostdev.args | 35 -----------
.../net-hostdev.x86_64-latest.args | 37 +++++++++++
tests/qemuxml2argvdata/net-mcast.args | 36 -----------
.../net-mcast.x86_64-latest.args | 38 ++++++++++++
tests/qemuxml2argvdata/net-server.args | 36 -----------
.../net-server.x86_64-latest.args | 38 ++++++++++++
tests/qemuxml2argvdata/net-udp.args | 36 -----------
.../net-udp.x86_64-latest.args | 38 ++++++++++++
tests/qemuxml2argvdata/net-user.args | 35 -----------
...r => net-vhostuser-fail.x86_64-latest.err} | 0
.../net-vhostuser-multiq.args | 47 --------------
.../net-vhostuser-multiq.x86_64-latest.args | 49 +++++++++++++++
tests/qemuxml2argvdata/net-vhostuser.args | 38 ------------
tests/qemuxml2argvdata/net-virtio-device.args | 36 -----------
.../net-virtio-device.x86_64-latest.args | 38 ++++++++++++
...irtio-disable-offloads.x86_64-latest.args} | 18 +++---
tests/qemuxml2argvdata/net-virtio-netdev.args | 36 -----------
.../net-virtio-netdev.x86_64-latest.args | 38 ++++++++++++
...xqueuesize-invalid-size.x86_64-latest.err} | 0
.../net-virtio-rxtxqueuesize.args | 36 -----------
...et-virtio-rxtxqueuesize.x86_64-latest.args | 38 ++++++++++++
.../net-virtio-teaming-hostdev.args | 40 ------------
...-virtio-teaming-hostdev.x86_64-latest.args | 42 +++++++++++++
.../qemuxml2argvdata/net-virtio-teaming.args | 40 ------------
.../net-virtio-teaming.x86_64-latest.args | 42 +++++++++++++
tests/qemuxml2argvdata/net-virtio.args | 35 -----------
...tip.args => net-virtio.x86_64-latest.args} | 16 ++---
tests/qemuxml2argvtest.c | 61 +++++++++----------
45 files changed, 735 insertions(+), 767 deletions(-)
create mode 100644 tests/qemuxml2argvdata/net-client.x86_64-latest.args
rename tests/qemuxml2argvdata/{net-eth-ifname.args =>
net-eth-hostip.x86_64-latest.args} (58%)
rename tests/qemuxml2argvdata/{net-eth-names.args =>
net-eth-ifname.x86_64-latest.args} (58%)
create mode 100644 tests/qemuxml2argvdata/net-eth-names.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
create mode 100644 tests/qemuxml2argvdata/net-eth-unmanaged-tap.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-eth.args
create mode 100644 tests/qemuxml2argvdata/net-eth.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-hostdev-bootorder.args
rename tests/qemuxml2argvdata/{net-client.args =>
net-hostdev-bootorder.x86_64-latest.args} (60%)
rename tests/qemuxml2argvdata/{net-hostdev-fail.err =>
net-hostdev-fail.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/net-hostdev-multidomain.args
create mode 100644 tests/qemuxml2argvdata/net-hostdev-multidomain.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
create mode 100644
tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-hostdev-vfio.args
create mode 100644 tests/qemuxml2argvdata/net-hostdev-vfio.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-hostdev.args
create mode 100644 tests/qemuxml2argvdata/net-hostdev.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-mcast.args
create mode 100644 tests/qemuxml2argvdata/net-mcast.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-server.args
create mode 100644 tests/qemuxml2argvdata/net-server.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-udp.args
create mode 100644 tests/qemuxml2argvdata/net-udp.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-user.args
rename tests/qemuxml2argvdata/{net-vhostuser-fail.err =>
net-vhostuser-fail.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/net-vhostuser-multiq.args
create mode 100644 tests/qemuxml2argvdata/net-vhostuser-multiq.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-vhostuser.args
delete mode 100644 tests/qemuxml2argvdata/net-virtio-device.args
create mode 100644 tests/qemuxml2argvdata/net-virtio-device.x86_64-latest.args
rename tests/qemuxml2argvdata/{net-virtio-disable-offloads.args =>
net-virtio-disable-offloads.x86_64-latest.args} (50%)
delete mode 100644 tests/qemuxml2argvdata/net-virtio-netdev.args
create mode 100644 tests/qemuxml2argvdata/net-virtio-netdev.x86_64-latest.args
rename tests/qemuxml2argvdata/{net-virtio-rxqueuesize-invalid-size.err =>
net-virtio-rxqueuesize-invalid-size.x86_64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
create mode 100644 tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming-hostdev.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-virtio-teaming.args
create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/net-virtio.args
rename tests/qemuxml2argvdata/{net-eth-hostip.args => net-virtio.x86_64-latest.args}
(58%)
diff --git a/tests/qemuxml2argvdata/net-client.x86_64-latest.args
b/tests/qemuxml2argvdata/net-client.x86_64-latest.args
new file mode 100644
index 0000000000..e386caf152
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-client.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-netdev
'{"type":"socket","connect":"192.168.0.1:5558","id":"hostnet0"}'
\
+-device
'{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:8c:b9:05","bus":"pci.0","addr":"0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args
b/tests/qemuxml2argvdata/net-eth-hostip.x86_64-latest.args
similarity index 58%
rename from tests/qemuxml2argvdata/net-eth-ifname.args
rename to tests/qemuxml2argvdata/net-eth-hostip.x86_64-latest.args
index 79dd75a39d..c7f830fd30 100644
--- a/tests/qemuxml2argvdata/net-eth-ifname.args
+++ b/tests/qemuxml2argvdata/net-eth-hostip.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -23,13 +25,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev tap,fd=3,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-netdev
'{"type":"tap","fd":"3","id":"hostnet0"}'
\
+-device
'{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth-names.args
b/tests/qemuxml2argvdata/net-eth-ifname.x86_64-latest.args
similarity index 58%
rename from tests/qemuxml2argvdata/net-eth-names.args
rename to tests/qemuxml2argvdata/net-eth-ifname.x86_64-latest.args
index 24c86a1308..c7f830fd30 100644
--- a/tests/qemuxml2argvdata/net-eth-names.args
+++ b/tests/qemuxml2argvdata/net-eth-ifname.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -23,16 +25,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev tap,fd=3,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
--netdev tap,fd=3,id=hostnet1 \
--device e1000,netdev=hostnet1,id=net1,mac=00:11:22:33:44:56,bus=pci.0,addr=0x3 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-netdev
'{"type":"tap","fd":"3","id":"hostnet0"}'
\
+-device
'{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth-names.x86_64-latest.args
b/tests/qemuxml2argvdata/net-eth-names.x86_64-latest.args
new file mode 100644
index 0000000000..4dd39e2288
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-eth-names.x86_64-latest.args
@@ -0,0 +1,40 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-netdev
'{"type":"tap","fd":"3","id":"hostnet0"}'
\
+-device
'{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}'
\
+-netdev
'{"type":"tap","fd":"3","id":"hostnet1"}'
\
+-device
'{"driver":"e1000","netdev":"hostnet1","id":"net1","mac":"00:11:22:33:44:56","bus":"pci.0","addr":"0x3"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
deleted file mode 100644
index 5fc34bcd4d..0000000000
--- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev tap,fd=3,vhost=on,vhostfd=44,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=fe:11:22:33:44:55,bus=pci.0,addr=0x2
\
--audiodev
'{"id":"audio1","driver":"none"}' \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.x86_64-latest.args
b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.x86_64-latest.args
new file mode 100644
index 0000000000..7feec2486b
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.x86_64-latest.args
@@ -0,0 +1,37 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-netdev
'{"type":"tap","fd":"3","vhost":true,"vhostfd":"44","id":"hostnet0"}'
\
+-device
'{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"fe:11:22:33:44:55","bus":"pci.0","addr":"0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args
deleted file mode 100644
index 79dd75a39d..0000000000
--- a/tests/qemuxml2argvdata/net-eth.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev tap,fd=3,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth.x86_64-latest.args
b/tests/qemuxml2argvdata/net-eth.x86_64-latest.args
new file mode 100644
index 0000000000..c7f830fd30
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-eth.x86_64-latest.args
@@ -0,0 +1,37 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-netdev
'{"type":"tap","fd":"3","id":"hostnet0"}'
\
+-device
'{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
deleted file mode 100644
index 2e23f63a86..0000000000
--- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=2 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device vfio-pci,host=0000:03:07.1,id=hostdev0,bootindex=1,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-client.args
b/tests/qemuxml2argvdata/net-hostdev-bootorder.x86_64-latest.args
similarity index 60%
rename from tests/qemuxml2argvdata/net-client.args
rename to tests/qemuxml2argvdata/net-hostdev-bootorder.x86_64-latest.args
index 3336e3fb53..d513ae5aff 100644
--- a/tests/qemuxml2argvdata/net-client.args
+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -23,14 +25,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev socket,connect=192.168.0.1:5558,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
+-device
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":2}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device
'{"driver":"vfio-pci","host":"0000:03:07.1","id":"hostdev0","bootindex":1,"bus":"pci.0","addr":"0x2"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev-fail.err
b/tests/qemuxml2argvdata/net-hostdev-fail.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/net-hostdev-fail.err
rename to tests/qemuxml2argvdata/net-hostdev-fail.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
deleted file mode 100644
index a08927b219..0000000000
--- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device vfio-pci,host=2424:21:1c.6,id=hostdev0,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.x86_64-latest.args
b/tests/qemuxml2argvdata/net-hostdev-multidomain.x86_64-latest.args
new file mode 100644
index 0000000000..cb4b415a25
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.x86_64-latest.args
@@ -0,0 +1,37 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"vfio-pci","host":"2424:21:1c.6","id":"hostdev0","bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
deleted file mode 100644
index c816221514..0000000000
--- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.x86_64-latest.args
b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.x86_64-latest.args
new file mode 100644
index 0000000000..aa98d9306a
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.x86_64-latest.args
@@ -0,0 +1,37 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-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"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args
b/tests/qemuxml2argvdata/net-hostdev-vfio.args
deleted file mode 100644
index b0e3b64504..0000000000
--- a/tests/qemuxml2argvdata/net-hostdev-vfio.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--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 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.x86_64-latest.args
b/tests/qemuxml2argvdata/net-hostdev-vfio.x86_64-latest.args
new file mode 100644
index 0000000000..bf05456345
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.x86_64-latest.args
@@ -0,0 +1,37 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-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"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev.args
b/tests/qemuxml2argvdata/net-hostdev.args
deleted file mode 100644
index ef4e7c872b..0000000000
--- a/tests/qemuxml2argvdata/net-hostdev.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device vfio-pci,host=0000:03:07.1,id=hostdev0,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev.x86_64-latest.args
b/tests/qemuxml2argvdata/net-hostdev.x86_64-latest.args
new file mode 100644
index 0000000000..8f5a476873
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-hostdev.x86_64-latest.args
@@ -0,0 +1,37 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"vfio-pci","host":"0000:03:07.1","id":"hostdev0","bus":"pci.0","addr":"0x2"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-mcast.args
b/tests/qemuxml2argvdata/net-mcast.args
deleted file mode 100644
index 4f64e6ae23..0000000000
--- a/tests/qemuxml2argvdata/net-mcast.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev socket,mcast=192.0.0.1:5558,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-mcast.x86_64-latest.args
b/tests/qemuxml2argvdata/net-mcast.x86_64-latest.args
new file mode 100644
index 0000000000..3f596dbc34
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-mcast.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-netdev
'{"type":"socket","mcast":"192.0.0.1:5558","id":"hostnet0"}'
\
+-device
'{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:8c:b9:05","bus":"pci.0","addr":"0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-server.args
b/tests/qemuxml2argvdata/net-server.args
deleted file mode 100644
index 43a6842b44..0000000000
--- a/tests/qemuxml2argvdata/net-server.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev socket,listen=192.168.0.1:5558,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-server.x86_64-latest.args
b/tests/qemuxml2argvdata/net-server.x86_64-latest.args
new file mode 100644
index 0000000000..60bb8a9201
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-server.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-netdev
'{"type":"socket","listen":"192.168.0.1:5558","id":"hostnet0"}'
\
+-device
'{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:8c:b9:05","bus":"pci.0","addr":"0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args
deleted file mode 100644
index 454ca9d75b..0000000000
--- a/tests/qemuxml2argvdata/net-udp.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev socket,udp=192.168.10.1:5555,localaddr=192.168.10.1:5556,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-udp.x86_64-latest.args
b/tests/qemuxml2argvdata/net-udp.x86_64-latest.args
new file mode 100644
index 0000000000..8a6ea654ba
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-udp.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-netdev
'{"type":"socket","udp":"192.168.10.1:5555","localaddr":"192.168.10.1:5556","id":"hostnet0"}'
\
+-device
'{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:8c:b9:05","bus":"pci.0","addr":"0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/net-user.args
deleted file mode 100644
index 12823aa1c8..0000000000
--- a/tests/qemuxml2argvdata/net-user.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev user,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-vhostuser-fail.err
b/tests/qemuxml2argvdata/net-vhostuser-fail.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/net-vhostuser-fail.err
rename to tests/qemuxml2argvdata/net-vhostuser-fail.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
deleted file mode 100644
index 34f70166d2..0000000000
--- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
+++ /dev/null
@@ -1,47 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--chardev socket,id=charnet0,path=/tmp/vhost0.sock,server=on \
--netdev vhost-user,chardev=charnet0,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x2
\
--chardev socket,id=charnet1,path=/tmp/vhost1.sock \
--netdev vhost-user,chardev=charnet1,id=hostnet1 \
--device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x3
\
--netdev socket,listen=:2015,id=hostnet2 \
--device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x4 \
--chardev socket,id=charnet3,path=/tmp/vhost2.sock,reconnect=10 \
--netdev vhost-user,chardev=charnet3,id=hostnet3 \
--device virtio-net-pci,netdev=hostnet3,id=net3,mac=52:54:00:ee:96:6d,bus=pci.0,addr=0x5
\
--chardev socket,id=charnet4,path=/tmp/vhost3.sock,reconnect=0 \
--netdev vhost-user,chardev=charnet4,queues=4,id=hostnet4 \
--device
virtio-net-pci,mq=on,vectors=10,netdev=hostnet4,id=net4,mac=52:54:00:ee:96:6e,bus=pci.0,addr=0x6
\
--audiodev
'{"id":"audio1","driver":"none"}' \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.x86_64-latest.args
b/tests/qemuxml2argvdata/net-vhostuser-multiq.x86_64-latest.args
new file mode 100644
index 0000000000..7a02434f23
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.x86_64-latest.args
@@ -0,0 +1,49 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-chardev socket,id=charnet0,path=/tmp/vhost0.sock,server=on \
+-netdev
'{"type":"vhost-user","chardev":"charnet0","id":"hostnet0"}'
\
+-device
'{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:ee:96:6b","bus":"pci.0","addr":"0x2"}'
\
+-chardev socket,id=charnet1,path=/tmp/vhost1.sock \
+-netdev
'{"type":"vhost-user","chardev":"charnet1","id":"hostnet1"}'
\
+-device
'{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":"52:54:00:ee:96:6c","bus":"pci.0","addr":"0x3"}'
\
+-netdev
'{"type":"socket","listen":":2015","id":"hostnet2"}'
\
+-device
'{"driver":"rtl8139","netdev":"hostnet2","id":"net2","mac":"52:54:00:95:db:c0","bus":"pci.0","addr":"0x4"}'
\
+-chardev socket,id=charnet3,path=/tmp/vhost2.sock,reconnect=10 \
+-netdev
'{"type":"vhost-user","chardev":"charnet3","id":"hostnet3"}'
\
+-device
'{"driver":"virtio-net-pci","netdev":"hostnet3","id":"net3","mac":"52:54:00:ee:96:6d","bus":"pci.0","addr":"0x5"}'
\
+-chardev socket,id=charnet4,path=/tmp/vhost3.sock,reconnect=0 \
+-netdev
'{"type":"vhost-user","chardev":"charnet4","queues":4,"id":"hostnet4"}'
\
+-device
'{"driver":"virtio-net-pci","mq":true,"vectors":10,"netdev":"hostnet4","id":"net4","mac":"52:54:00:ee:96:6e","bus":"pci.0","addr":"0x6"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-vhostuser.args
b/tests/qemuxml2argvdata/net-vhostuser.args
deleted file mode 100644
index 3f144d0132..0000000000
--- a/tests/qemuxml2argvdata/net-vhostuser.args
+++ /dev/null
@@ -1,38 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--chardev socket,id=charnet0,path=/tmp/vhost0.sock,server=on \
--netdev vhost-user,chardev=charnet0,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x2
\
--chardev socket,id=charnet1,path=/tmp/vhost1.sock \
--netdev vhost-user,chardev=charnet1,id=hostnet1 \
--device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x3
\
--netdev socket,listen=:2015,id=hostnet2 \
--device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x4 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-device.args
b/tests/qemuxml2argvdata/net-virtio-device.args
deleted file mode 100644
index e6d9236470..0000000000
--- a/tests/qemuxml2argvdata/net-virtio-device.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev user,id=hostnet0 \
--device
virtio-net-pci,tx=bh,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-device.x86_64-latest.args
b/tests/qemuxml2argvdata/net-virtio-device.x86_64-latest.args
new file mode 100644
index 0000000000..c8fc920b97
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-virtio-device.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"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","tx":"bh","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
b/tests/qemuxml2argvdata/net-virtio-disable-offloads.x86_64-latest.args
similarity index 50%
rename from tests/qemuxml2argvdata/net-virtio-disable-offloads.args
rename to tests/qemuxml2argvdata/net-virtio-disable-offloads.x86_64-latest.args
index d9f43a0142..4050ce8c08 100644
--- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
+++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -23,14 +25,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest7","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,csum=off,gso=off,host_tso4=off,host_tso6=off,host_ecn=off,host_ufo=off,mrg_rxbuf=off,guest_csum=off,guest_tso4=off,guest_tso6=off,guest_ecn=off,guest_ufo=off,netdev=hostnet0,id=net0,mac=00:22:44:66:88:aa,bus=pci.0,addr=0x2
\
+-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","csum":false,"gso":false,"host_tso4":false,"host_tso6":false,"host_ecn":false,"host_ufo":false,"mrg_rxbuf":false,"guest_csum":false,"guest_tso4":false,"guest_tso6":false,"guest_ecn":false,"guest_ufo":false,"netdev":"hostnet0","id":"net0","mac":"00:22:44:66:88:aa","bus":"pci.0","addr":"0x2"}'
\
-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"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args
b/tests/qemuxml2argvdata/net-virtio-netdev.args
deleted file mode 100644
index e0c876e239..0000000000
--- a/tests/qemuxml2argvdata/net-virtio-netdev.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev user,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2
\
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.x86_64-latest.args
b/tests/qemuxml2argvdata/net-virtio-netdev.x86_64-latest.args
new file mode 100644
index 0000000000..9c468be055
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-virtio-netdev.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"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":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.err
b/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.err
rename to tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
deleted file mode 100644
index cecbf674cc..0000000000
--- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev user,id=hostnet0 \
--device
virtio-net-pci,rx_queue_size=512,tx_queue_size=1024,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2
\
--audiodev
'{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.x86_64-latest.args
b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.x86_64-latest.args
new file mode 100644
index 0000000000..6da39afcae
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"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","rx_queue_size":512,"tx_queue_size":1024,"netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
deleted file mode 100644
index 3e0aaca8df..0000000000
--- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
+++ /dev/null
@@ -1,40 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev user,id=hostua-backup0 \
--device
virtio-net-pci,failover=on,netdev=hostua-backup0,id=ua-backup0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3
\
--netdev user,id=hostua-backup1 \
--device
virtio-net-pci,failover=on,netdev=hostua-backup1,id=ua-backup1,mac=66:44:33:22:11:00,bus=pci.0,addr=0x4
\
--audiodev
'{"id":"audio1","driver":"none"}' \
--device
vfio-pci,host=0000:03:07.1,id=hostdev0,failover_pair_id=ua-backup0,bus=pci.0,addr=0x5 \
--device
vfio-pci,host=0000:03:07.2,id=hostdev1,failover_pair_id=ua-backup1,bus=pci.0,addr=0x6 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.x86_64-latest.args
b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.x86_64-latest.args
new file mode 100644
index 0000000000..517a6cea6e
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.x86_64-latest.args
@@ -0,0 +1,42 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-netdev
'{"type":"user","id":"hostua-backup0"}' \
+-device
'{"driver":"virtio-net-pci","failover":true,"netdev":"hostua-backup0","id":"ua-backup0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x3"}'
\
+-netdev
'{"type":"user","id":"hostua-backup1"}' \
+-device
'{"driver":"virtio-net-pci","failover":true,"netdev":"hostua-backup1","id":"ua-backup1","mac":"66:44:33:22:11:00","bus":"pci.0","addr":"0x4"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"vfio-pci","host":"0000:03:07.1","id":"hostdev0","failover_pair_id":"ua-backup0","bus":"pci.0","addr":"0x5"}'
\
+-device
'{"driver":"vfio-pci","host":"0000:03:07.2","id":"hostdev1","failover_pair_id":"ua-backup1","bus":"pci.0","addr":"0x6"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x7"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args
b/tests/qemuxml2argvdata/net-virtio-teaming.args
deleted file mode 100644
index 15dae0e779..0000000000
--- a/tests/qemuxml2argvdata/net-virtio-teaming.args
+++ /dev/null
@@ -1,40 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev user,id=hostua-backup0 \
--device
virtio-net-pci,failover=on,netdev=hostua-backup0,id=ua-backup0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2
\
--netdev user,id=hostua-backup1 \
--device
virtio-net-pci,failover=on,netdev=hostua-backup1,id=ua-backup1,mac=66:44:33:22:11:00,bus=pci.0,addr=0x3
\
--audiodev
'{"id":"audio1","driver":"none"}' \
--device
vfio-pci,host=0000:03:07.1,id=hostdev0,failover_pair_id=ua-backup0,bus=pci.0,addr=0x4 \
--device
vfio-pci,host=0000:03:07.2,id=hostdev1,failover_pair_id=ua-backup1,bus=pci.0,addr=0x5 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.x86_64-latest.args
b/tests/qemuxml2argvdata/net-virtio-teaming.x86_64-latest.args
new file mode 100644
index 0000000000..459ab20f67
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-virtio-teaming.x86_64-latest.args
@@ -0,0 +1,42 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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
'{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}'
\
+-netdev
'{"type":"user","id":"hostua-backup0"}' \
+-device
'{"driver":"virtio-net-pci","failover":true,"netdev":"hostua-backup0","id":"ua-backup0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}'
\
+-netdev
'{"type":"user","id":"hostua-backup1"}' \
+-device
'{"driver":"virtio-net-pci","failover":true,"netdev":"hostua-backup1","id":"ua-backup1","mac":"66:44:33:22:11:00","bus":"pci.0","addr":"0x3"}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"vfio-pci","host":"0000:03:07.1","id":"hostdev0","failover_pair_id":"ua-backup0","bus":"pci.0","addr":"0x4"}'
\
+-device
'{"driver":"vfio-pci","host":"0000:03:07.2","id":"hostdev1","failover_pair_id":"ua-backup1","bus":"pci.0","addr":"0x5"}'
\
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio.args
b/tests/qemuxml2argvdata/net-virtio.args
deleted file mode 100644
index 064b7fffe9..0000000000
--- a/tests/qemuxml2argvdata/net-virtio.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
--blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}'
\
--device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev user,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2
\
--audiodev
'{"id":"audio1","driver":"none"}' \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args
b/tests/qemuxml2argvdata/net-virtio.x86_64-latest.args
similarity index 58%
rename from tests/qemuxml2argvdata/net-eth-hostip.args
rename to tests/qemuxml2argvdata/net-virtio.x86_64-latest.args
index 79dd75a39d..5db6ae348b 100644
--- a/tests/qemuxml2argvdata/net-eth-hostip.args
+++ b/tests/qemuxml2argvdata/net-virtio.x86_64-latest.args
@@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object
secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,usb=off,dump-guest-core=off \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
+-cpu qemu64 \
-m size=219136k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -23,13 +25,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--no-acpi \
-boot strict=on \
--usb \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","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,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
--netdev tap,fd=3,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-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":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}'
\
-audiodev
'{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 76c4c1ea6d..1a03cfa8d5 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1364,47 +1364,44 @@ mymain(void)
DO_TEST_CAPS_VER("misc-no-reboot", "5.2.0");
DO_TEST_CAPS_LATEST("misc-no-reboot");
DO_TEST_NOCAPS("misc-uuid");
+
DO_TEST_PARSE_ERROR_NOCAPS("vhost_queues-invalid");
- DO_TEST_NOCAPS("net-vhostuser");
+
DO_TEST_CAPS_LATEST("net-vhostuser");
- DO_TEST_NOCAPS("net-vhostuser-multiq");
- DO_TEST_FAILURE_NOCAPS("net-vhostuser-fail");
- DO_TEST_NOCAPS("net-user");
+ DO_TEST_CAPS_LATEST("net-vhostuser");
+ DO_TEST_CAPS_LATEST("net-vhostuser-multiq");
+ DO_TEST_CAPS_LATEST_FAILURE("net-vhostuser-fail");
+ DO_TEST_CAPS_LATEST("net-user");
DO_TEST_CAPS_ARCH_LATEST_FULL("net-user", "x86_64", ARG_FLAGS,
FLAG_SLIRP_HELPER);
DO_TEST_CAPS_LATEST("net-user-addr");
DO_TEST_CAPS_LATEST("net-user-passt");
DO_TEST_CAPS_VER("net-user-passt", "7.2.0");
DO_TEST_CAPS_LATEST_PARSE_ERROR("net-user-slirp-portforward");
- DO_TEST_NOCAPS("net-virtio");
- DO_TEST_NOCAPS("net-virtio-device");
- DO_TEST_NOCAPS("net-virtio-disable-offloads");
- DO_TEST_NOCAPS("net-virtio-netdev");
+ DO_TEST_CAPS_LATEST("net-virtio");
+ DO_TEST_CAPS_LATEST("net-virtio-device");
+ DO_TEST_CAPS_LATEST("net-virtio-disable-offloads");
+ DO_TEST_CAPS_LATEST("net-virtio-netdev");
DO_TEST_CAPS_ARCH_LATEST("net-virtio-ccw", "s390x");
- DO_TEST_NOCAPS("net-virtio-rxtxqueuesize");
- DO_TEST_PARSE_ERROR_NOCAPS("net-virtio-rxqueuesize-invalid-size");
- DO_TEST("net-virtio-teaming",
- QEMU_CAPS_DEVICE_VFIO_PCI);
- DO_TEST("net-virtio-teaming-hostdev",
- QEMU_CAPS_DEVICE_VFIO_PCI);
- DO_TEST_NOCAPS("net-eth");
- DO_TEST_NOCAPS("net-eth-ifname");
- DO_TEST_NOCAPS("net-eth-names");
- DO_TEST_NOCAPS("net-eth-hostip");
- DO_TEST_NOCAPS("net-eth-unmanaged-tap");
- DO_TEST_NOCAPS("net-client");
- DO_TEST_NOCAPS("net-server");
+ DO_TEST_CAPS_LATEST("net-virtio-rxtxqueuesize");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("net-virtio-rxqueuesize-invalid-size");
+ DO_TEST_CAPS_LATEST("net-virtio-teaming");
+ DO_TEST_CAPS_LATEST("net-virtio-teaming-hostdev");
+ DO_TEST_CAPS_LATEST("net-eth");
+ DO_TEST_CAPS_LATEST("net-eth-ifname");
+ DO_TEST_CAPS_LATEST("net-eth-names");
+ DO_TEST_CAPS_LATEST("net-eth-hostip");
+ DO_TEST_CAPS_LATEST("net-eth-unmanaged-tap");
+ DO_TEST_CAPS_LATEST("net-client");
+ DO_TEST_CAPS_LATEST("net-server");
DO_TEST_CAPS_LATEST("net-many-models");
- DO_TEST_NOCAPS("net-mcast");
- DO_TEST_NOCAPS("net-udp");
- DO_TEST("net-hostdev", QEMU_CAPS_DEVICE_VFIO_PCI);
- DO_TEST("net-hostdev-bootorder", QEMU_CAPS_DEVICE_VFIO_PCI);
- DO_TEST("net-hostdev-multidomain", QEMU_CAPS_DEVICE_VFIO_PCI);
- DO_TEST("net-hostdev-vfio",
- QEMU_CAPS_DEVICE_VFIO_PCI);
- DO_TEST("net-hostdev-vfio-multidomain",
- QEMU_CAPS_DEVICE_VFIO_PCI);
- DO_TEST_FAILURE("net-hostdev-fail",
- QEMU_CAPS_DEVICE_VFIO_PCI);
+ DO_TEST_CAPS_LATEST("net-mcast");
+ DO_TEST_CAPS_LATEST("net-udp");
+ DO_TEST_CAPS_LATEST("net-hostdev");
+ DO_TEST_CAPS_LATEST("net-hostdev-bootorder");
+ DO_TEST_CAPS_LATEST("net-hostdev-multidomain");
+ DO_TEST_CAPS_LATEST("net-hostdev-vfio");
+ DO_TEST_CAPS_LATEST("net-hostdev-vfio-multidomain");
+ DO_TEST_CAPS_LATEST_FAILURE("net-hostdev-fail");
DO_TEST_CAPS_LATEST("net-vdpa");
DO_TEST_CAPS_LATEST("net-vdpa-multiqueue");
DO_TEST_CAPS_LATEST("net-virtio-rss");
--
2.41.0
8:15 a.m.
New subject: [PATCH 22/24] qemuxml2argvtest: Modernize 'net-*'
On a Thursday in 2023, Peter Krempa wrote:
Convert all tests using fake capabilities to use DO_TEST_CAPS_LATEST.
Note that rename detection in git didn't work too well here and the
files may not correspond.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../net-client.x86_64-latest.args | 38 ++++++++++++
...args => net-eth-hostip.x86_64-latest.args} | 16 ++---
...args => net-eth-ifname.x86_64-latest.args} | 19 +++---
.../net-eth-names.x86_64-latest.args | 40 ++++++++++++
.../net-eth-unmanaged-tap.args | 35 -----------
.../net-eth-unmanaged-tap.x86_64-latest.args | 37 +++++++++++
tests/qemuxml2argvdata/net-eth.args | 35 -----------
.../net-eth.x86_64-latest.args | 37 +++++++++++
.../net-hostdev-bootorder.args | 34 -----------
... net-hostdev-bootorder.x86_64-latest.args} | 16 ++---
...err => net-hostdev-fail.x86_64-latest.err} | 0
.../net-hostdev-multidomain.args | 35 -----------
...net-hostdev-multidomain.x86_64-latest.args | 37 +++++++++++
.../net-hostdev-vfio-multidomain.args | 35 -----------
...ostdev-vfio-multidomain.x86_64-latest.args | 37 +++++++++++
tests/qemuxml2argvdata/net-hostdev-vfio.args | 35 -----------
.../net-hostdev-vfio.x86_64-latest.args | 37 +++++++++++
tests/qemuxml2argvdata/net-hostdev.args | 35 -----------
.../net-hostdev.x86_64-latest.args | 37 +++++++++++
tests/qemuxml2argvdata/net-mcast.args | 36 -----------
.../net-mcast.x86_64-latest.args | 38 ++++++++++++
tests/qemuxml2argvdata/net-server.args | 36 -----------
.../net-server.x86_64-latest.args | 38 ++++++++++++
tests/qemuxml2argvdata/net-udp.args | 36 -----------
.../net-udp.x86_64-latest.args | 38 ++++++++++++
tests/qemuxml2argvdata/net-user.args | 35 -----------
...r => net-vhostuser-fail.x86_64-latest.err} | 0
.../net-vhostuser-multiq.args | 47 --------------
.../net-vhostuser-multiq.x86_64-latest.args | 49 +++++++++++++++
tests/qemuxml2argvdata/net-vhostuser.args | 38 ------------
tests/qemuxml2argvdata/net-virtio-device.args | 36 -----------
.../net-virtio-device.x86_64-latest.args | 38 ++++++++++++
...irtio-disable-offloads.x86_64-latest.args} | 18 +++---
tests/qemuxml2argvdata/net-virtio-netdev.args | 36 -----------
.../net-virtio-netdev.x86_64-latest.args | 38 ++++++++++++
...xqueuesize-invalid-size.x86_64-latest.err} | 0
.../net-virtio-rxtxqueuesize.args | 36 -----------
...et-virtio-rxtxqueuesize.x86_64-latest.args | 38 ++++++++++++
.../net-virtio-teaming-hostdev.args | 40 ------------
...-virtio-teaming-hostdev.x86_64-latest.args | 42 +++++++++++++
.../qemuxml2argvdata/net-virtio-teaming.args | 40 ------------
.../net-virtio-teaming.x86_64-latest.args | 42 +++++++++++++
tests/qemuxml2argvdata/net-virtio.args | 35 -----------
...tip.args => net-virtio.x86_64-latest.args} | 16 ++---
tests/qemuxml2argvtest.c | 61 +++++++++----------
45 files changed, 735 insertions(+), 767 deletions(-)
create mode 100644 tests/qemuxml2argvdata/net-client.x86_64-latest.args
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 23/24] qemuxml2xmltest: Modernize all 'net-' tests
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../net-virtio-teaming-hostdev.xml | 5 ++++-
...th.xml => net-bandwidth.x86_64-latest.xml} | 5 ++++-
...2.xml => net-bandwidth2.x86_64-latest.xml} | 5 ++++-
...xml => net-hostdev-vfio.x86_64-latest.xml} | 5 ++++-
tests/qemuxml2xmloutdata/net-user-passt.xml | 1 -
... => net-vdpa-multiqueue.x86_64-latest.xml} | 5 ++++-
...et-vdpa.xml => net-vdpa.x86_64-latest.xml} | 5 ++++-
...-virtio-teaming-hostdev.x86_64-latest.xml} | 0
...-virtio-teaming-network.x86_64-latest.xml} | 5 ++++-
...l => net-virtio-teaming.x86_64-latest.xml} | 5 ++++-
tests/qemuxml2xmltest.c | 19 ++++++++-----------
11 files changed, 40 insertions(+), 20 deletions(-)
rename tests/qemuxml2xmloutdata/{net-bandwidth.xml => net-bandwidth.x86_64-latest.xml}
(94%)
rename tests/qemuxml2xmloutdata/{net-bandwidth2.xml =>
net-bandwidth2.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{net-hostdev-vfio.xml =>
net-hostdev-vfio.x86_64-latest.xml} (92%)
delete mode 120000 tests/qemuxml2xmloutdata/net-user-passt.xml
rename tests/qemuxml2xmloutdata/{net-vdpa-multiqueue.xml =>
net-vdpa-multiqueue.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{net-vdpa.xml => net-vdpa.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{net-virtio-teaming-hostdev.xml =>
net-virtio-teaming-hostdev.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{net-virtio-teaming-network.xml =>
net-virtio-teaming-network.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{net-virtio-teaming.xml =>
net-virtio-teaming.x86_64-latest.xml} (94%)
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml
b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml
index 46171ddf09..0df38ec42d 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml
+++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/net-bandwidth.xml
b/tests/qemuxml2xmloutdata/net-bandwidth.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/net-bandwidth.xml
rename to tests/qemuxml2xmloutdata/net-bandwidth.x86_64-latest.xml
index 7d5c552202..7d634d8940 100644
--- a/tests/qemuxml2xmloutdata/net-bandwidth.xml
+++ b/tests/qemuxml2xmloutdata/net-bandwidth.x86_64-latest.xml
@@ -15,6 +15,9 @@
<apic/>
<pae/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -34,7 +37,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-bandwidth2.xml
b/tests/qemuxml2xmloutdata/net-bandwidth2.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/net-bandwidth2.xml
rename to tests/qemuxml2xmloutdata/net-bandwidth2.x86_64-latest.xml
index 7d5209a64a..9ec0172dfc 100644
--- a/tests/qemuxml2xmloutdata/net-bandwidth2.xml
+++ b/tests/qemuxml2xmloutdata/net-bandwidth2.x86_64-latest.xml
@@ -15,6 +15,9 @@
<apic/>
<pae/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -27,7 +30,7 @@
<target dev='vda' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='virtio-serial' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
b/tests/qemuxml2xmloutdata/net-hostdev-vfio.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
rename to tests/qemuxml2xmloutdata/net-hostdev-vfio.x86_64-latest.xml
index 5d9696afd5..167e1b1fea 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev-vfio.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-user-passt.xml
b/tests/qemuxml2xmloutdata/net-user-passt.xml
deleted file mode 120000
index cfbc023ada..0000000000
--- a/tests/qemuxml2xmloutdata/net-user-passt.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/net-user-passt.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/net-vdpa-multiqueue.xml
b/tests/qemuxml2xmloutdata/net-vdpa-multiqueue.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/net-vdpa-multiqueue.xml
rename to tests/qemuxml2xmloutdata/net-vdpa-multiqueue.x86_64-latest.xml
index 0876d5df62..71d171764d 100644
--- a/tests/qemuxml2xmloutdata/net-vdpa-multiqueue.xml
+++ b/tests/qemuxml2xmloutdata/net-vdpa-multiqueue.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-vdpa.xml
b/tests/qemuxml2xmloutdata/net-vdpa.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/net-vdpa.xml
rename to tests/qemuxml2xmloutdata/net-vdpa.x86_64-latest.xml
index 0c7ff151d7..407b25de40 100644
--- a/tests/qemuxml2xmloutdata/net-vdpa.xml
+++ b/tests/qemuxml2xmloutdata/net-vdpa.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming-hostdev.xml
b/tests/qemuxml2xmloutdata/net-virtio-teaming-hostdev.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-virtio-teaming-hostdev.xml
rename to tests/qemuxml2xmloutdata/net-virtio-teaming-hostdev.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
b/tests/qemuxml2xmloutdata/net-virtio-teaming-network.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
rename to tests/qemuxml2xmloutdata/net-virtio-teaming-network.x86_64-latest.xml
index 99da3de48b..dcb2339035 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-teaming-network.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
b/tests/qemuxml2xmloutdata/net-virtio-teaming.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/net-virtio-teaming.xml
rename to tests/qemuxml2xmloutdata/net-virtio-teaming.x86_64-latest.xml
index 05a1dd1d2f..0c744f795c 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-teaming.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 172d19ecfd..6b412abfd9 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -423,28 +423,25 @@ mymain(void)
DO_TEST_CAPS_LATEST("net-eth-unmanaged-tap");
DO_TEST_CAPS_LATEST("net-virtio-network-portgroup");
DO_TEST_CAPS_LATEST("net-virtio-rxtxqueuesize");
- DO_TEST("net-virtio-teaming",
- QEMU_CAPS_DEVICE_VFIO_PCI);
- DO_TEST("net-virtio-teaming-network",
- QEMU_CAPS_DEVICE_VFIO_PCI);
- DO_TEST("net-virtio-teaming-hostdev",
- QEMU_CAPS_DEVICE_VFIO_PCI);
+ DO_TEST_CAPS_LATEST("net-virtio-teaming");
+ DO_TEST_CAPS_LATEST("net-virtio-teaming-network");
+ DO_TEST_CAPS_LATEST("net-virtio-teaming-hostdev");
DO_TEST_CAPS_LATEST("net-isolated-port");
DO_TEST_CAPS_LATEST("net-hostdev");
DO_TEST_CAPS_LATEST("net-hostdev-bootorder");
- DO_TEST("net-hostdev-vfio", QEMU_CAPS_DEVICE_VFIO_PCI);
+ DO_TEST_CAPS_LATEST("net-hostdev-vfio");
DO_TEST_CAPS_LATEST("net-midonet");
DO_TEST_CAPS_LATEST("net-openvswitch");
DO_TEST_CAPS_LATEST("sound-device");
DO_TEST_CAPS_LATEST("watchdog");
DO_TEST_CAPS_LATEST("watchdog-q35-multiple");
- DO_TEST("net-bandwidth", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_VNC);
- DO_TEST("net-bandwidth2", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_VNC);
+ DO_TEST_CAPS_LATEST("net-bandwidth");
+ DO_TEST_CAPS_LATEST("net-bandwidth2");
DO_TEST_CAPS_LATEST("net-mtu");
DO_TEST_CAPS_LATEST("net-coalesce");
DO_TEST_CAPS_LATEST("net-many-models");
- DO_TEST("net-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA);
- DO_TEST("net-vdpa-multiqueue", QEMU_CAPS_NETDEV_VHOST_VDPA);
+ DO_TEST_CAPS_LATEST("net-vdpa");
+ DO_TEST_CAPS_LATEST("net-vdpa-multiqueue");
DO_TEST_CAPS_LATEST("net-virtio-rss");
DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev");
--
2.41.0
8:15 a.m.
New subject: [PATCH 23/24] qemuxml2xmltest: Modernize all 'net-' tests
On a Thursday in 2023, Peter Krempa wrote:
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../net-virtio-teaming-hostdev.xml | 5 ++++-
...th.xml => net-bandwidth.x86_64-latest.xml} | 5 ++++-
...2.xml => net-bandwidth2.x86_64-latest.xml} | 5 ++++-
...xml => net-hostdev-vfio.x86_64-latest.xml} | 5 ++++-
tests/qemuxml2xmloutdata/net-user-passt.xml | 1 -
... => net-vdpa-multiqueue.x86_64-latest.xml} | 5 ++++-
...et-vdpa.xml => net-vdpa.x86_64-latest.xml} | 5 ++++-
...-virtio-teaming-hostdev.x86_64-latest.xml} | 0
...-virtio-teaming-network.x86_64-latest.xml} | 5 ++++-
...l => net-virtio-teaming.x86_64-latest.xml} | 5 ++++-
tests/qemuxml2xmltest.c | 19 ++++++++-----------
11 files changed, 40 insertions(+), 20 deletions(-)
rename tests/qemuxml2xmloutdata/{net-bandwidth.xml => net-bandwidth.x86_64-latest.xml}
(94%)
rename tests/qemuxml2xmloutdata/{net-bandwidth2.xml =>
net-bandwidth2.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{net-hostdev-vfio.xml =>
net-hostdev-vfio.x86_64-latest.xml} (92%)
delete mode 120000 tests/qemuxml2xmloutdata/net-user-passt.xml
rename tests/qemuxml2xmloutdata/{net-vdpa-multiqueue.xml =>
net-vdpa-multiqueue.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{net-vdpa.xml => net-vdpa.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{net-virtio-teaming-hostdev.xml =>
net-virtio-teaming-hostdev.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{net-virtio-teaming-network.xml =>
net-virtio-teaming-network.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{net-virtio-teaming.xml =>
net-virtio-teaming.x86_64-latest.xml} (94%)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:41 a.m.
New subject: [PATCH 24/24] qemuxml2xmltest: Modernize all remaining fake capability tests
Convert all cases using DO_TEST() to use DO_TEST_CAPS_LATEST() and
remove DO_TEST() to prevent further use.
Most of the changes are related to CPU being present in the output XML.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/boot-floppy-q35.xml | 16 +
.../disk-virtio-scsi-reservations.xml | 5 +-
.../memory-hotplug-nvdimm-access.xml | 5 +-
.../memory-hotplug-nvdimm-align.xml | 5 +-
.../memory-hotplug-nvdimm-label.xml | 5 +-
.../memory-hotplug-nvdimm-pmem.xml | 5 +-
.../memory-hotplug-nvdimm-readonly.xml | 5 +-
.../memory-hotplug-nvdimm.xml | 5 +-
tests/qemuxml2argvdata/numatune-hmat.xml | 5 +-
...oindex.xml => autoindex.x86_64-latest.xml} | 5 +-
....xml => boot-floppy-q35.x86_64-latest.xml} | 0
...el.xml => chardev-label.x86_64-latest.xml} | 5 +-
...up.xml => clock-catchup.x86_64-latest.xml} | 5 +-
... controller-virtio-scsi.x86_64-latest.xml} | 5 +-
...=> disk-cdrom-bus-other.x86_64-latest.xml} | 5 +-
...l => disk-network-iscsi.x86_64-latest.xml} | 5 +-
...> disk-scsi-device-auto.x86_64-latest.xml} | 5 +-
...l => disk-scsi-disk-vpd.x86_64-latest.xml} | 5 +-
....xml => disk-usb-device.x86_64-latest.xml} | 5 +-
...irtio-scsi-reservations.x86_64-latest.xml} | 0
...egl-headless-rendernode.x86_64-latest.xml} | 5 +-
...graphics-listen-network.x86_64-latest.xml} | 5 +-
...raphics-listen-network2.x86_64-latest.xml} | 5 +-
...graphics-sdl-fullscreen.x86_64-latest.xml} | 5 +-
...sdl.xml => graphics-sdl.x86_64-latest.xml} | 5 +-
...ics-vnc-auto-socket-cfg.x86_64-latest.xml} | 5 +-
...raphics-vnc-auto-socket.x86_64-latest.xml} | 5 +-
...aphics-vnc-egl-headless.x86_64-latest.xml} | 5 +-
...hics-vnc-no-listen-attr.x86_64-latest.xml} | 5 +-
...generated-socket-active.x86_64-latest.xml} | 5 +-
...nerated-socket-inactive.x86_64-latest.xml} | 5 +-
...ml => graphics-vnc-sasl.x86_64-latest.xml} | 5 +-
... => graphics-vnc-socket.x86_64-latest.xml} | 5 +-
...xml => graphics-vnc-tls.x86_64-latest.xml} | 5 +-
... graphics-vnc-websocket.x86_64-latest.xml} | 5 +-
...vnc.xml => graphics-vnc.x86_64-latest.xml} | 5 +-
...=> hostdev-mdev-display.x86_64-latest.xml} | 5 +-
...hostdev-mdev-precreated.x86_64-latest.xml} | 7 +-
...-pci-address-unassigned.x86_64-latest.xml} | 5 +-
...stdev-pci-multifunction.x86_64-latest.xml} | 5 +-
...ev-scsi-autogen-address.x86_64-latest.xml} | 5 +-
...hostdev-scsi-large-unit.x86_64-latest.xml} | 5 +-
...xml => hostdev-scsi-lsi.x86_64-latest.xml} | 5 +-
... hostdev-scsi-shareable.x86_64-latest.xml} | 5 +-
...dev-scsi-vhost-scsi-pci.x86_64-latest.xml} | 5 +-
...ostdev-scsi-virtio-scsi.x86_64-latest.xml} | 5 +-
...fio.xml => hostdev-vfio.x86_64-latest.xml} | 5 +-
... => memory-hotplug-dimm.x86_64-latest.xml} | 5 +-
...y-hotplug-nvdimm-access.x86_64-latest.xml} | 0
...ry-hotplug-nvdimm-align.x86_64-latest.xml} | 0
...ry-hotplug-nvdimm-label.x86_64-latest.xml} | 0
...ory-hotplug-nvdimm-pmem.x86_64-latest.xml} | 0
...hotplug-nvdimm-readonly.x86_64-latest.xml} | 0
...> memory-hotplug-nvdimm.x86_64-latest.xml} | 0
....xml => misc-disable-s3.x86_64-latest.xml} | 5 +-
...> misc-disable-suspends.x86_64-latest.xml} | 5 +-
...4.xml => misc-enable-s4.x86_64-latest.xml} | 5 +-
...at.xml => numatune-hmat.x86_64-latest.xml} | 0
...ble.xml => panic-double.x86_64-latest.xml} | 5 +-
...xml => panic-no-address.x86_64-latest.xml} | 5 +-
.../{panic.xml => panic.x86_64-latest.xml} | 5 +-
...xml => pci-autoadd-addr.x86_64-latest.xml} | 5 +-
....xml => pci-autoadd-idx.x86_64-latest.xml} | 5 +-
...ml => pci-autofill-addr.x86_64-latest.xml} | 5 +-
...> pci-bridge-many-disks.x86_64-latest.xml} | 5 +-
...ridge.xml => pci-bridge.x86_64-latest.xml} | 5 +-
...xml => pci-expander-bus.x86_64-latest.xml} | 3 +-
...ci-many.xml => pci-many.x86_64-latest.xml} | 5 +-
...ml => pcie-expander-bus.x86_64-latest.xml} | 13 +-
...root-port-model-generic.x86_64-latest.xml} | 6 +
...root-port-model-ioh3420.x86_64-latest.xml} | 8 +-
...t.xml => pcie-root-port.x86_64-latest.xml} | 8 +-
.../pcie-root.x86_64-latest.xml | 43 +++
tests/qemuxml2xmloutdata/pcie-root.xml | 27 --
...-switch-downstream-port.x86_64-latest.xml} | 8 +-
...cie-switch-upstream-port.x86_64-latest.xml | 66 ++++
...35.xml => pcihole64-q35.x86_64-latest.xml} | 31 +-
tests/qemuxml2xmloutdata/pcihole64-q35.xml | 39 --
...> q35-pci-force-address.x86_64-latest.xml} | 5 +-
...i.xml => q35-usb2-multi.x86_64-latest.xml} | 3 +
...xml => q35-usb2-reorder.x86_64-latest.xml} | 3 +
...35-usb2.xml => q35-usb2.x86_64-latest.xml} | 3 +
...pstream-port.xml => q35.x86_64-latest.xml} | 24 +-
...xml => serial-spiceport.x86_64-latest.xml} | 5 +-
...=> smartcard-controller.x86_64-latest.xml} | 7 +-
...t-certificates-database.x86_64-latest.xml} | 5 +-
...tcard-host-certificates.x86_64-latest.xml} | 5 +-
...r.xml => smartcard-host.x86_64-latest.xml} | 7 +-
...rd-passthrough-spicevmc.x86_64-latest.xml} | 5 +-
...artcard-passthrough-tcp.x86_64-latest.xml} | 5 +-
...-controller-default-q35.x86_64-latest.xml} | 3 +
...controller-explicit-q35.x86_64-latest.xml} | 3 +
...=> usb-piix3-controller.x86_64-latest.xml} | 3 +
...xml => usb-port-missing.x86_64-latest.xml} | 5 +-
...sb-redir-filter-version.x86_64-latest.xml} | 5 +-
...xml => usb-redir-filter.x86_64-latest.xml} | 3 +
...-redir.xml => usb-redir.x86_64-latest.xml} | 3 +
...irtio-input-passthrough.x86_64-latest.xml} | 5 +-
...put.xml => virtio-input.x86_64-latest.xml} | 5 +-
...d.xml => virtio-rng-egd.x86_64-latest.xml} | 5 +-
...ml => virtio-rng-random.x86_64-latest.xml} | 5 +-
...einfo.xml => vmcoreinfo.x86_64-latest.xml} | 5 +-
tests/qemuxml2xmltest.c | 355 +++++-------------
103 files changed, 595 insertions(+), 442 deletions(-)
rename tests/qemuxml2xmloutdata/{autoindex.xml => autoindex.x86_64-latest.xml} (98%)
rename tests/qemuxml2xmloutdata/{boot-floppy-q35.xml =>
boot-floppy-q35.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{chardev-label.xml => chardev-label.x86_64-latest.xml}
(92%)
rename tests/qemuxml2xmloutdata/{clock-catchup.xml => clock-catchup.x86_64-latest.xml}
(90%)
rename tests/qemuxml2xmloutdata/{controller-virtio-scsi.xml =>
controller-virtio-scsi.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{disk-cdrom-bus-other.xml =>
disk-cdrom-bus-other.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{disk-network-iscsi.xml =>
disk-network-iscsi.x86_64-latest.xml} (96%)
rename tests/qemuxml2xmloutdata/{disk-scsi-device-auto.xml =>
disk-scsi-device-auto.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{disk-scsi-disk-vpd.xml =>
disk-scsi-disk-vpd.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{disk-usb-device.xml =>
disk-usb-device.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{disk-virtio-scsi-reservations.xml =>
disk-virtio-scsi-reservations.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{graphics-egl-headless-rendernode.xml =>
graphics-egl-headless-rendernode.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{graphics-listen-network.xml =>
graphics-listen-network.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{graphics-listen-network2.xml =>
graphics-listen-network2.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{graphics-sdl-fullscreen.xml =>
graphics-sdl-fullscreen.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{graphics-sdl.xml => graphics-sdl.x86_64-latest.xml}
(89%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-remove-generated-socket-inactive.xml =>
graphics-vnc-auto-socket-cfg.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-auto-socket.xml =>
graphics-vnc-auto-socket.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-egl-headless.xml =>
graphics-vnc-egl-headless.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-no-listen-attr.xml =>
graphics-vnc-no-listen-attr.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-remove-generated-socket-active.xml =>
graphics-vnc-remove-generated-socket-active.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-auto-socket-cfg.xml =>
graphics-vnc-remove-generated-socket-inactive.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-sasl.xml =>
graphics-vnc-sasl.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-socket.xml =>
graphics-vnc-socket.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-tls.xml =>
graphics-vnc-tls.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{graphics-vnc-websocket.xml =>
graphics-vnc-websocket.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{graphics-vnc.xml => graphics-vnc.x86_64-latest.xml}
(90%)
rename tests/qemuxml2xmloutdata/{hostdev-mdev-display.xml =>
hostdev-mdev-display.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{hostdev-mdev-precreated.xml =>
hostdev-mdev-precreated.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{hostdev-pci-address-unassigned.xml =>
hostdev-pci-address-unassigned.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{hostdev-pci-multifunction.xml =>
hostdev-pci-multifunction.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{hostdev-scsi-autogen-address.xml =>
hostdev-scsi-autogen-address.x86_64-latest.xml} (96%)
rename tests/qemuxml2xmloutdata/{hostdev-scsi-large-unit.xml =>
hostdev-scsi-large-unit.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{hostdev-scsi-lsi.xml =>
hostdev-scsi-lsi.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{hostdev-scsi-shareable.xml =>
hostdev-scsi-shareable.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{hostdev-scsi-vhost-scsi-pci.xml =>
hostdev-scsi-vhost-scsi-pci.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{hostdev-scsi-virtio-scsi.xml =>
hostdev-scsi-virtio-scsi.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{hostdev-vfio.xml => hostdev-vfio.x86_64-latest.xml}
(90%)
rename tests/qemuxml2xmloutdata/{memory-hotplug-dimm.xml =>
memory-hotplug-dimm.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-access.xml =>
memory-hotplug-nvdimm-access.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-align.xml =>
memory-hotplug-nvdimm-align.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-label.xml =>
memory-hotplug-nvdimm-label.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-pmem.xml =>
memory-hotplug-nvdimm-pmem.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-readonly.xml =>
memory-hotplug-nvdimm-readonly.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm.xml =>
memory-hotplug-nvdimm.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{misc-disable-s3.xml =>
misc-disable-s3.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{misc-disable-suspends.xml =>
misc-disable-suspends.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{misc-enable-s4.xml =>
misc-enable-s4.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{numatune-hmat.xml => numatune-hmat.x86_64-latest.xml}
(100%)
rename tests/qemuxml2xmloutdata/{panic-double.xml => panic-double.x86_64-latest.xml}
(85%)
rename tests/qemuxml2xmloutdata/{panic-no-address.xml =>
panic-no-address.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{panic.xml => panic.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{pci-autoadd-addr.xml =>
pci-autoadd-addr.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{pci-autoadd-idx.xml =>
pci-autoadd-idx.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{pci-autofill-addr.xml =>
pci-autofill-addr.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{pci-bridge-many-disks.xml =>
pci-bridge-many-disks.x86_64-latest.xml} (99%)
rename tests/qemuxml2xmloutdata/{pci-bridge.xml => pci-bridge.x86_64-latest.xml}
(98%)
rename tests/qemuxml2xmloutdata/{pci-expander-bus.xml =>
pci-expander-bus.x86_64-latest.xml} (98%)
rename tests/qemuxml2xmloutdata/{pci-many.xml => pci-many.x86_64-latest.xml} (98%)
rename tests/qemuxml2xmloutdata/{pcie-expander-bus.xml =>
pcie-expander-bus.x86_64-latest.xml} (96%)
rename tests/qemuxml2xmloutdata/{pcie-root-port-model-generic.xml =>
pcie-root-port-model-generic.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{pcie-root-port-model-ioh3420.xml =>
pcie-root-port-model-ioh3420.x86_64-latest.xml} (82%)
rename tests/qemuxml2xmloutdata/{pcie-root-port.xml =>
pcie-root-port.x86_64-latest.xml} (85%)
create mode 100644 tests/qemuxml2xmloutdata/pcie-root.x86_64-latest.xml
delete mode 100644 tests/qemuxml2xmloutdata/pcie-root.xml
rename tests/qemuxml2xmloutdata/{pcie-switch-downstream-port.xml =>
pcie-switch-downstream-port.x86_64-latest.xml} (92%)
create mode 100644 tests/qemuxml2xmloutdata/pcie-switch-upstream-port.x86_64-latest.xml
rename tests/qemuxml2xmloutdata/{q35.xml => pcihole64-q35.x86_64-latest.xml} (65%)
delete mode 100644 tests/qemuxml2xmloutdata/pcihole64-q35.xml
rename tests/qemuxml2xmloutdata/{q35-pci-force-address.xml =>
q35-pci-force-address.x86_64-latest.xml} (93%)
rename tests/qemuxml2xmloutdata/{q35-usb2-multi.xml =>
q35-usb2-multi.x86_64-latest.xml} (97%)
rename tests/qemuxml2xmloutdata/{q35-usb2-reorder.xml =>
q35-usb2-reorder.x86_64-latest.xml} (97%)
rename tests/qemuxml2xmloutdata/{q35-usb2.xml => q35-usb2.x86_64-latest.xml} (96%)
rename tests/qemuxml2xmloutdata/{pcie-switch-upstream-port.xml =>
q35.x86_64-latest.xml} (83%)
rename tests/qemuxml2xmloutdata/{serial-spiceport.xml =>
serial-spiceport.x86_64-latest.xml} (92%)
rename tests/qemuxml2xmloutdata/{smartcard-host.xml =>
smartcard-controller.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{smartcard-host-certificates-database.xml =>
smartcard-host-certificates-database.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{smartcard-host-certificates.xml =>
smartcard-host-certificates.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{smartcard-controller.xml =>
smartcard-host.x86_64-latest.xml} (86%)
rename tests/qemuxml2xmloutdata/{smartcard-passthrough-spicevmc.xml =>
smartcard-passthrough-spicevmc.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{smartcard-passthrough-tcp.xml =>
smartcard-passthrough-tcp.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{usb-controller-default-q35.xml =>
usb-controller-default-q35.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{usb-controller-explicit-q35.xml =>
usb-controller-explicit-q35.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{usb-piix3-controller.xml =>
usb-piix3-controller.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{usb-port-missing.xml =>
usb-port-missing.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{usb-redir-filter-version.xml =>
usb-redir-filter-version.x86_64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{usb-redir-filter.xml =>
usb-redir-filter.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{usb-redir.xml => usb-redir.x86_64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{virtio-input-passthrough.xml =>
virtio-input-passthrough.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{virtio-input.xml => virtio-input.x86_64-latest.xml}
(89%)
rename tests/qemuxml2xmloutdata/{virtio-rng-egd.xml =>
virtio-rng-egd.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{virtio-rng-random.xml =>
virtio-rng-random.x86_64-latest.xml} (87%)
rename tests/qemuxml2xmloutdata/{vmcoreinfo.xml => vmcoreinfo.x86_64-latest.xml}
(89%)
diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.xml
b/tests/qemuxml2argvdata/boot-floppy-q35.xml
index 384993c79f..40e4ec6d49 100644
--- a/tests/qemuxml2argvdata/boot-floppy-q35.xml
+++ b/tests/qemuxml2argvdata/boot-floppy-q35.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='q35'>hvm</type>
<boot dev='fd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -24,7 +27,20 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pcie-root'/>
+ <controller type='pci' index='1'
model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='1' port='0x8'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0' multifunction='on'/>
+ </controller>
+ <controller type='pci' index='2'
model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='2' port='0x9'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
+ </controller>
<controller type='fdc' index='0'/>
+ <controller type='usb' index='0' model='qemu-xhci'>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
+ </controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml
b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml
index ac0d792d72..9c55d6ec3e 100644
--- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml
+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -32,7 +35,7 @@
<target dev='sdb' bus='scsi'/>
<address type='drive' controller='0' bus='0'
target='0' unit='1'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='scsi' index='0' model='virtio-scsi'>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
index 320bd46acd..bee0346aca 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
@@ -13,7 +13,8 @@
<uid start='0' target='1000' count='10'/>
<gid start='0' target='1000' count='10'/>
</idmap>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='1'
threads='1'/>
<numa>
<cell id='0' cpus='0-1' memory='219136'
unit='KiB'/>
@@ -34,7 +35,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
index 977b28a2ce..decf87db63 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
@@ -13,7 +13,8 @@
<uid start='0' target='1000' count='10'/>
<gid start='0' target='1000' count='10'/>
</idmap>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='1'
threads='1'/>
<numa>
<cell id='0' cpus='0-1' memory='219136'
unit='KiB'/>
@@ -34,7 +35,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
index 5457252650..8a0dab3908 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
@@ -13,7 +13,8 @@
<uid start='0' target='1000' count='10'/>
<gid start='0' target='1000' count='10'/>
</idmap>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='1'
threads='1'/>
<numa>
<cell id='0' cpus='0-1' memory='219136'
unit='KiB'/>
@@ -34,7 +35,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
index 40125aa120..a712adfe1e 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
@@ -13,7 +13,8 @@
<uid start='0' target='1000' count='10'/>
<gid start='0' target='1000' count='10'/>
</idmap>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='1'
threads='1'/>
<numa>
<cell id='0' cpus='0-1' memory='219136'
unit='KiB'/>
@@ -34,7 +35,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
index cefda3143d..57629ccb8c 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
@@ -13,7 +13,8 @@
<uid start='0' target='1000' count='10'/>
<gid start='0' target='1000' count='10'/>
</idmap>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='1'
threads='1'/>
<numa>
<cell id='0' cpus='0-1' memory='219136'
unit='KiB'/>
@@ -34,7 +35,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
index d37186880c..865ddcf0ea 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
@@ -13,7 +13,8 @@
<uid start='0' target='1000' count='10'/>
<gid start='0' target='1000' count='10'/>
</idmap>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='1'
threads='1'/>
<numa>
<cell id='0' cpus='0-1' memory='1048576'
unit='KiB'/>
@@ -34,7 +35,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/numatune-hmat.xml
b/tests/qemuxml2argvdata/numatune-hmat.xml
index a64d2ef3e2..d75ad32682 100644
--- a/tests/qemuxml2argvdata/numatune-hmat.xml
+++ b/tests/qemuxml2argvdata/numatune-hmat.xml
@@ -13,7 +13,8 @@
<apic/>
<pae/>
</features>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<numa>
<cell id='0' cpus='0-3' memory='2097152'
unit='KiB'>
<cache level='1' associativity='direct'
policy='writeback'>
@@ -40,7 +41,7 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/autoindex.xml
b/tests/qemuxml2xmloutdata/autoindex.x86_64-latest.xml
similarity index 98%
rename from tests/qemuxml2xmloutdata/autoindex.xml
rename to tests/qemuxml2xmloutdata/autoindex.x86_64-latest.xml
index 54ad60e804..c43be23768 100644
--- a/tests/qemuxml2xmloutdata/autoindex.xml
+++ b/tests/qemuxml2xmloutdata/autoindex.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -31,7 +34,7 @@
<address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
</controller>
<controller type='pci' index='3'
model='pcie-root-port'>
- <model name='ioh3420'/>
+ <model name='pcie-root-port'/>
<target chassis='3' port='0x8'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/boot-floppy-q35.xml
b/tests/qemuxml2xmloutdata/boot-floppy-q35.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/boot-floppy-q35.xml
rename to tests/qemuxml2xmloutdata/boot-floppy-q35.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/chardev-label.xml
b/tests/qemuxml2xmloutdata/chardev-label.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/chardev-label.xml
rename to tests/qemuxml2xmloutdata/chardev-label.x86_64-latest.xml
index 4dc09cfb38..ba2311504b 100644
--- a/tests/qemuxml2xmloutdata/chardev-label.xml
+++ b/tests/qemuxml2xmloutdata/chardev-label.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/clock-catchup.xml
b/tests/qemuxml2xmloutdata/clock-catchup.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/clock-catchup.xml
rename to tests/qemuxml2xmloutdata/clock-catchup.x86_64-latest.xml
index b765b7e46b..22d4d5e1ea 100644
--- a/tests/qemuxml2xmloutdata/clock-catchup.xml
+++ b/tests/qemuxml2xmloutdata/clock-catchup.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'>
<timer name='rtc' tickpolicy='catchup'>
<catchup slew='4636'/>
@@ -30,7 +33,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
b/tests/qemuxml2xmloutdata/controller-virtio-scsi.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
rename to tests/qemuxml2xmloutdata/controller-virtio-scsi.x86_64-latest.xml
index feb3833fb4..1f4837a069 100644
--- a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
+++ b/tests/qemuxml2xmloutdata/controller-virtio-scsi.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -44,7 +47,7 @@
<target dev='sde' bus='scsi'/>
<address type='drive' controller='4' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='scsi' index='0' model='virtio-scsi'>
diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml
b/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml
rename to tests/qemuxml2xmloutdata/disk-cdrom-bus-other.x86_64-latest.xml
index 7ac0aef59b..8da45000d2 100644
--- a/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml
+++ b/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.x86_64-latest.xml
@@ -9,6 +9,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -26,7 +29,7 @@
<target dev='sdb' bus='usb'/>
<readonly/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
b/tests/qemuxml2xmloutdata/disk-network-iscsi.x86_64-latest.xml
similarity index 96%
rename from tests/qemuxml2xmloutdata/disk-network-iscsi.xml
rename to tests/qemuxml2xmloutdata/disk-network-iscsi.x86_64-latest.xml
index 130c635cdf..711fa6e330 100644
--- a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-iscsi.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -85,7 +88,7 @@
<target dev='sdc' bus='scsi'/>
<address type='drive' controller='0' bus='0'
target='0' unit='2'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-device-auto.x86_64-latest.xml
index 0de1077ec1..00cc32e09d 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -26,7 +29,7 @@
<target dev='sda' bus='scsi'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
rename to tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.x86_64-latest.xml
index 34904ec156..4b23fbfcfe 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -32,7 +35,7 @@
<product>ST67 807GD</product>
<address type='drive' controller='1' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='scsi' index='0' model='virtio-scsi'>
diff --git a/tests/qemuxml2xmloutdata/disk-usb-device.xml
b/tests/qemuxml2xmloutdata/disk-usb-device.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-usb-device.xml
rename to tests/qemuxml2xmloutdata/disk-usb-device.x86_64-latest.xml
index e5517eefd9..e42dc23178 100644
--- a/tests/qemuxml2xmloutdata/disk-usb-device.xml
+++ b/tests/qemuxml2xmloutdata/disk-usb-device.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -25,7 +28,7 @@
<source file='/tmp/usbdisk.img'/>
<target dev='sda' bus='usb'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.xml
b/tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.xml
rename to tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.xml
b/tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.xml
rename to tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.x86_64-latest.xml
index c9e5c540df..94d8aeb58f 100644
--- a/tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.xml
+++ b/tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/graphics-listen-network.xml
b/tests/qemuxml2xmloutdata/graphics-listen-network.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/graphics-listen-network.xml
rename to tests/qemuxml2xmloutdata/graphics-listen-network.x86_64-latest.xml
index f3dab792ce..ab4aa8cafa 100644
--- a/tests/qemuxml2xmloutdata/graphics-listen-network.xml
+++ b/tests/qemuxml2xmloutdata/graphics-listen-network.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
b/tests/qemuxml2xmloutdata/graphics-listen-network2.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/graphics-listen-network2.xml
rename to tests/qemuxml2xmloutdata/graphics-listen-network2.x86_64-latest.xml
index 2df6a44540..e13bd7fe74 100644
--- a/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
+++ b/tests/qemuxml2xmloutdata/graphics-listen-network2.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml
b/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml
rename to tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.x86_64-latest.xml
index 8076df3ef4..87aff139e0 100644
--- a/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml
+++ b/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/graphics-sdl.xml
b/tests/qemuxml2xmloutdata/graphics-sdl.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/graphics-sdl.xml
rename to tests/qemuxml2xmloutdata/graphics-sdl.x86_64-latest.xml
index 7516c8686a..1be076b106 100644
--- a/tests/qemuxml2xmloutdata/graphics-sdl.xml
+++ b/tests/qemuxml2xmloutdata/graphics-sdl.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml
b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.x86_64-latest.xml
index db38c535d1..9b3ec39e8a 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml
b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.x86_64-latest.xml
index 383d00b05a..15e81d1e36 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml
b/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.x86_64-latest.xml
index 1e8a20146c..f3c588080f 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml
b/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.x86_64-latest.xml
index 4a9e81b611..d22200086d 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml
b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml
rename to
tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.x86_64-latest.xml
index 86e00501d9..f61470a339 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml
+++
b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml
b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml
rename to
tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.x86_64-latest.xml
index db38c535d1..9b3ec39e8a 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml
+++
b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml
b/tests/qemuxml2xmloutdata/graphics-vnc-sasl.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-sasl.x86_64-latest.xml
index 98be9b48a5..359279bd5a 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-sasl.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-socket.xml
b/tests/qemuxml2xmloutdata/graphics-vnc-socket.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/graphics-vnc-socket.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-socket.x86_64-latest.xml
index e4a241b971..726ba547c6 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-socket.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-socket.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
b/tests/qemuxml2xmloutdata/graphics-vnc-tls.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-tls.x86_64-latest.xml
index 1205cd22a4..8a2cd444ad 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-tls.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml
b/tests/qemuxml2xmloutdata/graphics-vnc-websocket.x86_64-latest.xml
similarity index 87%
rename from tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-websocket.x86_64-latest.xml
index 91b4f4fb32..09ff95becd 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-websocket.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc.xml
b/tests/qemuxml2xmloutdata/graphics-vnc.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/graphics-vnc.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc.x86_64-latest.xml
index 4a9e81b611..d22200086d 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
b/tests/qemuxml2xmloutdata/hostdev-mdev-display.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
rename to tests/qemuxml2xmloutdata/hostdev-mdev-display.x86_64-latest.xml
index bbcf3edde7..b2e3092370 100644
--- a/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-display.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
rename to tests/qemuxml2xmloutdata/hostdev-mdev-precreated.x86_64-latest.xml
index ca83bbcbe0..2f5f3184fc 100644
--- a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
@@ -24,7 +27,7 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
- <hostdev mode='subsystem' type='mdev' managed='no'
model='vfio-pci'>
+ <hostdev mode='subsystem' type='mdev' managed='no'
model='vfio-pci' display='off'>
<source>
<address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
</source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.xml
b/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.xml
rename to tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.x86_64-latest.xml
index 0725857827..480d2f8363 100644
--- a/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml
b/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml
rename to tests/qemuxml2xmloutdata/hostdev-pci-multifunction.x86_64-latest.xml
index 489569b289..a29a27e85b 100644
--- a/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.x86_64-latest.xml
similarity index 96%
rename from tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.x86_64-latest.xml
index 2f05bd49d1..a0cc4e1669 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<controller type='scsi' index='0' model='virtio-scsi'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.x86_64-latest.xml
index 40330a95c3..4be0019828 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<controller type='scsi' index='0' model='virtio-scsi'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-lsi.x86_64-latest.xml
index cec2136da9..e2193ae980 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<controller type='scsi' index='0' model='lsilogic'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-shareable.x86_64-latest.xml
index f0856fcfc3..f2beb0ade0 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<controller type='scsi' index='0' model='virtio-scsi'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.xml
index 59f2c8449e..63fadb598c 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<controller type='scsi' index='0' model='virtio-scsi'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.x86_64-latest.xml
index 2618216d81..2c1d094f85 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<controller type='scsi' index='0' model='virtio-scsi'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio.xml
b/tests/qemuxml2xmloutdata/hostdev-vfio.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/hostdev-vfio.xml
rename to tests/qemuxml2xmloutdata/hostdev-vfio.x86_64-latest.xml
index 03c836a846..b660d245a1 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml
index 23f213dab0..7c1b7b2c5d 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml
@@ -13,7 +13,8 @@
<uid start='0' target='1000' count='10'/>
<gid start='0' target='1000' count='10'/>
</idmap>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='1'
threads='1'/>
<numa>
<cell id='0' cpus='0-1' memory='219136'
unit='KiB'/>
@@ -34,7 +35,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.xml
b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml
b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.xml
b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.xml
b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.xml
b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.xml
b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/misc-disable-s3.xml
b/tests/qemuxml2xmloutdata/misc-disable-s3.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/misc-disable-s3.xml
rename to tests/qemuxml2xmloutdata/misc-disable-s3.x86_64-latest.xml
index 48ce6745db..2bee4e37dd 100644
--- a/tests/qemuxml2xmloutdata/misc-disable-s3.xml
+++ b/tests/qemuxml2xmloutdata/misc-disable-s3.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/misc-disable-suspends.xml
b/tests/qemuxml2xmloutdata/misc-disable-suspends.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/misc-disable-suspends.xml
rename to tests/qemuxml2xmloutdata/misc-disable-suspends.x86_64-latest.xml
index 0a58fa986b..e07a2010b1 100644
--- a/tests/qemuxml2xmloutdata/misc-disable-suspends.xml
+++ b/tests/qemuxml2xmloutdata/misc-disable-suspends.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -24,7 +27,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/misc-enable-s4.xml
b/tests/qemuxml2xmloutdata/misc-enable-s4.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/misc-enable-s4.xml
rename to tests/qemuxml2xmloutdata/misc-enable-s4.x86_64-latest.xml
index 7e8f8d5a32..f00685d410 100644
--- a/tests/qemuxml2xmloutdata/misc-enable-s4.xml
+++ b/tests/qemuxml2xmloutdata/misc-enable-s4.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/numatune-hmat.xml
b/tests/qemuxml2xmloutdata/numatune-hmat.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/numatune-hmat.xml
rename to tests/qemuxml2xmloutdata/numatune-hmat.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/panic-double.xml
b/tests/qemuxml2xmloutdata/panic-double.x86_64-latest.xml
similarity index 85%
rename from tests/qemuxml2xmloutdata/panic-double.xml
rename to tests/qemuxml2xmloutdata/panic-double.x86_64-latest.xml
index f58633b341..7cff4a4a5f 100644
--- a/tests/qemuxml2xmloutdata/panic-double.xml
+++ b/tests/qemuxml2xmloutdata/panic-double.x86_64-latest.xml
@@ -11,13 +11,16 @@
<features>
<acpi/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/panic-no-address.xml
b/tests/qemuxml2xmloutdata/panic-no-address.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/panic-no-address.xml
rename to tests/qemuxml2xmloutdata/panic-no-address.x86_64-latest.xml
index e85af86096..098bd3d036 100644
--- a/tests/qemuxml2xmloutdata/panic-no-address.xml
+++ b/tests/qemuxml2xmloutdata/panic-no-address.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='fdc' index='0'/>
diff --git a/tests/qemuxml2xmloutdata/panic.xml
b/tests/qemuxml2xmloutdata/panic.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/panic.xml
rename to tests/qemuxml2xmloutdata/panic.x86_64-latest.xml
index f78adc2816..899613a0ef 100644
--- a/tests/qemuxml2xmloutdata/panic.xml
+++ b/tests/qemuxml2xmloutdata/panic.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='fdc' index='0'/>
diff --git a/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
b/tests/qemuxml2xmloutdata/pci-autoadd-addr.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
rename to tests/qemuxml2xmloutdata/pci-autoadd-addr.x86_64-latest.xml
index 2670c9d951..7d625b2d6e 100644
--- a/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
+++ b/tests/qemuxml2xmloutdata/pci-autoadd-addr.x86_64-latest.xml
@@ -13,6 +13,9 @@
<apic/>
<pae/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -26,7 +29,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
b/tests/qemuxml2xmloutdata/pci-autoadd-idx.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
rename to tests/qemuxml2xmloutdata/pci-autoadd-idx.x86_64-latest.xml
index 8812868ba8..285a69c937 100644
--- a/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
+++ b/tests/qemuxml2xmloutdata/pci-autoadd-idx.x86_64-latest.xml
@@ -13,6 +13,9 @@
<apic/>
<pae/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -26,7 +29,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/pci-autofill-addr.xml
b/tests/qemuxml2xmloutdata/pci-autofill-addr.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/pci-autofill-addr.xml
rename to tests/qemuxml2xmloutdata/pci-autofill-addr.x86_64-latest.xml
index e12dc4bae3..2498863acc 100644
--- a/tests/qemuxml2xmloutdata/pci-autofill-addr.xml
+++ b/tests/qemuxml2xmloutdata/pci-autofill-addr.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
<readonly/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
b/tests/qemuxml2xmloutdata/pci-bridge-many-disks.x86_64-latest.xml
similarity index 99%
rename from tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
rename to tests/qemuxml2xmloutdata/pci-bridge-many-disks.x86_64-latest.xml
index 12caf1fb9c..d188e16b4e 100644
--- a/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
+++ b/tests/qemuxml2xmloutdata/pci-bridge-many-disks.x86_64-latest.xml
@@ -13,6 +13,9 @@
<apic/>
<pae/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'>
<timer name='kvmclock' present='no'/>
</clock>
@@ -651,7 +654,7 @@
<target dev='vdzd' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x03'
slot='0x10' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/pci-bridge.xml
b/tests/qemuxml2xmloutdata/pci-bridge.x86_64-latest.xml
similarity index 98%
rename from tests/qemuxml2xmloutdata/pci-bridge.xml
rename to tests/qemuxml2xmloutdata/pci-bridge.x86_64-latest.xml
index 46e42a8bc3..45bdd0ec8f 100644
--- a/tests/qemuxml2xmloutdata/pci-bridge.xml
+++ b/tests/qemuxml2xmloutdata/pci-bridge.x86_64-latest.xml
@@ -13,6 +13,9 @@
<apic/>
<pae/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -26,7 +29,7 @@
<readonly/>
<address type='drive' controller='0' bus='1'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/pci-expander-bus.xml
b/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml
similarity index 98%
rename from tests/qemuxml2xmloutdata/pci-expander-bus.xml
rename to tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml
index 7263d71e9a..b63c8c145a 100644
--- a/tests/qemuxml2xmloutdata/pci-expander-bus.xml
+++ b/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml
@@ -8,7 +8,8 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='4'
threads='2'/>
<numa>
<cell id='0' cpus='0-7' memory='109550'
unit='KiB'/>
diff --git a/tests/qemuxml2xmloutdata/pci-many.xml
b/tests/qemuxml2xmloutdata/pci-many.x86_64-latest.xml
similarity index 98%
rename from tests/qemuxml2xmloutdata/pci-many.xml
rename to tests/qemuxml2xmloutdata/pci-many.x86_64-latest.xml
index 635bccc696..23af8181c3 100644
--- a/tests/qemuxml2xmloutdata/pci-many.xml
+++ b/tests/qemuxml2xmloutdata/pci-many.x86_64-latest.xml
@@ -13,6 +13,9 @@
<apic/>
<pae/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -194,7 +197,7 @@
<target dev='vdgb' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
b/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml
similarity index 96%
rename from tests/qemuxml2xmloutdata/pcie-expander-bus.xml
rename to tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml
index bb614096c4..a441be8ebe 100644
--- a/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
+++ b/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml
@@ -8,7 +8,8 @@
<type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<topology sockets='2' dies='1' cores='4'
threads='2'/>
<numa>
<cell id='0' cpus='0-7' memory='109550'
unit='KiB'/>
@@ -36,7 +37,7 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</controller>
<controller type='pci' index='2'
model='pcie-root-port'>
- <model name='ioh3420'/>
+ <model name='pcie-root-port'/>
<target chassis='2' port='0x0'/>
<address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
</controller>
@@ -204,9 +205,17 @@
<target chassis='35' port='0x1f'/>
<address type='pci' domain='0x0000' bus='0x03'
slot='0x1f' function='0x0'/>
</controller>
+ <controller type='usb' index='0' model='qemu-xhci'>
+ <address type='pci' domain='0x0000' bus='0x24'
slot='0x00' function='0x0'/>
+ </controller>
<controller type='sata' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
</controller>
+ <controller type='pci' index='36'
model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='36' port='0x8'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0'/>
+ </controller>
<interface type='user'>
<mac address='52:54:00:f1:95:51'/>
<model type='rtl8139'/>
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
b/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
rename to tests/qemuxml2xmloutdata/pcie-root-port-model-generic.x86_64-latest.xml
index 1d287541cc..7c208d00a7 100644
--- a/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -30,6 +33,9 @@
<target chassis='3' port='0xa'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
+ <controller type='usb' index='0' model='qemu-xhci'>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
+ </controller>
<controller type='sata' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
b/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.x86_64-latest.xml
similarity index 82%
rename from tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
rename to tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.x86_64-latest.xml
index efa33990de..8e829d5468 100644
--- a/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -16,7 +19,7 @@
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='pci' index='0' model='pcie-root'/>
<controller type='pci' index='1'
model='pcie-root-port'>
- <model name='ioh3420'/>
+ <model name='pcie-root-port'/>
<target chassis='1' port='0x8'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0' multifunction='on'/>
</controller>
@@ -25,6 +28,9 @@
<target chassis='2' port='0x9'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
+ <controller type='usb' index='0' model='qemu-xhci'>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
+ </controller>
<controller type='sata' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port.xml
b/tests/qemuxml2xmloutdata/pcie-root-port.x86_64-latest.xml
similarity index 85%
rename from tests/qemuxml2xmloutdata/pcie-root-port.xml
rename to tests/qemuxml2xmloutdata/pcie-root-port.x86_64-latest.xml
index cb43593032..32afb7c478 100644
--- a/tests/qemuxml2xmloutdata/pcie-root-port.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root-port.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -22,7 +25,7 @@
</disk>
<controller type='pci' index='0' model='pcie-root'/>
<controller type='pci' index='1'
model='pcie-root-port'>
- <model name='ioh3420'/>
+ <model name='pcie-root-port'/>
<target chassis='1' port='0x10'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0' multifunction='on'/>
</controller>
@@ -34,6 +37,9 @@
<controller type='sata' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
</controller>
+ <controller type='usb' index='0' model='qemu-xhci'>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
+ </controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
diff --git a/tests/qemuxml2xmloutdata/pcie-root.x86_64-latest.xml
b/tests/qemuxml2xmloutdata/pcie-root.x86_64-latest.xml
new file mode 100644
index 0000000000..7c2c9049c1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pcie-root.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type='qemu'>
+ <name>q35-test</name>
+ <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
+ <memory unit='KiB'>2097152</memory>
+ <currentMemory unit='KiB'>2097152</currentMemory>
+ <vcpu placement='static' cpuset='0-1'>2</vcpu>
+ <os>
+ <type arch='x86_64' machine='q35'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
+ <controller type='pci' index='0' model='pcie-root'/>
+ <controller type='usb' index='0' model='qemu-xhci'>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
+ </controller>
+ <controller type='sata' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
+ </controller>
+ <controller type='pci' index='1'
model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='1' port='0x8'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0' multifunction='on'/>
+ </controller>
+ <controller type='pci' index='2'
model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='2' port='0x9'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
+ </controller>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <audio id='1' type='none'/>
+ <watchdog model='itco' action='reset'/>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/pcie-root.xml
b/tests/qemuxml2xmloutdata/pcie-root.xml
deleted file mode 100644
index b0140244fd..0000000000
--- a/tests/qemuxml2xmloutdata/pcie-root.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<domain type='qemu'>
- <name>q35-test</name>
- <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
- <memory unit='KiB'>2097152</memory>
- <currentMemory unit='KiB'>2097152</currentMemory>
- <vcpu placement='static' cpuset='0-1'>2</vcpu>
- <os>
- <type arch='x86_64' machine='q35'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='pci' index='0' model='pcie-root'/>
- <controller type='sata' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
- </controller>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <audio id='1' type='none'/>
- <watchdog model='itco' action='reset'/>
- <memballoon model='none'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
b/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
rename to tests/qemuxml2xmloutdata/pcie-switch-downstream-port.x86_64-latest.xml
index 7902511ef3..bc61f27a87 100644
--- a/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
+++ b/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -22,7 +25,7 @@
</disk>
<controller type='pci' index='0' model='pcie-root'/>
<controller type='pci' index='1'
model='pcie-root-port'>
- <model name='ioh3420'/>
+ <model name='pcie-root-port'/>
<target chassis='1' port='0x10'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</controller>
@@ -72,6 +75,9 @@
<controller type='sata' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
</controller>
+ <controller type='usb' index='0' model='qemu-xhci'>
+ <address type='pci' domain='0x0000' bus='0x04'
slot='0x00' function='0x0'/>
+ </controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
diff --git a/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.x86_64-latest.xml
b/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.x86_64-latest.xml
new file mode 100644
index 0000000000..14bc417fc4
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.x86_64-latest.xml
@@ -0,0 +1,66 @@
+<domain type='qemu'>
+ <name>q35-test</name>
+ <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
+ <memory unit='KiB'>2097152</memory>
+ <currentMemory unit='KiB'>2097152</currentMemory>
+ <vcpu placement='static' cpuset='0-1'>2</vcpu>
+ <os>
+ <type arch='x86_64' machine='q35'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
+ <disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
+ <source dev='/dev/HostVG/QEMUGuest1'/>
+ <target dev='sda' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
+ </disk>
+ <controller type='pci' index='0' model='pcie-root'/>
+ <controller type='pci' index='1'
model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='1' port='0x10'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0' multifunction='on'/>
+ </controller>
+ <controller type='pci' index='2'
model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='2' port='0x11'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x1'/>
+ </controller>
+ <controller type='pci' index='3'
model='pcie-switch-upstream-port'>
+ <model name='x3130-upstream'/>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
+ </controller>
+ <controller type='pci' index='4'
model='pcie-switch-upstream-port'>
+ <model name='x3130-upstream'/>
+ <address type='pci' domain='0x0000' bus='0x02'
slot='0x00' function='0x0'/>
+ </controller>
+ <controller type='sata' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
+ </controller>
+ <controller type='usb' index='0' model='qemu-xhci'>
+ <address type='pci' domain='0x0000' bus='0x05'
slot='0x00' function='0x0'/>
+ </controller>
+ <controller type='pci' index='5'
model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='5' port='0x12'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x2'/>
+ </controller>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <audio id='1' type='none'/>
+ <video>
+ <model type='qxl' ram='65536' vram='32768'
vgamem='8192' heads='1' primary='yes'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0'/>
+ </video>
+ <watchdog model='itco' action='reset'/>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/q35.xml
b/tests/qemuxml2xmloutdata/pcihole64-q35.x86_64-latest.xml
similarity index 65%
rename from tests/qemuxml2xmloutdata/q35.xml
rename to tests/qemuxml2xmloutdata/pcihole64-q35.x86_64-latest.xml
index c7f0e19deb..e6e1f11f98 100644
--- a/tests/qemuxml2xmloutdata/q35.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64-q35.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,24 +23,24 @@
<target dev='sda' bus='sata'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='pci' index='0' model='pcie-root'/>
- <controller type='usb' index='0' model='ich9-ehci1'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1d' function='0x7'/>
+ <controller type='pci' index='0' model='pcie-root'>
+ <pcihole64 unit='KiB'>1048576</pcihole64>
</controller>
- <controller type='usb' index='0' model='ich9-uhci1'>
- <master startport='0'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1d' function='0x0' multifunction='on'/>
+ <controller type='sata' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
</controller>
- <controller type='usb' index='0' model='ich9-uhci2'>
- <master startport='2'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1d' function='0x1'/>
+ <controller type='usb' index='0' model='qemu-xhci'>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
</controller>
- <controller type='usb' index='0' model='ich9-uhci3'>
- <master startport='4'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1d' function='0x2'/>
+ <controller type='pci' index='1'
model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='1' port='0x10'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0' multifunction='on'/>
</controller>
- <controller type='sata' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
+ <controller type='pci' index='2'
model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='2' port='0x11'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x1'/>
</controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/pcihole64-q35.xml
b/tests/qemuxml2xmloutdata/pcihole64-q35.xml
deleted file mode 100644
index b47c5243a2..0000000000
--- a/tests/qemuxml2xmloutdata/pcihole64-q35.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<domain type='qemu'>
- <name>q35-test</name>
- <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
- <memory unit='KiB'>2097152</memory>
- <currentMemory unit='KiB'>2097152</currentMemory>
- <vcpu placement='static' cpuset='0-1'>2</vcpu>
- <os>
- <type arch='x86_64' machine='q35'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <disk type='block' device='disk'>
- <driver name='qemu' type='raw'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='sda' bus='sata'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <controller type='pci' index='0' model='pcie-root'>
- <pcihole64 unit='KiB'>1048576</pcihole64>
- </controller>
- <controller type='sata' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
- </controller>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <audio id='1' type='none'/>
- <video>
- <model type='qxl' ram='65536' vram='32768'
vgamem='8192' heads='1' primary='yes'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0'/>
- </video>
- <watchdog model='itco' action='reset'/>
- <memballoon model='none'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/q35-pci-force-address.xml
b/tests/qemuxml2xmloutdata/q35-pci-force-address.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/q35-pci-force-address.xml
rename to tests/qemuxml2xmloutdata/q35-pci-force-address.x86_64-latest.xml
index 7490e7095a..e9c75305fd 100644
--- a/tests/qemuxml2xmloutdata/q35-pci-force-address.xml
+++ b/tests/qemuxml2xmloutdata/q35-pci-force-address.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -25,7 +28,7 @@
<address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
</controller>
<controller type='pci' index='3'
model='pcie-root-port'>
- <model name='ioh3420'/>
+ <model name='pcie-root-port'/>
<target chassis='3' port='0x8'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/q35-usb2-multi.xml
b/tests/qemuxml2xmloutdata/q35-usb2-multi.x86_64-latest.xml
similarity index 97%
rename from tests/qemuxml2xmloutdata/q35-usb2-multi.xml
rename to tests/qemuxml2xmloutdata/q35-usb2-multi.x86_64-latest.xml
index 019a4d2765..b6e6c46abc 100644
--- a/tests/qemuxml2xmloutdata/q35-usb2-multi.xml
+++ b/tests/qemuxml2xmloutdata/q35-usb2-multi.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
b/tests/qemuxml2xmloutdata/q35-usb2-reorder.x86_64-latest.xml
similarity index 97%
rename from tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
rename to tests/qemuxml2xmloutdata/q35-usb2-reorder.x86_64-latest.xml
index 2a9342c4d6..db57e8ae5c 100644
--- a/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
+++ b/tests/qemuxml2xmloutdata/q35-usb2-reorder.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/q35-usb2.xml
b/tests/qemuxml2xmloutdata/q35-usb2.x86_64-latest.xml
similarity index 96%
rename from tests/qemuxml2xmloutdata/q35-usb2.xml
rename to tests/qemuxml2xmloutdata/q35-usb2.x86_64-latest.xml
index 9e0c3da063..b860ae2dee 100644
--- a/tests/qemuxml2xmloutdata/q35-usb2.xml
+++ b/tests/qemuxml2xmloutdata/q35-usb2.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
b/tests/qemuxml2xmloutdata/q35.x86_64-latest.xml
similarity index 83%
rename from tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
rename to tests/qemuxml2xmloutdata/q35.x86_64-latest.xml
index d0d9d2a574..909f94fe2c 100644
--- a/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
+++ b/tests/qemuxml2xmloutdata/q35.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -21,27 +24,22 @@
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<controller type='pci' index='0' model='pcie-root'/>
+ <controller type='usb' index='0' model='qemu-xhci'>
+ <address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
+ </controller>
+ <controller type='sata' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
+ </controller>
<controller type='pci' index='1'
model='pcie-root-port'>
- <model name='ioh3420'/>
+ <model name='pcie-root-port'/>
<target chassis='1' port='0x10'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0' multifunction='on'/>
</controller>
<controller type='pci' index='2'
model='pcie-root-port'>
- <model name='ioh3420'/>
+ <model name='pcie-root-port'/>
<target chassis='2' port='0x11'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x1'/>
</controller>
- <controller type='pci' index='3'
model='pcie-switch-upstream-port'>
- <model name='x3130-upstream'/>
- <address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
- </controller>
- <controller type='pci' index='4'
model='pcie-switch-upstream-port'>
- <model name='x3130-upstream'/>
- <address type='pci' domain='0x0000' bus='0x02'
slot='0x00' function='0x0'/>
- </controller>
- <controller type='sata' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
- </controller>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
diff --git a/tests/qemuxml2xmloutdata/serial-spiceport.xml
b/tests/qemuxml2xmloutdata/serial-spiceport.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/serial-spiceport.xml
rename to tests/qemuxml2xmloutdata/serial-spiceport.x86_64-latest.xml
index c8cf9a4de5..c01136a450 100644
--- a/tests/qemuxml2xmloutdata/serial-spiceport.xml
+++ b/tests/qemuxml2xmloutdata/serial-spiceport.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/smartcard-host.xml
b/tests/qemuxml2xmloutdata/smartcard-controller.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/smartcard-host.xml
rename to tests/qemuxml2xmloutdata/smartcard-controller.x86_64-latest.xml
index c8bc4fae88..094ebebb63 100644
--- a/tests/qemuxml2xmloutdata/smartcard-host.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-controller.x86_64-latest.xml
@@ -8,17 +8,20 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='ccid' index='0'/>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
- <controller type='ccid' index='0'/>
<smartcard mode='host'>
<address type='ccid' controller='0' slot='0'/>
</smartcard>
diff --git a/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
b/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
rename to tests/qemuxml2xmloutdata/smartcard-host-certificates-database.x86_64-latest.xml
index 2a6a697f56..6b44376703 100644
--- a/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
b/tests/qemuxml2xmloutdata/smartcard-host-certificates.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
rename to tests/qemuxml2xmloutdata/smartcard-host-certificates.x86_64-latest.xml
index ef776fd659..40434e5f46 100644
--- a/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host-certificates.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/smartcard-controller.xml
b/tests/qemuxml2xmloutdata/smartcard-host.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/smartcard-controller.xml
rename to tests/qemuxml2xmloutdata/smartcard-host.x86_64-latest.xml
index d606a10cf8..505f0750e6 100644
--- a/tests/qemuxml2xmloutdata/smartcard-controller.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host.x86_64-latest.xml
@@ -8,17 +8,20 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='ccid' index='0'/>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
+ <controller type='ccid' index='0'/>
<smartcard mode='host'>
<address type='ccid' controller='0' slot='0'/>
</smartcard>
diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
b/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
rename to tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.x86_64-latest.xml
index 656c41bb6d..ed9d2714ca 100644
--- a/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
b/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.x86_64-latest.xml
similarity index 87%
rename from tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
rename to tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.x86_64-latest.xml
index e3d66b5ebf..4a8bc9079d 100644
--- a/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/usb-controller-default-q35.xml
b/tests/qemuxml2xmloutdata/usb-controller-default-q35.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/usb-controller-default-q35.xml
rename to tests/qemuxml2xmloutdata/usb-controller-default-q35.x86_64-latest.xml
index 4b307f3b7b..fa67c860bb 100644
--- a/tests/qemuxml2xmloutdata/usb-controller-default-q35.xml
+++ b/tests/qemuxml2xmloutdata/usb-controller-default-q35.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/usb-controller-explicit-q35.xml
b/tests/qemuxml2xmloutdata/usb-controller-explicit-q35.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/usb-controller-explicit-q35.xml
rename to tests/qemuxml2xmloutdata/usb-controller-explicit-q35.x86_64-latest.xml
index a64ff769df..e6f61c20c3 100644
--- a/tests/qemuxml2xmloutdata/usb-controller-explicit-q35.xml
+++ b/tests/qemuxml2xmloutdata/usb-controller-explicit-q35.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='q35'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
b/tests/qemuxml2xmloutdata/usb-piix3-controller.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/usb-piix3-controller.xml
rename to tests/qemuxml2xmloutdata/usb-piix3-controller.x86_64-latest.xml
index 5071b6a3d9..c74353b056 100644
--- a/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
+++ b/tests/qemuxml2xmloutdata/usb-piix3-controller.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/usb-port-missing.xml
b/tests/qemuxml2xmloutdata/usb-port-missing.x86_64-latest.xml
similarity index 87%
rename from tests/qemuxml2xmloutdata/usb-port-missing.xml
rename to tests/qemuxml2xmloutdata/usb-port-missing.x86_64-latest.xml
index def74a1ffc..5969a91ac4 100644
--- a/tests/qemuxml2xmloutdata/usb-port-missing.xml
+++ b/tests/qemuxml2xmloutdata/usb-port-missing.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
b/tests/qemuxml2xmloutdata/usb-redir-filter-version.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
rename to tests/qemuxml2xmloutdata/usb-redir-filter-version.x86_64-latest.xml
index 28764678d9..78685ad86c 100644
--- a/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir-filter-version.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/usb-redir-filter.xml
b/tests/qemuxml2xmloutdata/usb-redir-filter.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/usb-redir-filter.xml
rename to tests/qemuxml2xmloutdata/usb-redir-filter.x86_64-latest.xml
index e78cb9de71..befea8698d 100644
--- a/tests/qemuxml2xmloutdata/usb-redir-filter.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir-filter.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/usb-redir.xml
b/tests/qemuxml2xmloutdata/usb-redir.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/usb-redir.xml
rename to tests/qemuxml2xmloutdata/usb-redir.x86_64-latest.xml
index a972f811e4..e2e5879bce 100644
--- a/tests/qemuxml2xmloutdata/usb-redir.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir.x86_64-latest.xml
@@ -8,6 +8,9 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
b/tests/qemuxml2xmloutdata/virtio-input-passthrough.x86_64-latest.xml
similarity index 87%
rename from tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
rename to tests/qemuxml2xmloutdata/virtio-input-passthrough.x86_64-latest.xml
index 24f5c2d06b..b1a34318c6 100644
--- a/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
+++ b/tests/qemuxml2xmloutdata/virtio-input-passthrough.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/virtio-input.xml
b/tests/qemuxml2xmloutdata/virtio-input.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/virtio-input.xml
rename to tests/qemuxml2xmloutdata/virtio-input.x86_64-latest.xml
index 76f3b5122b..e9c7a3676c 100644
--- a/tests/qemuxml2xmloutdata/virtio-input.xml
+++ b/tests/qemuxml2xmloutdata/virtio-input.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
b/tests/qemuxml2xmloutdata/virtio-rng-egd.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/virtio-rng-egd.xml
rename to tests/qemuxml2xmloutdata/virtio-rng-egd.x86_64-latest.xml
index 5127097e84..2f8fa0bb77 100644
--- a/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
+++ b/tests/qemuxml2xmloutdata/virtio-rng-egd.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-random.xml
b/tests/qemuxml2xmloutdata/virtio-rng-random.x86_64-latest.xml
similarity index 87%
rename from tests/qemuxml2xmloutdata/virtio-rng-random.xml
rename to tests/qemuxml2xmloutdata/virtio-rng-random.x86_64-latest.xml
index a089b5e702..38bd67a84e 100644
--- a/tests/qemuxml2xmloutdata/virtio-rng-random.xml
+++ b/tests/qemuxml2xmloutdata/virtio-rng-random.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/vmcoreinfo.xml
b/tests/qemuxml2xmloutdata/vmcoreinfo.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/vmcoreinfo.xml
rename to tests/qemuxml2xmloutdata/vmcoreinfo.x86_64-latest.xml
index 9e74938957..0290d9c8dd 100644
--- a/tests/qemuxml2xmloutdata/vmcoreinfo.xml
+++ b/tests/qemuxml2xmloutdata/vmcoreinfo.x86_64-latest.xml
@@ -11,6 +11,9 @@
<features>
<vmcoreinfo state='on'/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -26,7 +29,7 @@
<controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 6b412abfd9..bed57437ca 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -187,10 +187,6 @@ mymain(void)
#define DO_TEST_CAPS_VER(name, ver) \
DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver)
-#define DO_TEST(name, ...) \
- DO_TEST_FULL(name, "", WHEN_BOTH, \
- ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END)
-
/* Unset or set all envvars here that are copied in qemudBuildCommandLine
* using ADD_ENV_COPY, otherwise these tests may fail due to unexpected
* values for these envvars */
@@ -212,9 +208,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("boot-cdrom");
DO_TEST_CAPS_LATEST("boot-network");
DO_TEST_CAPS_LATEST("boot-floppy");
- DO_TEST("boot-floppy-q35",
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_ICH9_AHCI);
+ DO_TEST_CAPS_LATEST("boot-floppy-q35");
DO_TEST_CAPS_LATEST("boot-multi");
DO_TEST_CAPS_LATEST("boot-menu-enable-with-timeout");
DO_TEST_CAPS_LATEST("boot-menu-disable");
@@ -232,7 +226,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("cpu-host-passthrough-features");
DO_TEST_CAPS_LATEST("cpu-host-model-features");
DO_TEST_CAPS_LATEST("cpu-host-model-vendor");
- DO_TEST("clock-catchup", QEMU_CAPS_KVM_PIT_TICK_POLICY);
+ DO_TEST_CAPS_LATEST("clock-catchup");
DO_TEST_CAPS_LATEST("kvmclock");
DO_TEST_CAPS_LATEST("clock-timer-hyperv-rtc");
DO_TEST_CAPS_ARCH_LATEST("clock-timer-armvtimer", "aarch64");
@@ -287,9 +281,9 @@ mymain(void)
* thinking the output file is invalid XML */
DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid");
DO_TEST_CAPS_LATEST("disk-cdrom-network");
- DO_TEST("disk-cdrom-bus-other", QEMU_CAPS_DEVICE_USB_STORAGE);
+ DO_TEST_CAPS_LATEST("disk-cdrom-bus-other");
DO_TEST_CAPS_LATEST("disk-floppy");
- DO_TEST("disk-usb-device", QEMU_CAPS_DEVICE_USB_STORAGE);
+ DO_TEST_CAPS_LATEST("disk-usb-device");
DO_TEST_CAPS_LATEST("disk-virtio");
DO_TEST_CAPS_LATEST("floppy-drive-fat");
DO_TEST_CAPS_LATEST("disk-virtio-queues");
@@ -301,8 +295,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-cache");
DO_TEST_CAPS_LATEST("disk-metadata-cache");
DO_TEST_CAPS_LATEST("disk-network-nbd");
- DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_SCSI_BLOCK);
+ DO_TEST_CAPS_LATEST("disk-network-iscsi");
DO_TEST_CAPS_LATEST("disk-network-gluster");
DO_TEST_CAPS_LATEST("disk-network-rbd");
DO_TEST_CAPS_LATEST("disk-network-rbd-encryption");
@@ -319,51 +312,25 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-vhostuser");
DO_TEST_CAPS_LATEST("disk-sata-device");
DO_TEST_CAPS_LATEST("disk-scsi");
- DO_TEST("disk-virtio-scsi-reservations",
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_PR_MANAGER_HELPER,
- QEMU_CAPS_SCSI_BLOCK);
- DO_TEST("controller-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI);
+ DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations");
+ DO_TEST_CAPS_LATEST("controller-virtio-scsi");
DO_TEST_CAPS_ARCH_LATEST("disk-virtio-s390-zpci", "s390x");
DO_TEST_CAPS_LATEST("disk-mirror-old");
DO_TEST_CAPS_LATEST("disk-mirror");
DO_TEST_CAPS_LATEST("disk-active-commit");
- DO_TEST("graphics-listen-network",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_VNC);
- DO_TEST("graphics-vnc",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_VNC);
- DO_TEST("graphics-vnc-websocket",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_VNC);
- DO_TEST("graphics-vnc-sasl",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_VNC);
- DO_TEST("graphics-vnc-tls",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_VNC);
- DO_TEST("graphics-vnc-no-listen-attr",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_VNC);
- DO_TEST("graphics-vnc-remove-generated-socket",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_VNC);
+ DO_TEST_CAPS_LATEST("graphics-listen-network");
+ DO_TEST_CAPS_LATEST("graphics-vnc");
+ DO_TEST_CAPS_LATEST("graphics-vnc-websocket");
+ DO_TEST_CAPS_LATEST("graphics-vnc-sasl");
+ DO_TEST_CAPS_LATEST("graphics-vnc-tls");
+ DO_TEST_CAPS_LATEST("graphics-vnc-no-listen-attr");
+ DO_TEST_CAPS_LATEST("graphics-vnc-remove-generated-socket");
cfg->vncAutoUnixSocket = true;
- DO_TEST("graphics-vnc-auto-socket-cfg",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_VNC);
+ DO_TEST_CAPS_LATEST("graphics-vnc-auto-socket-cfg");
cfg->vncAutoUnixSocket = false;
- DO_TEST("graphics-vnc-socket",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_VNC);
- DO_TEST("graphics-vnc-auto-socket",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_VNC);
- DO_TEST("graphics-vnc-egl-headless",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_VNC,
- QEMU_CAPS_EGL_HEADLESS);
+ DO_TEST_CAPS_LATEST("graphics-vnc-socket");
+ DO_TEST_CAPS_LATEST("graphics-vnc-auto-socket");
+ DO_TEST_CAPS_LATEST("graphics-vnc-egl-headless");
DO_TEST_CAPS_LATEST("graphics-dbus");
DO_TEST_CAPS_LATEST("graphics-dbus-address");
@@ -377,8 +344,8 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("default-video-type-s390x", "s390x");
DO_TEST_CAPS_LATEST("default-video-type-x86_64");
- DO_TEST("graphics-sdl", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_SDL);
- DO_TEST("graphics-sdl-fullscreen", QEMU_CAPS_DEVICE_CIRRUS_VGA,
QEMU_CAPS_SDL);
+ DO_TEST_CAPS_LATEST("graphics-sdl");
+ DO_TEST_CAPS_LATEST("graphics-sdl-fullscreen");
cfg->spiceTLS = true;
DO_TEST_CAPS_LATEST("graphics-spice");
@@ -393,21 +360,16 @@ mymain(void)
DO_TEST_CAPS_LATEST("graphics-spice-egl-headless");
DO_TEST_CAPS_LATEST("graphics-spice-timeout");
- DO_TEST("graphics-egl-headless-rendernode",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_EGL_HEADLESS_RENDERNODE,
- QEMU_CAPS_EGL_HEADLESS);
+ DO_TEST_CAPS_LATEST("graphics-egl-headless-rendernode");
DO_TEST_CAPS_LATEST("input-usbmouse");
DO_TEST_CAPS_LATEST("input-usbtablet");
DO_TEST_CAPS_LATEST("misc-acpi");
- DO_TEST("misc-disable-s3", QEMU_CAPS_PIIX_DISABLE_S3);
+ DO_TEST_CAPS_LATEST("misc-disable-s3");
DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable");
DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-enable");
- DO_TEST("misc-disable-suspends",
- QEMU_CAPS_PIIX_DISABLE_S3,
- QEMU_CAPS_PIIX_DISABLE_S4);
- DO_TEST("misc-enable-s4", QEMU_CAPS_PIIX_DISABLE_S4);
+ DO_TEST_CAPS_LATEST("misc-disable-suspends");
+ DO_TEST_CAPS_LATEST("misc-enable-s4");
DO_TEST_CAPS_LATEST("misc-no-reboot");
DO_TEST_CAPS_LATEST("misc-uuid");
DO_TEST_CAPS_LATEST("net-vhostuser");
@@ -448,9 +410,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev-notls");
cfg->spiceTLS = true;
- DO_TEST("serial-spiceport",
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_SPICE);
+ DO_TEST_CAPS_LATEST("serial-spiceport");
cfg->spiceTLS = false;
DO_TEST_CAPS_LATEST("serial-debugcon");
@@ -465,9 +425,9 @@ mymain(void)
DO_TEST_CAPS_LATEST("hostdev-usb-address");
DO_TEST_CAPS_LATEST("hostdev-pci-address");
- DO_TEST("hostdev-pci-address-unassigned", QEMU_CAPS_DEVICE_VFIO_PCI);
- DO_TEST("hostdev-pci-multifunction", QEMU_CAPS_DEVICE_VFIO_PCI);
- DO_TEST("hostdev-vfio", QEMU_CAPS_DEVICE_VFIO_PCI);
+ DO_TEST_CAPS_LATEST("hostdev-pci-address-unassigned");
+ DO_TEST_CAPS_LATEST("hostdev-pci-multifunction");
+ DO_TEST_CAPS_LATEST("hostdev-vfio");
DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci", "s390x");
DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-multidomain-many",
"s390x");
DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate",
"s390x");
@@ -475,12 +435,8 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate-fids",
"s390x");
DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-boundaries",
"s390x");
DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-ccw-memballoon",
"s390x");
- DO_TEST("hostdev-mdev-precreated", QEMU_CAPS_DEVICE_VFIO_PCI);
- DO_TEST("hostdev-mdev-display",
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_VFIO_PCI_DISPLAY,
- QEMU_CAPS_DEVICE_VFIO_PCI,
- QEMU_CAPS_VNC);
+ DO_TEST_CAPS_LATEST("hostdev-mdev-precreated");
+ DO_TEST_CAPS_LATEST("hostdev-mdev-display");
DO_TEST_CAPS_LATEST("hostdev-mdev-display-ramfb");
DO_TEST_CAPS_LATEST("pci-rom");
DO_TEST_CAPS_LATEST("pci-rom-disabled");
@@ -523,34 +479,15 @@ mymain(void)
DO_TEST_CAPS_LATEST("usb-none");
DO_TEST_CAPS_LATEST("usb-controller");
- DO_TEST("usb-piix3-controller",
- QEMU_CAPS_PIIX3_USB_UHCI);
- DO_TEST("usb-controller-default-q35",
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_PCI_OHCI,
- QEMU_CAPS_PIIX3_USB_UHCI,
- QEMU_CAPS_NEC_USB_XHCI);
- DO_TEST("usb-controller-explicit-q35",
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_PCI_OHCI,
- QEMU_CAPS_PIIX3_USB_UHCI,
- QEMU_CAPS_NEC_USB_XHCI);
+ DO_TEST_CAPS_LATEST("usb-piix3-controller");
+ DO_TEST_CAPS_LATEST("usb-controller-default-q35");
+ DO_TEST_CAPS_LATEST("usb-controller-explicit-q35");
DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller-legacy",
"ppc64");
- DO_TEST("usb-port-missing", QEMU_CAPS_USB_HUB);
- DO_TEST("usb-redir", QEMU_CAPS_USB_REDIR,
- QEMU_CAPS_SPICE,
- QEMU_CAPS_DEVICE_CIRRUS_VGA);
- DO_TEST("usb-redir-filter",
- QEMU_CAPS_USB_REDIR,
- QEMU_CAPS_USB_REDIR_FILTER,
- QEMU_CAPS_SPICE,
- QEMU_CAPS_DEVICE_CIRRUS_VGA);
- DO_TEST("usb-redir-filter-version",
- QEMU_CAPS_USB_REDIR,
- QEMU_CAPS_USB_REDIR_FILTER,
- QEMU_CAPS_SPICE,
- QEMU_CAPS_DEVICE_CIRRUS_VGA);
+ DO_TEST_CAPS_LATEST("usb-port-missing");
+ DO_TEST_CAPS_LATEST("usb-redir");
+ DO_TEST_CAPS_LATEST("usb-redir-filter");
+ DO_TEST_CAPS_LATEST("usb-redir-filter-version");
DO_TEST_CAPS_LATEST("blkdeviotune");
DO_TEST_CAPS_LATEST("blkdeviotune-max");
DO_TEST_CAPS_LATEST("blkdeviotune-group-num");
@@ -575,8 +512,7 @@ mymain(void)
ARG_END);
DO_TEST_CAPS_LATEST("numad-static-vcpu-no-numatune");
- DO_TEST("disk-scsi-disk-vpd",
- QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI);
+ DO_TEST_CAPS_LATEST("disk-scsi-disk-vpd");
DO_TEST_CAPS_LATEST("disk-source-pool");
DO_TEST_CAPS_LATEST("disk-source-pool-mode");
@@ -588,12 +524,8 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("disk-arm-virtio-sd", "aarch64");
- DO_TEST("virtio-rng-random",
- QEMU_CAPS_DEVICE_VIRTIO_RNG,
- QEMU_CAPS_OBJECT_RNG_RANDOM);
- DO_TEST("virtio-rng-egd",
- QEMU_CAPS_DEVICE_VIRTIO_RNG,
- QEMU_CAPS_OBJECT_RNG_EGD);
+ DO_TEST_CAPS_LATEST("virtio-rng-random");
+ DO_TEST_CAPS_LATEST("virtio-rng-egd");
DO_TEST_CAPS_LATEST("virtio-rng-builtin");
DO_TEST_CAPS_ARCH_LATEST("pseries-nvram", "ppc64");
@@ -633,13 +565,10 @@ mymain(void)
DO_TEST_CAPS_LATEST("balloon-device-period");
DO_TEST_CAPS_LATEST("channel-virtio-auto");
DO_TEST_CAPS_LATEST("console-compat-auto");
- DO_TEST("disk-scsi-device-auto",
- QEMU_CAPS_SCSI_LSI);
+ DO_TEST_CAPS_LATEST("disk-scsi-device-auto");
DO_TEST_CAPS_LATEST("console-virtio");
DO_TEST_CAPS_LATEST("serial-target-port-auto");
- DO_TEST("graphics-listen-network2",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_VNC);
+ DO_TEST_CAPS_LATEST("graphics-listen-network2");
DO_TEST_CAPS_LATEST("numad-auto-vcpu-no-numatune");
DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-no-cpuset-and-placement");
DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-cpuset");
@@ -658,134 +587,54 @@ mymain(void)
DO_TEST_CAPS_LATEST("metadata");
DO_TEST_CAPS_LATEST("metadata-duplicate");
- DO_TEST("pci-bridge",
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_VNC,
- QEMU_CAPS_DEVICE_CIRRUS_VGA);
- DO_TEST("pci-many",
- QEMU_CAPS_DEVICE_CIRRUS_VGA);
- DO_TEST("pci-bridge-many-disks",
- QEMU_CAPS_DEVICE_PCI_BRIDGE);
- DO_TEST("pci-autoadd-addr",
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_CIRRUS_VGA);
- DO_TEST("pci-autoadd-idx",
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_CIRRUS_VGA);
- DO_TEST("pci-autofill-addr", QEMU_CAPS_DEVICE_CIRRUS_VGA);
-
- DO_TEST("q35",
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_DEVICE_QXL);
- DO_TEST("q35-usb2",
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_DEVICE_QXL);
- DO_TEST("q35-usb2-multi",
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_DEVICE_QXL);
- DO_TEST("q35-usb2-reorder",
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_DEVICE_QXL);
+ DO_TEST_CAPS_LATEST("pci-bridge");
+ DO_TEST_CAPS_LATEST("pci-many");
+ DO_TEST_CAPS_LATEST("pci-bridge-many-disks");
+ DO_TEST_CAPS_LATEST("pci-autoadd-addr");
+ DO_TEST_CAPS_LATEST("pci-autoadd-idx");
+ DO_TEST_CAPS_LATEST("pci-autofill-addr");
+
+ DO_TEST_CAPS_LATEST("q35");
+ DO_TEST_CAPS_LATEST("q35-usb2");
+ DO_TEST_CAPS_LATEST("q35-usb2-multi");
+ DO_TEST_CAPS_LATEST("q35-usb2-reorder");
DO_TEST_CAPS_LATEST("q35-pcie");
/* same as q35-pcie, but all PCI controllers are added automatically */
DO_TEST_CAPS_LATEST("q35-pcie-autoadd");
DO_TEST_CAPS_LATEST("q35-default-devices-only");
DO_TEST_CAPS_LATEST("q35-multifunction");
DO_TEST_CAPS_LATEST("q35-virt-manager-basic");
- DO_TEST("pcie-root",
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_QXL);
+ DO_TEST_CAPS_LATEST("pcie-root");
/* Test automatic and manual setting of pcie-root-port attributes */
- DO_TEST("pcie-root-port",
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_QXL);
+ DO_TEST_CAPS_LATEST("pcie-root-port");
/* Make sure the default model for PCIe Root Ports is picked correctly
* based on QEMU binary capabilities. We use x86/q35 for the test, but
* any PCIe machine type (such as aarch64/virt) will behave the same */
- DO_TEST("pcie-root-port-model-generic",
- QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
- QEMU_CAPS_DEVICE_IOH3420);
- DO_TEST("pcie-root-port-model-ioh3420",
- QEMU_CAPS_DEVICE_IOH3420);
+ DO_TEST_CAPS_LATEST("pcie-root-port-model-generic");
+ DO_TEST_CAPS_LATEST("pcie-root-port-model-ioh3420");
DO_TEST_CAPS_LATEST("pcie-root-port-nohotplug");
- DO_TEST("pcie-switch-upstream-port",
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_DEVICE_X3130_UPSTREAM,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_QXL);
- DO_TEST("pcie-switch-downstream-port",
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_DEVICE_X3130_UPSTREAM,
- QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_QXL);
- DO_TEST("pci-expander-bus",
- QEMU_CAPS_DEVICE_PXB);
- DO_TEST("pcie-expander-bus",
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_DEVICE_X3130_UPSTREAM,
- QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM,
- QEMU_CAPS_DEVICE_PXB_PCIE);
+ DO_TEST_CAPS_LATEST("pcie-switch-upstream-port");
+ DO_TEST_CAPS_LATEST("pcie-switch-downstream-port");
+ DO_TEST_CAPS_LATEST("pci-expander-bus");
+ DO_TEST_CAPS_LATEST("pcie-expander-bus");
DO_TEST_CAPS_ARCH_LATEST("pcie-expander-bus-aarch64",
"aarch64");
- DO_TEST("autoindex",
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_DEVICE_X3130_UPSTREAM,
- QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_NEC_USB_XHCI);
+ DO_TEST_CAPS_LATEST("autoindex");
/* Make sure the user can always override libvirt's default device
* placement policy by providing an explicit PCI address */
- DO_TEST("q35-pci-force-address",
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_HDA_DUPLEX);
+ DO_TEST_CAPS_LATEST("q35-pci-force-address");
DO_TEST_CAPS_ARCH_LATEST("hostdev-scsi-vhost-scsi-ccw",
"s390x");
- DO_TEST("hostdev-scsi-vhost-scsi-pci",
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_DEVICE_VHOST_SCSI);
+ DO_TEST_CAPS_LATEST("hostdev-scsi-vhost-scsi-pci");
DO_TEST_CAPS_LATEST("hostdev-scsi-vhost-scsi-pcie");
- DO_TEST("hostdev-scsi-lsi",
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_SCSI_LSI);
- DO_TEST("hostdev-scsi-virtio-scsi",
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_SCSI_LSI);
-
- DO_TEST("hostdev-scsi-shareable",
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_SCSI_LSI);
-
- DO_TEST("hostdev-scsi-autogen-address",
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_SCSI_LSI);
- DO_TEST("hostdev-scsi-large-unit",
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_SCSI_LSI);
+ DO_TEST_CAPS_LATEST("hostdev-scsi-lsi");
+ DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi");
+
+ DO_TEST_CAPS_LATEST("hostdev-scsi-shareable");
+
+ DO_TEST_CAPS_LATEST("hostdev-scsi-autogen-address");
+ DO_TEST_CAPS_LATEST("hostdev-scsi-large-unit");
DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw",
"s390x");
DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw-boot",
"s390x");
@@ -801,14 +650,11 @@ mymain(void)
DO_TEST_CAPS_LATEST("pcihole64");
DO_TEST_CAPS_LATEST("pcihole64-gib");
- DO_TEST("pcihole64-q35",
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_DEVICE_QXL);
-
- DO_TEST("panic", QEMU_CAPS_DEVICE_PANIC);
- DO_TEST("panic-double", QEMU_CAPS_DEVICE_PANIC);
- DO_TEST("panic-no-address", QEMU_CAPS_DEVICE_PANIC);
+ DO_TEST_CAPS_LATEST("pcihole64-q35");
+
+ DO_TEST_CAPS_LATEST("panic");
+ DO_TEST_CAPS_LATEST("panic-double");
+ DO_TEST_CAPS_LATEST("panic-no-address");
DO_TEST_CAPS_ARCH_LATEST("panic-pseries", "ppc64");
DO_TEST_CAPS_LATEST("pvpanic-pci-x86_64");
@@ -822,9 +668,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-network-http");
- DO_TEST("chardev-label",
- QEMU_CAPS_DEVICE_VIRTIO_RNG,
- QEMU_CAPS_OBJECT_RNG_EGD);
+ DO_TEST_CAPS_LATEST("chardev-label");
DO_TEST_CAPS_LATEST("cpu-numa1");
DO_TEST_CAPS_LATEST("cpu-numa2");
@@ -838,7 +682,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("numatune-memnode-no-memory");
DO_TEST_CAPS_LATEST("numatune-distances");
DO_TEST_CAPS_LATEST("numatune-no-vcpu");
- DO_TEST("numatune-hmat", QEMU_CAPS_NUMA_HMAT);
+ DO_TEST_CAPS_LATEST("numatune-hmat");
DO_TEST_CAPS_LATEST("numatune-hmat-none");
DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode");
@@ -980,15 +824,14 @@ mymain(void)
ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
ARG_CAPS_ARCH, "ppc64", ARG_CAPS_VER, "latest",
ARG_END);
DO_TEST_CAPS_LATEST("memory-hotplug");
- DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM);
+ DO_TEST_CAPS_LATEST("memory-hotplug-dimm");
DO_TEST_CAPS_LATEST("memory-hotplug-dimm-addr");
- DO_TEST("memory-hotplug-nvdimm", QEMU_CAPS_DEVICE_NVDIMM);
- DO_TEST("memory-hotplug-nvdimm-access", QEMU_CAPS_DEVICE_NVDIMM);
- DO_TEST("memory-hotplug-nvdimm-label", QEMU_CAPS_DEVICE_NVDIMM);
- DO_TEST("memory-hotplug-nvdimm-align", QEMU_CAPS_DEVICE_NVDIMM);
- DO_TEST("memory-hotplug-nvdimm-pmem", QEMU_CAPS_DEVICE_NVDIMM);
- DO_TEST("memory-hotplug-nvdimm-readonly", QEMU_CAPS_DEVICE_NVDIMM,
- QEMU_CAPS_DEVICE_NVDIMM_UNARMED);
+ DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm");
+ DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-access");
+ DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-label");
+ DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-align");
+ DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-pmem");
+ DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm-readonly");
DO_TEST_CAPS_ARCH_LATEST("memory-hotplug-nvdimm-ppc64",
"ppc64");
DO_TEST_FULL("memory-hotplug-nvdimm-ppc64-abi-update", "",
WHEN_BOTH,
ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
@@ -1004,12 +847,8 @@ mymain(void)
DO_TEST_CAPS_LATEST("video-virtio-gpu-spice-gl");
DO_TEST_CAPS_LATEST("video-virtio-gpu-sdl-gl");
- DO_TEST("virtio-input",
- QEMU_CAPS_VIRTIO_KEYBOARD,
- QEMU_CAPS_VIRTIO_MOUSE,
- QEMU_CAPS_VIRTIO_TABLET);
- DO_TEST("virtio-input-passthrough",
- QEMU_CAPS_VIRTIO_INPUT_HOST);
+ DO_TEST_CAPS_LATEST("virtio-input");
+ DO_TEST_CAPS_LATEST("virtio-input-passthrough");
DO_TEST_CAPS_LATEST("input-linux");
@@ -1058,18 +897,14 @@ mymain(void)
DO_TEST_CAPS_LATEST("cpu-check-default-none2");
DO_TEST_CAPS_LATEST("cpu-check-default-partial");
DO_TEST_CAPS_LATEST("cpu-check-default-partial2");
- DO_TEST("vmcoreinfo", QEMU_CAPS_DEVICE_VMCOREINFO);
-
- DO_TEST("smartcard-host", QEMU_CAPS_CCID_EMULATED);
- DO_TEST("smartcard-host-certificates", QEMU_CAPS_CCID_EMULATED);
- DO_TEST("smartcard-host-certificates-database",
- QEMU_CAPS_CCID_EMULATED);
- DO_TEST("smartcard-passthrough-tcp", QEMU_CAPS_CCID_PASSTHRU);
- DO_TEST("smartcard-passthrough-spicevmc",
- QEMU_CAPS_CCID_PASSTHRU,
- QEMU_CAPS_SPICE,
- QEMU_CAPS_DEVICE_CIRRUS_VGA);
- DO_TEST("smartcard-controller", QEMU_CAPS_CCID_EMULATED);
+ DO_TEST_CAPS_LATEST("vmcoreinfo");
+
+ DO_TEST_CAPS_LATEST("smartcard-host");
+ DO_TEST_CAPS_LATEST("smartcard-host-certificates");
+ DO_TEST_CAPS_LATEST("smartcard-host-certificates-database");
+ DO_TEST_CAPS_LATEST("smartcard-passthrough-tcp");
+ DO_TEST_CAPS_LATEST("smartcard-passthrough-spicevmc");
+ DO_TEST_CAPS_LATEST("smartcard-controller");
DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-compat-power9", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-compat-power10", "ppc64");
--
2.41.0
8:16 a.m.
New subject: [PATCH 24/24] qemuxml2xmltest: Modernize all remaining fake capability tests
On a Thursday in 2023, Peter Krempa wrote:
Convert all cases using DO_TEST() to use DO_TEST_CAPS_LATEST() and
remove DO_TEST() to prevent further use.
Most of the changes are related to CPU being present in the output XML.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/boot-floppy-q35.xml | 16 +
.../disk-virtio-scsi-reservations.xml | 5 +-
.../memory-hotplug-nvdimm-access.xml | 5 +-
.../memory-hotplug-nvdimm-align.xml | 5 +-
.../memory-hotplug-nvdimm-label.xml | 5 +-
.../memory-hotplug-nvdimm-pmem.xml | 5 +-
.../memory-hotplug-nvdimm-readonly.xml | 5 +-
.../memory-hotplug-nvdimm.xml | 5 +-
tests/qemuxml2argvdata/numatune-hmat.xml | 5 +-
...oindex.xml => autoindex.x86_64-latest.xml} | 5 +-
....xml => boot-floppy-q35.x86_64-latest.xml} | 0
...el.xml => chardev-label.x86_64-latest.xml} | 5 +-
...up.xml => clock-catchup.x86_64-latest.xml} | 5 +-
... controller-virtio-scsi.x86_64-latest.xml} | 5 +-
...=> disk-cdrom-bus-other.x86_64-latest.xml} | 5 +-
...l => disk-network-iscsi.x86_64-latest.xml} | 5 +-
...> disk-scsi-device-auto.x86_64-latest.xml} | 5 +-
...l => disk-scsi-disk-vpd.x86_64-latest.xml} | 5 +-
....xml => disk-usb-device.x86_64-latest.xml} | 5 +-
...irtio-scsi-reservations.x86_64-latest.xml} | 0
...egl-headless-rendernode.x86_64-latest.xml} | 5 +-
...graphics-listen-network.x86_64-latest.xml} | 5 +-
...raphics-listen-network2.x86_64-latest.xml} | 5 +-
...graphics-sdl-fullscreen.x86_64-latest.xml} | 5 +-
...sdl.xml => graphics-sdl.x86_64-latest.xml} | 5 +-
...ics-vnc-auto-socket-cfg.x86_64-latest.xml} | 5 +-
...raphics-vnc-auto-socket.x86_64-latest.xml} | 5 +-
...aphics-vnc-egl-headless.x86_64-latest.xml} | 5 +-
...hics-vnc-no-listen-attr.x86_64-latest.xml} | 5 +-
...generated-socket-active.x86_64-latest.xml} | 5 +-
...nerated-socket-inactive.x86_64-latest.xml} | 5 +-
...ml => graphics-vnc-sasl.x86_64-latest.xml} | 5 +-
... => graphics-vnc-socket.x86_64-latest.xml} | 5 +-
...xml => graphics-vnc-tls.x86_64-latest.xml} | 5 +-
... graphics-vnc-websocket.x86_64-latest.xml} | 5 +-
...vnc.xml => graphics-vnc.x86_64-latest.xml} | 5 +-
...=> hostdev-mdev-display.x86_64-latest.xml} | 5 +-
...hostdev-mdev-precreated.x86_64-latest.xml} | 7 +-
...-pci-address-unassigned.x86_64-latest.xml} | 5 +-
...stdev-pci-multifunction.x86_64-latest.xml} | 5 +-
...ev-scsi-autogen-address.x86_64-latest.xml} | 5 +-
...hostdev-scsi-large-unit.x86_64-latest.xml} | 5 +-
...xml => hostdev-scsi-lsi.x86_64-latest.xml} | 5 +-
... hostdev-scsi-shareable.x86_64-latest.xml} | 5 +-
...dev-scsi-vhost-scsi-pci.x86_64-latest.xml} | 5 +-
...ostdev-scsi-virtio-scsi.x86_64-latest.xml} | 5 +-
...fio.xml => hostdev-vfio.x86_64-latest.xml} | 5 +-
... => memory-hotplug-dimm.x86_64-latest.xml} | 5 +-
...y-hotplug-nvdimm-access.x86_64-latest.xml} | 0
...ry-hotplug-nvdimm-align.x86_64-latest.xml} | 0
...ry-hotplug-nvdimm-label.x86_64-latest.xml} | 0
...ory-hotplug-nvdimm-pmem.x86_64-latest.xml} | 0
...hotplug-nvdimm-readonly.x86_64-latest.xml} | 0
...> memory-hotplug-nvdimm.x86_64-latest.xml} | 0
....xml => misc-disable-s3.x86_64-latest.xml} | 5 +-
...> misc-disable-suspends.x86_64-latest.xml} | 5 +-
...4.xml => misc-enable-s4.x86_64-latest.xml} | 5 +-
...at.xml => numatune-hmat.x86_64-latest.xml} | 0
...ble.xml => panic-double.x86_64-latest.xml} | 5 +-
...xml => panic-no-address.x86_64-latest.xml} | 5 +-
.../{panic.xml => panic.x86_64-latest.xml} | 5 +-
...xml => pci-autoadd-addr.x86_64-latest.xml} | 5 +-
....xml => pci-autoadd-idx.x86_64-latest.xml} | 5 +-
...ml => pci-autofill-addr.x86_64-latest.xml} | 5 +-
...> pci-bridge-many-disks.x86_64-latest.xml} | 5 +-
...ridge.xml => pci-bridge.x86_64-latest.xml} | 5 +-
...xml => pci-expander-bus.x86_64-latest.xml} | 3 +-
...ci-many.xml => pci-many.x86_64-latest.xml} | 5 +-
...ml => pcie-expander-bus.x86_64-latest.xml} | 13 +-
...root-port-model-generic.x86_64-latest.xml} | 6 +
...root-port-model-ioh3420.x86_64-latest.xml} | 8 +-
...t.xml => pcie-root-port.x86_64-latest.xml} | 8 +-
.../pcie-root.x86_64-latest.xml | 43 +++
tests/qemuxml2xmloutdata/pcie-root.xml | 27 --
...-switch-downstream-port.x86_64-latest.xml} | 8 +-
...cie-switch-upstream-port.x86_64-latest.xml | 66 ++++
...35.xml => pcihole64-q35.x86_64-latest.xml} | 31 +-
tests/qemuxml2xmloutdata/pcihole64-q35.xml | 39 --
...> q35-pci-force-address.x86_64-latest.xml} | 5 +-
...i.xml => q35-usb2-multi.x86_64-latest.xml} | 3 +
...xml => q35-usb2-reorder.x86_64-latest.xml} | 3 +
...35-usb2.xml => q35-usb2.x86_64-latest.xml} | 3 +
...pstream-port.xml => q35.x86_64-latest.xml} | 24 +-
...xml => serial-spiceport.x86_64-latest.xml} | 5 +-
...=> smartcard-controller.x86_64-latest.xml} | 7 +-
...t-certificates-database.x86_64-latest.xml} | 5 +-
...tcard-host-certificates.x86_64-latest.xml} | 5 +-
...r.xml => smartcard-host.x86_64-latest.xml} | 7 +-
...rd-passthrough-spicevmc.x86_64-latest.xml} | 5 +-
...artcard-passthrough-tcp.x86_64-latest.xml} | 5 +-
...-controller-default-q35.x86_64-latest.xml} | 3 +
...controller-explicit-q35.x86_64-latest.xml} | 3 +
...=> usb-piix3-controller.x86_64-latest.xml} | 3 +
...xml => usb-port-missing.x86_64-latest.xml} | 5 +-
...sb-redir-filter-version.x86_64-latest.xml} | 5 +-
...xml => usb-redir-filter.x86_64-latest.xml} | 3 +
...-redir.xml => usb-redir.x86_64-latest.xml} | 3 +
...irtio-input-passthrough.x86_64-latest.xml} | 5 +-
...put.xml => virtio-input.x86_64-latest.xml} | 5 +-
...d.xml => virtio-rng-egd.x86_64-latest.xml} | 5 +-
...ml => virtio-rng-random.x86_64-latest.xml} | 5 +-
...einfo.xml => vmcoreinfo.x86_64-latest.xml} | 5 +-
tests/qemuxml2xmltest.c | 355 +++++-------------
103 files changed, 595 insertions(+), 442 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
458
days inactive
463
days old
50 comments
3 participants
participants (3)
-
Daniel P. Berrangé -
Ján Tomko -
Peter Krempa