]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemuxml2xmltest: Modernize all remaining fake capability tests
authorPeter Krempa <pkrempa@redhat.com>
Tue, 15 Aug 2023 13:45:51 +0000 (15:45 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 22 Aug 2023 12:04:41 +0000 (14:04 +0200)
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@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
103 files changed:
tests/qemuxml2argvdata/boot-floppy-q35.xml
tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml
tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
tests/qemuxml2argvdata/numatune-hmat.xml
tests/qemuxml2xmloutdata/autoindex.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/autoindex.xml with 98% similarity]
tests/qemuxml2xmloutdata/boot-floppy-q35.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/boot-floppy-q35.xml with 100% similarity]
tests/qemuxml2xmloutdata/chardev-label.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/chardev-label.xml with 92% similarity]
tests/qemuxml2xmloutdata/clock-catchup.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/clock-catchup.xml with 90% similarity]
tests/qemuxml2xmloutdata/controller-virtio-scsi.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/controller-virtio-scsi.xml with 95% similarity]
tests/qemuxml2xmloutdata/disk-cdrom-bus-other.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml with 89% similarity]
tests/qemuxml2xmloutdata/disk-network-iscsi.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-network-iscsi.xml with 96% similarity]
tests/qemuxml2xmloutdata/disk-scsi-device-auto.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml with 91% similarity]
tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml with 92% similarity]
tests/qemuxml2xmloutdata/disk-usb-device.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-usb-device.xml with 90% similarity]
tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.xml with 100% similarity]
tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.xml with 89% similarity]
tests/qemuxml2xmloutdata/graphics-listen-network.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/graphics-listen-network.xml with 90% similarity]
tests/qemuxml2xmloutdata/graphics-listen-network2.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/graphics-listen-network2.xml with 91% similarity]
tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml with 89% similarity]
tests/qemuxml2xmloutdata/graphics-sdl.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/graphics-sdl.xml with 89% similarity]
tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml with 90% similarity]
tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml with 88% similarity]
tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml with 90% similarity]
tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml with 90% similarity]
tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml with 90% similarity]
tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml with 90% similarity]
tests/qemuxml2xmloutdata/graphics-vnc-sasl.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml with 90% similarity]
tests/qemuxml2xmloutdata/graphics-vnc-socket.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/graphics-vnc-socket.xml with 88% similarity]
tests/qemuxml2xmloutdata/graphics-vnc-tls.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/graphics-vnc-tls.xml with 88% similarity]
tests/qemuxml2xmloutdata/graphics-vnc-websocket.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml with 87% similarity]
tests/qemuxml2xmloutdata/graphics-vnc.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/graphics-vnc.xml with 90% similarity]
tests/qemuxml2xmloutdata/hostdev-mdev-display.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/hostdev-mdev-display.xml with 90% similarity]
tests/qemuxml2xmloutdata/hostdev-mdev-precreated.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml with 86% similarity]
tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.xml with 93% similarity]
tests/qemuxml2xmloutdata/hostdev-pci-multifunction.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml with 95% similarity]
tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml with 96% similarity]
tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml with 91% similarity]
tests/qemuxml2xmloutdata/hostdev-scsi-lsi.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml with 95% similarity]
tests/qemuxml2xmloutdata/hostdev-scsi-shareable.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml with 91% similarity]
tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml with 91% similarity]
tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml with 95% similarity]
tests/qemuxml2xmloutdata/hostdev-vfio.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/hostdev-vfio.xml with 90% similarity]
tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml with 93% similarity]
tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.xml with 100% similarity]
tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml with 100% similarity]
tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.xml with 100% similarity]
tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.xml with 100% similarity]
tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.xml with 100% similarity]
tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.xml with 100% similarity]
tests/qemuxml2xmloutdata/misc-disable-s3.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/misc-disable-s3.xml with 88% similarity]
tests/qemuxml2xmloutdata/misc-disable-suspends.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/misc-disable-suspends.xml with 88% similarity]
tests/qemuxml2xmloutdata/misc-enable-s4.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/misc-enable-s4.xml with 88% similarity]
tests/qemuxml2xmloutdata/numatune-hmat.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/numatune-hmat.xml with 100% similarity]
tests/qemuxml2xmloutdata/panic-double.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/panic-double.xml with 85% similarity]
tests/qemuxml2xmloutdata/panic-no-address.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/panic-no-address.xml with 89% similarity]
tests/qemuxml2xmloutdata/panic.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/panic.xml with 89% similarity]
tests/qemuxml2xmloutdata/pci-autoadd-addr.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pci-autoadd-addr.xml with 95% similarity]
tests/qemuxml2xmloutdata/pci-autoadd-idx.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pci-autoadd-idx.xml with 95% similarity]
tests/qemuxml2xmloutdata/pci-autofill-addr.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pci-autofill-addr.xml with 90% similarity]
tests/qemuxml2xmloutdata/pci-bridge-many-disks.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml with 99% similarity]
tests/qemuxml2xmloutdata/pci-bridge.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pci-bridge.xml with 98% similarity]
tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pci-expander-bus.xml with 98% similarity]
tests/qemuxml2xmloutdata/pci-many.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pci-many.xml with 98% similarity]
tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pcie-expander-bus.xml with 96% similarity]
tests/qemuxml2xmloutdata/pcie-root-port-model-generic.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml with 86% similarity]
tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml with 82% similarity]
tests/qemuxml2xmloutdata/pcie-root-port.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pcie-root-port.xml with 85% similarity]
tests/qemuxml2xmloutdata/pcie-root.x86_64-latest.xml [new file with mode: 0644]
tests/qemuxml2xmloutdata/pcie-root.xml [deleted file]
tests/qemuxml2xmloutdata/pcie-switch-downstream-port.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml with 92% similarity]
tests/qemuxml2xmloutdata/pcie-switch-upstream-port.x86_64-latest.xml [new file with mode: 0644]
tests/qemuxml2xmloutdata/pcihole64-q35.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/q35.xml with 65% similarity]
tests/qemuxml2xmloutdata/pcihole64-q35.xml [deleted file]
tests/qemuxml2xmloutdata/q35-pci-force-address.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/q35-pci-force-address.xml with 93% similarity]
tests/qemuxml2xmloutdata/q35-usb2-multi.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/q35-usb2-multi.xml with 97% similarity]
tests/qemuxml2xmloutdata/q35-usb2-reorder.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/q35-usb2-reorder.xml with 97% similarity]
tests/qemuxml2xmloutdata/q35-usb2.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/q35-usb2.xml with 96% similarity]
tests/qemuxml2xmloutdata/q35.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml with 83% similarity]
tests/qemuxml2xmloutdata/serial-spiceport.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/serial-spiceport.xml with 92% similarity]
tests/qemuxml2xmloutdata/smartcard-controller.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/smartcard-host.xml with 86% similarity]
tests/qemuxml2xmloutdata/smartcard-host-certificates-database.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml with 88% similarity]
tests/qemuxml2xmloutdata/smartcard-host-certificates.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/smartcard-host-certificates.xml with 88% similarity]
tests/qemuxml2xmloutdata/smartcard-host.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/smartcard-controller.xml with 86% similarity]
tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml with 89% similarity]
tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml with 87% similarity]
tests/qemuxml2xmloutdata/usb-controller-default-q35.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/usb-controller-default-q35.xml with 91% similarity]
tests/qemuxml2xmloutdata/usb-controller-explicit-q35.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/usb-controller-explicit-q35.xml with 91% similarity]
tests/qemuxml2xmloutdata/usb-piix3-controller.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/usb-piix3-controller.xml with 90% similarity]
tests/qemuxml2xmloutdata/usb-port-missing.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/usb-port-missing.xml with 87% similarity]
tests/qemuxml2xmloutdata/usb-redir-filter-version.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/usb-redir-filter-version.xml with 90% similarity]
tests/qemuxml2xmloutdata/usb-redir-filter.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/usb-redir-filter.xml with 95% similarity]
tests/qemuxml2xmloutdata/usb-redir.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/usb-redir.xml with 95% similarity]
tests/qemuxml2xmloutdata/virtio-input-passthrough.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/virtio-input-passthrough.xml with 87% similarity]
tests/qemuxml2xmloutdata/virtio-input.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/virtio-input.xml with 89% similarity]
tests/qemuxml2xmloutdata/virtio-rng-egd.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/virtio-rng-egd.xml with 88% similarity]
tests/qemuxml2xmloutdata/virtio-rng-random.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/virtio-rng-random.xml with 87% similarity]
tests/qemuxml2xmloutdata/vmcoreinfo.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/vmcoreinfo.xml with 89% similarity]
tests/qemuxml2xmltest.c

