6:41 a.m.
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