index 384993c79f3b15a19134630a806569ab25bd3c4c..40e4ec6d49142aed5a19fad02fed8e4794f66490 100644 (file)
@@ -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>
       <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'/>
index ac0d792d72d70347a4fa450d39f5faf406a25abc..9c55d6ec3ece74a4ee6e9b7376acc3318a6fcd12 100644 (file)
@@ -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'>
index 320bd46acd2f2d4377d31e20050f3daeccf38683..bee0346acad2497e6c868d467c03452761990240 100644 (file)
@@ -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'/>
index 977b28a2cef842ee10ce3a7d3d7a56eb6dab6715..decf87db63f7cdf1a87a7ffbf48b4545bdd154e0 100644 (file)
@@ -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'/>
index 545725265064156198be0078783e2b6100c21784..8a0dab390840365bc1da41f855fe6435a9e3599a 100644 (file)
@@ -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'/>
index 40125aa120d94c3cab907e68f66c1844c4dfc35a..a712adfe1e2b16809d3ed705695df1b407c58aff 100644 (file)
@@ -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'/>
index cefda3143d2398f23aae51f297e9ef41c4c1bf05..57629ccb8cf449819056c2a1d4abfcc6795d27b8 100644 (file)
@@ -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'/>
index d37186880ccb30f1a8d854fc35775ba3815178d0..865ddcf0ea2852adea8b0d142bd5c4753fe3a1ee 100644 (file)
@@ -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'/>
index a64d2ef3e29de0d7bfe1032d9a228868001c587c..d75ad32682ed71714ccdd893f8042f27df0c462d 100644 (file)
@@ -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'/>
similarity index 98%
rename from tests/qemuxml2xmloutdata/autoindex.xml
rename to tests/qemuxml2xmloutdata/autoindex.x86_64-latest.xml
index 54ad60e804c565193f70146946d03f29225bfff7..c43be23768571da64014a27922e8af641b5bec81 100644 (file)
@@ -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>
similarity index 92%
rename from tests/qemuxml2xmloutdata/chardev-label.xml
rename to tests/qemuxml2xmloutdata/chardev-label.x86_64-latest.xml
index 4dc09cfb383d2ac5eae6f7b7f157cb045fa8b496..ba2311504b23cf1f6930ed295affad2f4a963a9d 100644 (file)
@@ -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'>
similarity index 90%
rename from tests/qemuxml2xmloutdata/clock-catchup.xml
rename to tests/qemuxml2xmloutdata/clock-catchup.x86_64-latest.xml
index b765b7e46b87a923a6748d4e49bc8b9069871084..22d4d5e1eac26a097b4863dafc18f6dc98b10ed7 100644 (file)
@@ -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'>
similarity index 95%
rename from tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
rename to tests/qemuxml2xmloutdata/controller-virtio-scsi.x86_64-latest.xml
index feb3833fb45d45da5a2b2bab41ec05aa8ff7edcd..1f4837a0695045628c27d54b24c034b6c85fa70a 100644 (file)
@@ -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'>
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 7ac0aef59b65f57ffb781ac8a146bf939e252d14..8da45000d2dfce38428479efed48f91633754498 100644 (file)
@@ -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'>
similarity index 96%
rename from tests/qemuxml2xmloutdata/disk-network-iscsi.xml
rename to tests/qemuxml2xmloutdata/disk-network-iscsi.x86_64-latest.xml
index 130c635cdf64e85dc865e947b0f5a2186ced6fbf..711fa6e33042d0563d89f9e21c42385519cb6c74 100644 (file)
@@ -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'/>
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 0de1077ec1a452db94328902ad68ab760948061b..00cc32e09d1b5957207d678cf25daa38cca45d7d 100644 (file)
@@ -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'>
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 34904ec15607e38dbc6363af7b8b540550caeba7..4b23fbfcfe796ba2600d054764e17f42ac17f190 100644 (file)
@@ -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'>
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-usb-device.xml
rename to tests/qemuxml2xmloutdata/disk-usb-device.x86_64-latest.xml
index e5517eefd93fa04f8d8318669948775b824b259f..e42dc23178c6f8fc19fecd6ef7c615facb0ca5ac 100644 (file)
@@ -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'/>
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 c9e5c540df4760e6cffd9b88075f0da618962c2b..94d8aeb58f341c3d5244c2cefb28e0ab9ddbdbf3 100644 (file)
@@ -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'>
similarity index 90%
rename from tests/qemuxml2xmloutdata/graphics-listen-network.xml
rename to tests/qemuxml2xmloutdata/graphics-listen-network.x86_64-latest.xml
index f3dab792cec603c4c62547e5ac4088a83efe1d3f..ab4aa8cafa49ee1d41681c35cb583974043d6618 100644 (file)
@@ -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'>
similarity index 91%
rename from tests/qemuxml2xmloutdata/graphics-listen-network2.xml
rename to tests/qemuxml2xmloutdata/graphics-listen-network2.x86_64-latest.xml
index 2df6a445405952cd408df301d3190d8cd6ce6260..e13bd7fe7438462ac2f4259deaf03ba17cc118ee 100644 (file)
@@ -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'>
similarity index 89%
rename from tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml
rename to tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.x86_64-latest.xml
index 8076df3ef413efdfcb62a6180c5fbd4dcb1fe2b8..87aff139e02f521afd7aa6b1c307fb44cac77ad4 100644 (file)
@@ -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'>
similarity index 89%
rename from tests/qemuxml2xmloutdata/graphics-sdl.xml
rename to tests/qemuxml2xmloutdata/graphics-sdl.x86_64-latest.xml
index 7516c8686ab394f9f1cbea86906b2198927a5fff..1be076b1066a01a82c2a62a424ac235ff2deb7d9 100644 (file)
@@ -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'>
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 db38c535d14c87780c25dbd6116111953e758938..9b3ec39e8a8086ff97a500c7cfd4eb0d418e5966 100644 (file)
@@ -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'>
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 383d00b05a2636826a4363b84e56c650174be751..15e81d1e362561165603bfe1a98439cdf17d8e97 100644 (file)
@@ -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'>
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 1e8a20146ca9d32a129ea2af27978d593a6c9585..f3c588080f815392b217506b350fefc55e5d30b8 100644 (file)
@@ -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'>
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 4a9e81b61190a75bc5feb9250cdb654986cf3beb..d22200086db110d564c648ded499ad8f5e131fb3 100644 (file)
@@ -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'>
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 86e00501d97505819923e0c069fbc195af7f5f0d..f61470a3392a6fa62f0bd8110d1d20c5ab1a1e34 100644 (file)
@@ -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'>
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 db38c535d14c87780c25dbd6116111953e758938..9b3ec39e8a8086ff97a500c7cfd4eb0d418e5966 100644 (file)
@@ -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'>
similarity index 90%
rename from tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-sasl.x86_64-latest.xml
index 98be9b48a56447f26445260d99c747a67818f4f6..359279bd5a31b40f432f42715365f93695cb7d10 100644 (file)
@@ -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'>
similarity index 88%
rename from tests/qemuxml2xmloutdata/graphics-vnc-socket.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-socket.x86_64-latest.xml
index e4a241b97161b0ce82e9b890d7993547a461dc84..726ba547c61f7509859d1c931c0ff4a0acaf93bd 100644 (file)
@@ -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'>
similarity index 88%
rename from tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-tls.x86_64-latest.xml
index 1205cd22a4ad6fc1806c5b4dcf0143d57e39a06d..8a2cd444ad3c07d50a5317e1cf3fe17e80595478 100644 (file)
@@ -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'>
similarity index 87%
rename from tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc-websocket.x86_64-latest.xml
index 91b4f4fb326488bd2a9ccd494be89e61c3296b52..09ff95becd498381a55ea0b4acb3897dc42f62d3 100644 (file)
@@ -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'/>
similarity index 90%
rename from tests/qemuxml2xmloutdata/graphics-vnc.xml
rename to tests/qemuxml2xmloutdata/graphics-vnc.x86_64-latest.xml
index 4a9e81b61190a75bc5feb9250cdb654986cf3beb..d22200086db110d564c648ded499ad8f5e131fb3 100644 (file)
@@ -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'>
similarity index 90%
rename from tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
rename to tests/qemuxml2xmloutdata/hostdev-mdev-display.x86_64-latest.xml
index bbcf3edde7d4816a6014e3d5c79214b2cd27c0d5..b2e3092370179dba397be5e561825622ad45fee4 100644 (file)
@@ -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'/>
similarity index 86%
rename from tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
rename to tests/qemuxml2xmloutdata/hostdev-mdev-precreated.x86_64-latest.xml
index ca83bbcbe0d0540890a6e9d9e1627e15a138ab2b..2f5f3184fcb140bc379c782577dbdd916044f6e3 100644 (file)
@@ -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>
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 0725857827081cad13258571b312c0c8aef32578..480d2f83630bfa89fe3e68f4bc6d22b67c9c603d 100644 (file)
@@ -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'>
similarity index 95%
rename from tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml
rename to tests/qemuxml2xmloutdata/hostdev-pci-multifunction.x86_64-latest.xml
index 489569b2896e486a024aacacb58567011ac74962..a29a27e85b2539b41073287822d7535a46890a27 100644 (file)
@@ -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'>
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 2f05bd49d11ff59e828305e42e826bd839955011..a0cc4e166937a36d39b8c2d6c81140861a146dc0 100644 (file)
@@ -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'>
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 40330a95c32f00754838a64f1edbb6e5e44ac270..4be00198289c6944cffbb3416ec79a9938ac4d95 100644 (file)
@@ -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'>
similarity index 95%
rename from tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-lsi.x86_64-latest.xml
index cec2136da97691167ebbfc5c45efb66c1481c088..e2193ae980ff323774da18e59dbb9ef8bf007fb2 100644 (file)
@@ -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'>
similarity index 91%
rename from tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
rename to tests/qemuxml2xmloutdata/hostdev-scsi-shareable.x86_64-latest.xml
index f0856fcfc3b391c091a05df9ce4c53b9bb7cf85c..f2beb0ade02a0be02c537586c1dd99825cb2e3ac 100644 (file)
@@ -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'>
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 59f2c8449e1debe6027a67b937cfb9d6b456c147..63fadb598c97ee8c0f6df56bd40049514e772af3 100644 (file)
@@ -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'>
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 2618216d8122cc4fab165df8f0d2ecd5fc3a334b..2c1d094f858221cd77a9a8a6e518423526a7959a 100644 (file)
@@ -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'>
similarity index 90%
rename from tests/qemuxml2xmloutdata/hostdev-vfio.xml
rename to tests/qemuxml2xmloutdata/hostdev-vfio.x86_64-latest.xml
index 03c836a84660171612f8fa80ef347213afa059e2..b660d245a1ad5451e6ba7fd05d0878159f3a6291 100644 (file)
@@ -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'>
similarity index 93%
rename from tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
rename to tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml
index 23f213dab04bc57bf48e724d5735222b0c1ede78..7c1b7b2c5d35ec1bf5230f7fe309c63513ab428a 100644 (file)
@@ -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'/>
similarity index 88%
rename from tests/qemuxml2xmloutdata/misc-disable-s3.xml
rename to tests/qemuxml2xmloutdata/misc-disable-s3.x86_64-latest.xml
index 48ce6745dba4ac3d7506aae1b8a151fdc543a3f2..2bee4e37ddf326113b9394c97db914edb3a49333 100644 (file)
@@ -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'>
similarity index 88%
rename from tests/qemuxml2xmloutdata/misc-disable-suspends.xml
rename to tests/qemuxml2xmloutdata/misc-disable-suspends.x86_64-latest.xml
index 0a58fa986b7a784972126bba0ab3bdef9835b6c9..e07a2010b1d612ebe1ba3445640eac46e7cb1d09 100644 (file)
@@ -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'>
similarity index 88%
rename from tests/qemuxml2xmloutdata/misc-enable-s4.xml
rename to tests/qemuxml2xmloutdata/misc-enable-s4.x86_64-latest.xml
index 7e8f8d5a3220d5449d50119e7a2015a41953b110..f00685d41014ddc289b95a59d17d8af3c165f10f 100644 (file)
@@ -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'>
similarity index 85%
rename from tests/qemuxml2xmloutdata/panic-double.xml
rename to tests/qemuxml2xmloutdata/panic-double.x86_64-latest.xml
index f58633b341cf3b80685627d75fbba3e5060e5690..7cff4a4a5f9775183a0efa68b6001ca2c31e279d 100644 (file)
   <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'/>
similarity index 89%
rename from tests/qemuxml2xmloutdata/panic-no-address.xml
rename to tests/qemuxml2xmloutdata/panic-no-address.x86_64-latest.xml
index e85af86096d1dc4ccab54847610421fea8cfc116..098bd3d0362e5375e087d36ed80373da73fad00c 100644 (file)
@@ -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'/>
similarity index 89%
rename from tests/qemuxml2xmloutdata/panic.xml
rename to tests/qemuxml2xmloutdata/panic.x86_64-latest.xml
index f78adc2816877a16572e0a80953e833cec49f60f..899613a0ef14883e821fb116a2f001fc3c3af347 100644 (file)
@@ -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'/>
similarity index 95%
rename from tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
rename to tests/qemuxml2xmloutdata/pci-autoadd-addr.x86_64-latest.xml
index 2670c9d95114dd535683cdf8607901aa5e3851d6..7d625b2d6eeccfcdaa5e9244edb77ee6b4f6ddc1 100644 (file)
@@ -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'>
similarity index 95%
rename from tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
rename to tests/qemuxml2xmloutdata/pci-autoadd-idx.x86_64-latest.xml
index 8812868ba8d666d915b77e8802ef71c675adad0b..285a69c93709eb1c4125b7403d5b2d337c3d8a19 100644 (file)
@@ -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'>
similarity index 90%
rename from tests/qemuxml2xmloutdata/pci-autofill-addr.xml
rename to tests/qemuxml2xmloutdata/pci-autofill-addr.x86_64-latest.xml
index e12dc4bae36da0c310d870291451a569a2b67e01..2498863acc85e01112f795b0055c1e623f829137 100644 (file)
@@ -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'>
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 12caf1fb9c9b485189f2d3f34bf5ebb383d53b4f..d188e16b4ea3a900f0fe7daf038923933d45afef 100644 (file)
@@ -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>
       <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'/>
similarity index 98%
rename from tests/qemuxml2xmloutdata/pci-bridge.xml
rename to tests/qemuxml2xmloutdata/pci-bridge.x86_64-latest.xml
index 46e42a8bc360ec48d31b872398063df0437c5021..45bdd0ec8fcd9d241eb3f497c97b7bc528e5ff92 100644 (file)
@@ -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'>
similarity index 98%
rename from tests/qemuxml2xmloutdata/pci-expander-bus.xml
rename to tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml
index 7263d71e9a6106a8aed643e5ed538f54ac022ae2..b63c8c145a6ae29113bfbb7ab4c6221b3818220e 100644 (file)
@@ -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'/>
similarity index 98%
rename from tests/qemuxml2xmloutdata/pci-many.xml
rename to tests/qemuxml2xmloutdata/pci-many.x86_64-latest.xml
index 635bccc696c5d76b6505ac1044fb35d71af61f3b..23af8181c3de565f00a033c523ecf7a08aa252d9 100644 (file)
@@ -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>
       <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'>
similarity index 96%
rename from tests/qemuxml2xmloutdata/pcie-expander-bus.xml
rename to tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml
index bb614096c4f9449fdfe4d513a15036bf6743ab99..a441be8ebe6ec85058bdf0694b3bf90c04bd633b 100644 (file)
@@ -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>
       <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'/>
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 1d287541cc13dfec17a60caed2eb3375de5bab42..7c208d00a72efe7d59808e86290dc3b482aa2132 100644 (file)
@@ -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>
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 efa33990defe7c4fe084a7af062a3833533adb83..8e829d5468c10051e110f56720591ece88866958 100644 (file)
@@ -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>
similarity index 85%
rename from tests/qemuxml2xmloutdata/pcie-root-port.xml
rename to tests/qemuxml2xmloutdata/pcie-root-port.x86_64-latest.xml
index cb435930320cbc9df985d1f0c589235c8b6b0faa..32afb7c4782596335127d3b2066307896aeebfcc 100644 (file)
@@ -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 (file)
index 0000000..7c2c904
--- /dev/null
@@ -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 (file)
index b014024..0000000
+++ /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>
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 7902511ef359dcff2db5183d06cf8f447786132d..bc61f27a87bef338392d09b772c6a109de63109b 100644 (file)
@@ -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 (file)
index 0000000..14bc417
--- /dev/null
@@ -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>
similarity index 65%
rename from tests/qemuxml2xmloutdata/q35.xml
rename to tests/qemuxml2xmloutdata/pcihole64-q35.x86_64-latest.xml
index c7f0e19deb20d2ce66b320abd8a104f1916c7fee..e6e1f11f98710df3f5408bfb9509db8838d59f20 100644 (file)
@@ -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>
       <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 (file)
index b47c524..0000000
+++ /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>
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 7490e7095a128cda286d17092501217ba20ce07b..e9c75305fda3c111c3245b08625b53d904499ff1 100644 (file)
@@ -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>
similarity index 97%
rename from tests/qemuxml2xmloutdata/q35-usb2-multi.xml
rename to tests/qemuxml2xmloutdata/q35-usb2-multi.x86_64-latest.xml
index 019a4d2765e98dc45db493b12bd2ce219ffdba40..b6e6c46abc9e73ba2357e175000ccea2a49a87fe 100644 (file)
@@ -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>
similarity index 97%
rename from tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
rename to tests/qemuxml2xmloutdata/q35-usb2-reorder.x86_64-latest.xml
index 2a9342c4d66f883fc273691a3d77b3da8a87b2ef..db57e8ae5ce468b4aac980f5762e348562364d6a 100644 (file)
@@ -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>
similarity index 96%
rename from tests/qemuxml2xmloutdata/q35-usb2.xml
rename to tests/qemuxml2xmloutdata/q35-usb2.x86_64-latest.xml
index 9e0c3da063442bfd9382af8e6825a11d6fe4465f..b860ae2dee66f7b432d621f9af3f2a55e65a7502 100644 (file)
@@ -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>
similarity index 83%
rename from tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
rename to tests/qemuxml2xmloutdata/q35.x86_64-latest.xml
index d0d9d2a5749b491f38f5a3d47420340a2cf6e8a9..909f94fe2c235b6e9322ab6550ed5b6d255eda90 100644 (file)
@@ -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>
       <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'/>
similarity index 92%
rename from tests/qemuxml2xmloutdata/serial-spiceport.xml
rename to tests/qemuxml2xmloutdata/serial-spiceport.x86_64-latest.xml
index c8cf9a4de5af6e86fc6d6408cf8960c0b44122fc..c01136a4506fc9ba65bff89666c5457df4e909b0 100644 (file)
@@ -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'>
similarity index 86%
rename from tests/qemuxml2xmloutdata/smartcard-host.xml
rename to tests/qemuxml2xmloutdata/smartcard-controller.x86_64-latest.xml
index c8bc4fae8806d58dce7979a389fe1252416ced04..094ebebb6301c84f3ab7c7a950dc36c48f5921b3 100644 (file)
@@ -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>
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 2a6a697f564fdedeba67957fd2f198dd37ec2723..6b443767033709df0564538e65533cdfb39db198 100644 (file)
@@ -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'/>
similarity index 88%
rename from tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
rename to tests/qemuxml2xmloutdata/smartcard-host-certificates.x86_64-latest.xml
index ef776fd6596923aa72edac017cf173c742aaffed..40434e5f4619fe8ed06472ed5e68d3400234e7aa 100644 (file)
@@ -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'/>
similarity index 86%
rename from tests/qemuxml2xmloutdata/smartcard-controller.xml
rename to tests/qemuxml2xmloutdata/smartcard-host.x86_64-latest.xml
index d606a10cf8a1d92af1d5d9f45a1d6942c4718b96..505f0750e6a71db9eca6c37a7d6e15bcdd84619a 100644 (file)
@@ -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>
similarity index 89%
rename from tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
rename to tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.x86_64-latest.xml
index 656c41bb6d62b8ab99cea2abb7a43802a780e7f4..ed9d2714ca4dfe59c8a9df0e1ddcdc6c54ad2f9c 100644 (file)
@@ -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'/>
similarity index 87%
rename from tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
rename to tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.x86_64-latest.xml
index e3d66b5ebf0d50ab8f0f6c975c4469bdcc0f2c66..4a8bc9079d6a4540f0199216f215dcfdd618fe69 100644 (file)
@@ -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'/>
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 4b307f3b7b349b308201a0c821b2095259740193..fa67c860bb4c5870262423ec541c6b5aee3810d1 100644 (file)
@@ -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>
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 a64ff769df7051e659e37e92513617f296619ead..e6f61c20c38cf525c3e3b0d876f9666e496e2ca4 100644 (file)
@@ -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>
similarity index 90%
rename from tests/qemuxml2xmloutdata/usb-piix3-controller.xml
rename to tests/qemuxml2xmloutdata/usb-piix3-controller.x86_64-latest.xml
index 5071b6a3d9564b2be0bb4df21bcfcac2475e7b3d..c74353b0563c83e1384a5e4c64545fe21ed25709 100644 (file)
@@ -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>
similarity index 87%
rename from tests/qemuxml2xmloutdata/usb-port-missing.xml
rename to tests/qemuxml2xmloutdata/usb-port-missing.x86_64-latest.xml
index def74a1ffc362581c4ecfb55e3d0fc4df8192401..5969a91ac4840906c06b33af80577609b02026d8 100644 (file)
@@ -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'/>
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 28764678d953fe91e025a7beb3ff548972ede7ea..78685ad86c5b5befc799c2876b94470480a1c3b3 100644 (file)
@@ -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'/>
similarity index 95%
rename from tests/qemuxml2xmloutdata/usb-redir-filter.xml
rename to tests/qemuxml2xmloutdata/usb-redir-filter.x86_64-latest.xml
index e78cb9de7105f1e35c5bc15bfa31eafff5c6f230..befea8698d6cfdddd5e64dd6b0bc438796f0a58d 100644 (file)
@@ -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>
similarity index 95%
rename from tests/qemuxml2xmloutdata/usb-redir.xml
rename to tests/qemuxml2xmloutdata/usb-redir.x86_64-latest.xml
index a972f811e4aecc2d6a29550ef7a3ac17c1924736..e2e5879bcee1096f957a599c249b6d478d4d5488 100644 (file)
@@ -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>
similarity index 87%
rename from tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
rename to tests/qemuxml2xmloutdata/virtio-input-passthrough.x86_64-latest.xml
index 24f5c2d06bc046a4fb3583a90b2438ca28454f26..b1a34318c6ef2650acf08bea0542af1423e7b75a 100644 (file)
@@ -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'/>
similarity index 89%
rename from tests/qemuxml2xmloutdata/virtio-input.xml
rename to tests/qemuxml2xmloutdata/virtio-input.x86_64-latest.xml
index 76f3b5122b4a926254eae4bc1d03bebf9e9242cf..e9c7a3676ccd6a085882d2672a1af8ee69d0cccc 100644 (file)
@@ -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'/>
similarity index 88%
rename from tests/qemuxml2xmloutdata/virtio-rng-egd.xml
rename to tests/qemuxml2xmloutdata/virtio-rng-egd.x86_64-latest.xml
index 5127097e845f9ba32434abd946d37519899efc8d..2f8fa0bb77f8ffe26bbd63209604d9390da838b1 100644 (file)
@@ -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'/>
similarity index 87%
rename from tests/qemuxml2xmloutdata/virtio-rng-random.xml
rename to tests/qemuxml2xmloutdata/virtio-rng-random.x86_64-latest.xml
index a089b5e70223029fd96311b4bbf8fe309c1ae443..38bd67a84e77eb9649a85457b0e3eeba33e93c45 100644 (file)
@@ -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'/>
similarity index 89%
rename from tests/qemuxml2xmloutdata/vmcoreinfo.xml
rename to tests/qemuxml2xmloutdata/vmcoreinfo.x86_64-latest.xml
index 9e749389577c6a29b6a25008d461f2550021a363..0290d9c8dd3cda486972f121ab8f5076623791ae 100644 (file)
@@ -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'/>
index 5e7430f0cb05419790a4531b39ebecd48d5bc522..b1989cbb5fb4e523bd76a1913acffb2b420f6400 100644 (file)
@@ -190,10 +190,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 */
@@ -215,9 +211,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");
@@ -235,7 +229,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");
@@ -290,9 +284,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");
@@ -304,8 +298,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");
@@ -322,51 +315,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");
@@ -380,8 +347,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");
@@ -396,21 +363,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");
@@ -451,9 +413,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");
@@ -468,9 +428,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");
@@ -478,12 +438,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");
@@ -526,34 +482,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");
@@ -578,8 +515,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");
 
@@ -591,12 +527,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");
@@ -636,13 +568,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");
@@ -661,134 +590,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");
@@ -804,14 +653,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");
@@ -825,9 +671,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");
@@ -841,7 +685,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");
 
@@ -998,15 +842,14 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST("memory-hotplug-ppc64-nonuma", "ppc64");
     DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("memory-hotplug-ppc64-nonuma-abi-update", "ppc64");
     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_CAPS_ARCH_LATEST_ABI_UPDATE("memory-hotplug-nvdimm-ppc64-abi-update", "ppc64");
     DO_TEST_CAPS_LATEST("memory-hotplug-virtio-pmem");
@@ -1020,12 +863,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");
 
@@ -1074,18 +913,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");