]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemuxml2xmltest: Convert rest of 'DO_TEST_NOCAPS' cases to 'DO_TEST_CAPS_LATEST'
authorPeter Krempa <pkrempa@redhat.com>
Tue, 15 Aug 2023 11:27:41 +0000 (13:27 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 22 Aug 2023 12:04:41 +0000 (14:04 +0200)
Finish the conversion of cases which didn't need any special
capabilities to use real capabilities.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
92 files changed:
tests/qemuxml2argvdata/net-mtu.xml
tests/qemuxml2argvdata/pages-discard.xml
tests/qemuxml2xmloutdata/acpi-table.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/acpi-table.xml with 87% similarity]
tests/qemuxml2xmloutdata/boot-cdrom.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/boot-cdrom.xml with 88% similarity]
tests/qemuxml2xmloutdata/boot-floppy.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/boot-floppy.xml with 90% similarity]
tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/boot-menu-disable.xml with 89% similarity]
tests/qemuxml2xmloutdata/boot-menu-disable.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml with 89% similarity]
tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml with 89% similarity]
tests/qemuxml2xmloutdata/boot-multi.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/boot-multi.xml with 89% similarity]
tests/qemuxml2xmloutdata/boot-network.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/boot-network.xml with 88% similarity]
tests/qemuxml2xmloutdata/boot-order.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/boot-order.xml with 93% similarity]
tests/qemuxml2xmloutdata/channel-unix-source-path-active.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml with 94% similarity]
tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml with 92% similarity]
tests/qemuxml2xmloutdata/console-compat-auto.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/console-compat-auto.xml with 90% similarity]
tests/qemuxml2xmloutdata/console-compat.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/console-compat.xml with 89% similarity]
tests/qemuxml2xmloutdata/cpu-check-default-none.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-check-default-none.xml with 88% similarity]
tests/qemuxml2xmloutdata/cpu-check-default-none2.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-check-default-none2.xml with 94% similarity]
tests/qemuxml2xmloutdata/cpu-check-default-partial.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-check-default-partial.xml with 94% similarity]
tests/qemuxml2xmloutdata/cpu-check-default-partial2.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-check-partial.xml with 94% similarity]
tests/qemuxml2xmloutdata/cpu-check-full.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-check-full.xml with 94% similarity]
tests/qemuxml2xmloutdata/cpu-check-none.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-check-none.xml with 94% similarity]
tests/qemuxml2xmloutdata/cpu-check-partial.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml with 94% similarity]
tests/qemuxml2xmloutdata/cpu-empty.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-empty.xml with 85% similarity]
tests/qemuxml2xmloutdata/cpu-eoi-disabled.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml with 95% similarity]
tests/qemuxml2xmloutdata/cpu-eoi-enabled.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml with 95% similarity]
tests/qemuxml2xmloutdata/cpu-host-kvmclock.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml with 89% similarity]
tests/qemuxml2xmloutdata/cpu-host-model-vendor.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml with 94% similarity]
tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml with 88% similarity]
tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-numa-disordered.xml with 88% similarity]
tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-numa-memshared.xml with 88% similarity]
tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-numa1.xml with 88% similarity]
tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-numa2.xml with 88% similarity]
tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml with 88% similarity]
tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/default-kvm-host-arch.xml with 79% similarity]
tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/default-qemu-host-arch.xml with 79% similarity]
tests/qemuxml2xmloutdata/disk-aio.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-aio.xml with 90% similarity]
tests/qemuxml2xmloutdata/disk-backing-chains-index-active.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml with 97% similarity]
tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml with 97% similarity]
tests/qemuxml2xmloutdata/disk-backing-chains-noindex.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml with 97% similarity]
tests/qemuxml2xmloutdata/disk-boot-cdrom.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-boot-cdrom.xml with 90% similarity]
tests/qemuxml2xmloutdata/disk-boot-disk.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-boot-disk.xml with 90% similarity]
tests/qemuxml2xmloutdata/disk-cdrom.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-cdrom.xml with 92% similarity]
tests/qemuxml2xmloutdata/disk-copy_on_read.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-copy_on_read.xml with 91% similarity]
tests/qemuxml2xmloutdata/disk-error-policy.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-error-policy.xml with 91% similarity]
tests/qemuxml2xmloutdata/disk-floppy.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-floppy.xml with 91% similarity]
tests/qemuxml2xmloutdata/disk-fmt-qcow.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-fmt-qcow.xml with 90% similarity]
tests/qemuxml2xmloutdata/disk-network-gluster.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-network-gluster.xml with 92% similarity]
tests/qemuxml2xmloutdata/disk-network-nbd.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-network-nbd.xml with 94% similarity]
tests/qemuxml2xmloutdata/disk-network-rbd.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-network-rbd.xml with 95% similarity]
tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-network-sheepdog.xml with 90% similarity]
tests/qemuxml2xmloutdata/disk-network-source-auth.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-network-source-auth.xml with 93% similarity]
tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.xml with 87% similarity]
tests/qemuxml2xmloutdata/disk-serial.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-serial.xml with 92% similarity]
tests/qemuxml2xmloutdata/disk-source-pool-mode.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-source-pool-mode.xml with 94% similarity]
tests/qemuxml2xmloutdata/disk-source-pool.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-source-pool.xml with 93% similarity]
tests/qemuxml2xmloutdata/disk-virtio.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/disk-virtio.xml with 92% similarity]
tests/qemuxml2xmloutdata/downscript.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/downscript.xml with 100% similarity]
tests/qemuxml2xmloutdata/eoi-disabled.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/eoi-disabled.xml with 86% similarity]
tests/qemuxml2xmloutdata/eoi-enabled.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/eoi-enabled.xml with 86% similarity]
tests/qemuxml2xmloutdata/event_idx.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/event_idx.xml with 92% similarity]
tests/qemuxml2xmloutdata/floppy-drive-fat.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/floppy-drive-fat.xml with 89% similarity]
tests/qemuxml2xmloutdata/hyperv-off.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/hyperv-off.xml with 89% similarity]
tests/qemuxml2xmloutdata/hyperv-panic.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/hyperv-panic.xml with 84% similarity]
tests/qemuxml2xmloutdata/hyperv-passthrough.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/hyperv-passthrough.xml with 85% similarity]
tests/qemuxml2xmloutdata/hyperv-stimer-direct.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml with 86% similarity]
tests/qemuxml2xmloutdata/hyperv.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/hyperv.xml with 89% similarity]
tests/qemuxml2xmloutdata/interface-driver.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/interface-driver.xml with 93% similarity]
tests/qemuxml2xmloutdata/misc-no-reboot.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/misc-no-reboot.xml with 88% similarity]
tests/qemuxml2xmloutdata/net-coalesce.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/net-coalesce.xml with 94% similarity]
tests/qemuxml2xmloutdata/net-mtu.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/net-mtu.xml with 100% similarity]
tests/qemuxml2xmloutdata/net-user.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/net-user.xml with 89% similarity]
tests/qemuxml2xmloutdata/net-vhostuser.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/net-vhostuser.xml with 91% similarity]
tests/qemuxml2xmloutdata/numatune-auto-prefer.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/numatune-auto-prefer.xml with 87% similarity]
tests/qemuxml2xmloutdata/numatune-distances.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/numatune-distances.xml with 95% similarity]
tests/qemuxml2xmloutdata/numatune-memnode-no-memory.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml with 88% similarity]
tests/qemuxml2xmloutdata/numatune-memnode.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/numatune-memnode.xml with 89% similarity]
tests/qemuxml2xmloutdata/pages-discard.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pages-discard.xml with 100% similarity]
tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml with 90% similarity]
tests/qemuxml2xmloutdata/pci-rom-disabled.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pci-rom-disabled.xml with 90% similarity]
tests/qemuxml2xmloutdata/pci-serial-dev-chardev.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml with 91% similarity]
tests/qemuxml2xmloutdata/pcihole64-gib.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pcihole64-gib.xml with 86% similarity]
tests/qemuxml2xmloutdata/pcihole64.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pcihole64.xml with 86% similarity]
tests/qemuxml2xmloutdata/pv-spinlock-disabled.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml with 86% similarity]
tests/qemuxml2xmloutdata/pv-spinlock-enabled.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml with 86% similarity]
tests/qemuxml2xmloutdata/serial-debugcon.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/serial-debugcon.xml with 87% similarity]
tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml with 92% similarity]
tests/qemuxml2xmloutdata/tap-vhost-incorrect.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml with 92% similarity]
tests/qemuxml2xmloutdata/tap-vhost.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/tap-vhost.xml with 93% similarity]
tests/qemuxml2xmloutdata/vhost_queues.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/vhost_queues.xml with 93% similarity]
tests/qemuxml2xmloutdata/virtio-lun.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/virtio-lun.xml with 92% similarity]
tests/qemuxml2xmloutdata/watchdog.x86_64-latest.xml [moved from tests/qemuxml2xmloutdata/watchdog.xml with 88% similarity]
tests/qemuxml2xmltest.c

index 092978bea0401c78f55a62a0ebac389d77f3bf97..04fa1a2686994a34f4a16e1bd7c6159d5f49592b 100644 (file)
@@ -10,6 +10,9 @@
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -29,7 +32,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='virtio-serial' index='0'>
index 99b842dabf4702dcd98540deb73db16d20096ea1..7d7f3351f00e51a3834380cbfef8d93d19459d8f 100644 (file)
@@ -11,7 +11,8 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <cpu>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
     <numa>
       <cell id='0' cpus='0' memory='1048576' unit='KiB'/>
       <cell id='1' cpus='1' memory='1048576' unit='KiB' discard='no'/>
@@ -25,7 +26,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 87%
rename from tests/qemuxml2xmloutdata/acpi-table.xml
rename to tests/qemuxml2xmloutdata/acpi-table.x86_64-latest.xml
index 5a6c859bad18a60e0439ed7dc9907fe62fd49c85..577de310fccf69c2a6d492479c19b545682a262b 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='ide' index='0'>
similarity index 88%
rename from tests/qemuxml2xmloutdata/boot-cdrom.xml
rename to tests/qemuxml2xmloutdata/boot-cdrom.x86_64-latest.xml
index 4666777e56c8a750c7962dcfc60b172b16dd9852..8589f05399a76fb73177177cde28eb8b1d66e480 100644 (file)
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 90%
rename from tests/qemuxml2xmloutdata/boot-floppy.xml
rename to tests/qemuxml2xmloutdata/boot-floppy.x86_64-latest.xml
index 7c163b5c99f5eb8a560cedd3668a59b8f6d613ea..97e3d6c17d3a4a07f20201157bd00d7e229b7147 100644 (file)
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='fd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -26,7 +29,7 @@
       <target dev='fda' bus='fdc'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='fdc' index='0'/>
similarity index 89%
rename from tests/qemuxml2xmloutdata/boot-menu-disable.xml
rename to tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.x86_64-latest.xml
index 04c8d42513fe4b8e9c9b3a8e8136204d15dd0e26..62549d7ea037492100cf842431b5d4c9b6e34000 100644 (file)
@@ -9,6 +9,9 @@
     <boot dev='cdrom'/>
     <bootmenu enable='no'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -22,7 +25,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 89%
rename from tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
rename to tests/qemuxml2xmloutdata/boot-menu-disable.x86_64-latest.xml
index 04c8d42513fe4b8e9c9b3a8e8136204d15dd0e26..62549d7ea037492100cf842431b5d4c9b6e34000 100644 (file)
@@ -9,6 +9,9 @@
     <boot dev='cdrom'/>
     <bootmenu enable='no'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -22,7 +25,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 89%
rename from tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
rename to tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.x86_64-latest.xml
index e951750af5234f9b076022e982523c4bf63bd0f3..64888293bd8f9d8c9ead1c55e9f44f5494856adf 100644 (file)
@@ -9,6 +9,9 @@
     <boot dev='cdrom'/>
     <bootmenu enable='yes' timeout='3000'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -22,7 +25,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 89%
rename from tests/qemuxml2xmloutdata/boot-multi.xml
rename to tests/qemuxml2xmloutdata/boot-multi.x86_64-latest.xml
index 8c16bd9d1175d0d266b8a45f6be711cd75ea02f1..bb44173f6028d18b19e1038b540bad8171fe426d 100644 (file)
@@ -12,6 +12,9 @@
     <boot dev='fd'/>
     <bootmenu enable='yes'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -25,7 +28,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 88%
rename from tests/qemuxml2xmloutdata/boot-network.xml
rename to tests/qemuxml2xmloutdata/boot-network.x86_64-latest.xml
index 4722ede3b7b00b665ce6398fef5cf2eb604dfc05..0e60dbe5edaa09c7887126809bb1adecdfafb4bd 100644 (file)
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='network'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 93%
rename from tests/qemuxml2xmloutdata/boot-order.xml
rename to tests/qemuxml2xmloutdata/boot-order.x86_64-latest.xml
index 843bebda9c06d000d0220bb4aad671d36d7c1564..64f5880c8ad38b1d7cd985a020552faae5c806f6 100644 (file)
@@ -7,6 +7,9 @@
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -43,7 +46,7 @@
       <boot order='4'/>
       <address type='drive' controller='0' bus='0' target='0' unit='1'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 94%
rename from tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml
rename to tests/qemuxml2xmloutdata/channel-unix-source-path-active.x86_64-latest.xml
index ec927d37c68d9eaf3adb4814f4f6ad0bfa7fc918..022ad7025a05cbd1481a8e0213c4eddd1bc6f17f 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 92%
rename from tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml
rename to tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.x86_64-latest.xml
index c979bedb3929ee7e287c8eaf13a4e5bb10727562..3b013e9f8709fcd9f099c80b5f99859b732e5134 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/console-compat-auto.xml
rename to tests/qemuxml2xmloutdata/console-compat-auto.x86_64-latest.xml
index 19c72f811dbf2fcba1ba99fcb5aea8d29d98e399..59c454375ccafb35327024532e95d3ea8796f07c 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/console-compat.xml
rename to tests/qemuxml2xmloutdata/console-compat.x86_64-latest.xml
index ffa6eda9c6184e56915ec390155c897780adf9da..fd9e073e7b9bacf87c6125068c16327aac611065 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/cpu-check-default-none.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-none.x86_64-latest.xml
index d2ec332183057ab9f531fd9309a2e5dc74c9631c..9b17034cd248df6d8ff57bdf409e7ddfc3bec57f 100644 (file)
@@ -8,14 +8,14 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='network'/>
   </os>
-  <cpu mode='host-passthrough' check='none' migratable='off'/>
+  <cpu mode='host-passthrough' check='none' migratable='on'/>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-none2.x86_64-latest.xml
index a7b593231410c06570f97a47deb6dee445d47ab0..5e230fcf287bda1ed9f2e83ed9de131ad148a907 100644 (file)
@@ -17,7 +17,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-partial.x86_64-latest.xml
index ab1a42929d62de00ee79d5193624c367cb81d55f..8772918cdc28403cf696c202df92eab81e226171 100644 (file)
@@ -15,7 +15,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-partial.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-partial2.x86_64-latest.xml
index 98f2fc8fd06d43af37b9619918a4e3cc99703482..1b45eecbefcc373e457b912fd5a1a725777047eb 100644 (file)
@@ -17,7 +17,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-full.xml
rename to tests/qemuxml2xmloutdata/cpu-check-full.x86_64-latest.xml
index 11fa1349a235b05acf57188206d57c955d1438f7..affa241df25dfcc2c5aae74aa8d8d4ce9092ff26 100644 (file)
@@ -17,7 +17,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-none.xml
rename to tests/qemuxml2xmloutdata/cpu-check-none.x86_64-latest.xml
index 4bf679692cdda3de91c26c856ae2f9f1f2819d68..cbe3910a4abb65bec14b439b334f75ae803d20b9 100644 (file)
@@ -17,7 +17,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
rename to tests/qemuxml2xmloutdata/cpu-check-partial.x86_64-latest.xml
index 98f2fc8fd06d43af37b9619918a4e3cc99703482..1b45eecbefcc373e457b912fd5a1a725777047eb 100644 (file)
@@ -17,7 +17,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 85%
rename from tests/qemuxml2xmloutdata/cpu-empty.xml
rename to tests/qemuxml2xmloutdata/cpu-empty.x86_64-latest.xml
index ee700da00dcf57c915d5388f28dfd2e42b9ef40a..3d64e0cfbfa6499e4768c6cb52f6c8ed31d27f20 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/cpu-eoi-disabled.xml
rename to tests/qemuxml2xmloutdata/cpu-eoi-disabled.x86_64-latest.xml
index acd17da598193a40891f1f2bfa2fe6a9e2db489f..67a5fa4e863d295f171e3901f133f608b26366ba 100644 (file)
@@ -22,7 +22,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 95%
rename from tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
rename to tests/qemuxml2xmloutdata/cpu-eoi-enabled.x86_64-latest.xml
index 49900aea9a43a13830141094fdd6c3bff101b1d6..fcde7a68770a5b0b8fe3a5d8fd25e4abb83f22ca 100644 (file)
@@ -22,7 +22,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 89%
rename from tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
rename to tests/qemuxml2xmloutdata/cpu-host-kvmclock.x86_64-latest.xml
index 8de03f032caf3265bd25ba8524f292d0e046f3b3..f789f34d3d5173ea02eb86b2f1d5c36d3ae9d465 100644 (file)
@@ -8,7 +8,7 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='network'/>
   </os>
-  <cpu mode='host-passthrough' check='none' migratable='off'/>
+  <cpu mode='host-passthrough' check='none' migratable='on'/>
   <clock offset='utc'>
     <timer name='kvmclock' present='no'/>
   </clock>
@@ -17,7 +17,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
rename to tests/qemuxml2xmloutdata/cpu-host-model-vendor.x86_64-latest.xml
index 482edbeb3dc9f9f25e389eec40baa12f897472c9..f1ef384558bb2cf2426aa8128a69aace0f37f00b 100644 (file)
@@ -17,7 +17,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml
index 58707b0d11fd6b486eb5a979ff6aec8aaf737832..fa2ec31463fd77000e8d4a50cc86f42d119e4f3c 100644 (file)
@@ -8,7 +8,8 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='network'/>
   </os>
-  <cpu>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
     <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='0' cpus='0-3,8-11' memory='109550' unit='KiB'/>
@@ -21,7 +22,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml
index 3d57037bf11235299e8a47b7c68dc25d7b4e0cfe..1b4d0bfa6793c35e24abb8cbf31224135b191a69 100644 (file)
@@ -8,7 +8,8 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='network'/>
   </os>
-  <cpu>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
     <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='0' cpus='0-5' memory='109550' unit='KiB'/>
@@ -22,7 +23,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml
index 1883a8368dc8a08b81368dbe4e6ba244927dd0e9..47ed9efd69b8a4fddcc5c0059309f13f5a5ee15e 100644 (file)
@@ -8,7 +8,8 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='network'/>
   </os>
-  <cpu>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
     <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='0' cpus='0-7' memory='109550' unit='KiB' memAccess='shared'/>
@@ -21,7 +22,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa1.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml
index 02c12542c0161b7e7813e66c2541fbe7431724e6..57bbacdff09d4a46a3334d6ac10f6296d75f1f2d 100644 (file)
@@ -8,7 +8,8 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='network'/>
   </os>
-  <cpu>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
     <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
@@ -21,7 +22,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa2.xml
rename to tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml
index 02c12542c0161b7e7813e66c2541fbe7431724e6..57bbacdff09d4a46a3334d6ac10f6296d75f1f2d 100644 (file)
@@ -8,7 +8,8 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='network'/>
   </os>
-  <cpu>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
     <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
@@ -21,7 +22,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
rename to tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml
index 02c12542c0161b7e7813e66c2541fbe7431724e6..57bbacdff09d4a46a3334d6ac10f6296d75f1f2d 100644 (file)
@@ -8,7 +8,8 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='network'/>
   </os>
-  <cpu>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
     <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
@@ -21,7 +22,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 79%
rename from tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
rename to tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml
index c9f09b2231722aabc0c50593b5a35db6f60b3dc3..a9de07d41cd945a741d1e7888778c30af2532639 100644 (file)
@@ -5,16 +5,19 @@
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static'>4</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-8.1'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 79%
rename from tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
rename to tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml
index 9e3cbab7f85425731396849693bb45f61372cef7..37673010f6b7eb966495fd786070d454937c5618 100644 (file)
@@ -5,16 +5,19 @@
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static'>4</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-8.1'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-aio.xml
rename to tests/qemuxml2xmloutdata/disk-aio.x86_64-latest.xml
index b65bb70589c11806ac35f5d70a4c52eae8d8b92a..11e175d26afad9f9187d51e363ce34c5e3140ddb 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>
@@ -27,7 +30,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 97%
rename from tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
rename to tests/qemuxml2xmloutdata/disk-backing-chains-index-active.x86_64-latest.xml
index 4f30bc7111f30845ad3355a80608ae4cdd241bb3..52c8ad6f2923f31a5012667bd5155b4b4ad4d093 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>
       <target dev='vdf' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 97%
rename from tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
rename to tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.x86_64-latest.xml
index c992679b36a86a10ba1aae13d64f13872a2e19cd..ad81cd4696887a67f9cc83bb0fb96ccad7302383 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>
       <target dev='vdf' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 97%
rename from tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
rename to tests/qemuxml2xmloutdata/disk-backing-chains-noindex.x86_64-latest.xml
index c992679b36a86a10ba1aae13d64f13872a2e19cd..ad81cd4696887a67f9cc83bb0fb96ccad7302383 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>
       <target dev='vdf' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-boot-cdrom.xml
rename to tests/qemuxml2xmloutdata/disk-boot-cdrom.x86_64-latest.xml
index 329e29b8dbc5d92b6b8c9ba2e9df64da47889545..a322bb4a0c64ed39d2ff173997eee2f0da1b6065 100644 (file)
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -27,7 +30,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-boot-disk.xml
rename to tests/qemuxml2xmloutdata/disk-boot-disk.x86_64-latest.xml
index 55e94633dd19b01bb3100ed989e866e0ce3773a8..07020849a5eb4d6a04baabee0ee7b31b58640049 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>
@@ -27,7 +30,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 92%
rename from tests/qemuxml2xmloutdata/disk-cdrom.xml
rename to tests/qemuxml2xmloutdata/disk-cdrom.x86_64-latest.xml
index ff70ce4d97b028f9b2e9de0810be3900c69bb7f1..0a6e32ada1c8d743eb3979f2b97ebbea6e11313f 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>
@@ -40,7 +43,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='1'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 91%
rename from tests/qemuxml2xmloutdata/disk-copy_on_read.xml
rename to tests/qemuxml2xmloutdata/disk-copy_on_read.x86_64-latest.xml
index ae76cbafad743b37b1338604eca7ffec84d1f8a8..9a55b7e04a78be78f6c8aee0247a7779d99d28be 100644 (file)
@@ -10,6 +10,9 @@
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -29,7 +32,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='virtio-serial' index='0'>
similarity index 91%
rename from tests/qemuxml2xmloutdata/disk-error-policy.xml
rename to tests/qemuxml2xmloutdata/disk-error-policy.x86_64-latest.xml
index 7cc5bd3ca564fe9490173871e07fadec6060d5dd..d50d7dd5c5e60fdb59988363c8dcfa4b8d9c8ead 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='hdc' bus='ide'/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 91%
rename from tests/qemuxml2xmloutdata/disk-floppy.xml
rename to tests/qemuxml2xmloutdata/disk-floppy.x86_64-latest.xml
index 1599ad2180ce69f19dc875204bc53bf06ddcc009..3542fbb6a9c7f2ea56a2d8a55b4698acd5f56ae7 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='fdb' bus='fdc'/>
       <address type='drive' controller='0' bus='0' target='0' unit='1'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='fdc' index='0'/>
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-fmt-qcow.xml
rename to tests/qemuxml2xmloutdata/disk-fmt-qcow.x86_64-latest.xml
index b177021d61dac66b4f5acefd3d9f798a4a88dace..11ec85a9edf312e43c18ff850734710d02768904 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>
@@ -27,7 +30,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 92%
rename from tests/qemuxml2xmloutdata/disk-network-gluster.xml
rename to tests/qemuxml2xmloutdata/disk-network-gluster.x86_64-latest.xml
index 4be82efe355fd828408ea796c3cb81617580690b..3213a6d7c41b305b813e135b98b39f12c2c24dd3 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>
@@ -40,7 +43,7 @@
       <target dev='vdc' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 94%
rename from tests/qemuxml2xmloutdata/disk-network-nbd.xml
rename to tests/qemuxml2xmloutdata/disk-network-nbd.x86_64-latest.xml
index 38d1f290c84c26f9daaff43431d024ed3cbe103b..26cb503b50099d122e8c06ccb6f939b1757fc255 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>
@@ -63,7 +66,7 @@
       <target dev='vdf' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 95%
rename from tests/qemuxml2xmloutdata/disk-network-rbd.xml
rename to tests/qemuxml2xmloutdata/disk-network-rbd.x86_64-latest.xml
index a8faca96ace1f211b04fd97fe5d8bde15e5bf57f..6da7185d18cb0383425cc4e7c0e545610981d75c 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>
@@ -76,7 +79,7 @@
       <target dev='vdf' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
rename to tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-latest.xml
index a36215b8df75f4efd5faaee8f19c6357b98b68e1..094de3a4d5b9d681ac3d4d2f7f923c7dee829eae 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>
@@ -28,7 +31,7 @@
       <target dev='vda' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 93%
rename from tests/qemuxml2xmloutdata/disk-network-source-auth.xml
rename to tests/qemuxml2xmloutdata/disk-network-source-auth.x86_64-latest.xml
index 13ebb1d5d7fd44884976339033fbf8ebf2a6b01e..1c7a2d7c4035dd5955639fcbfff2a8ab523007a4 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>
@@ -51,7 +54,7 @@
       <target dev='vdc' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 87%
rename from tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.xml
rename to tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.x86_64-latest.xml
index 1810ed3505fd0785452fcfb7cd0e945b4850daae..cc542f1e190a54aa4b9260ad5c27452fe026c7b7 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>
@@ -22,7 +25,7 @@
       <target dev='vdd' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 92%
rename from tests/qemuxml2xmloutdata/disk-serial.xml
rename to tests/qemuxml2xmloutdata/disk-serial.x86_64-latest.xml
index e430a10a93aa1295594dd082c18925e3814db332..9d3fc4bc95478c63b63c1e78b4758380c4686583 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>
@@ -33,7 +36,7 @@
       <source file='/some/file'/>
       <target dev='sda' bus='sd'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 94%
rename from tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
rename to tests/qemuxml2xmloutdata/disk-source-pool-mode.x86_64-latest.xml
index c9b47a970eaf34b9dbcb78e49feb27729ec8ead9..fb863157d8f5a25d02cde98d3e487b9b51c2fd54 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>
@@ -56,7 +59,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='0' target='0' unit='4'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 93%
rename from tests/qemuxml2xmloutdata/disk-source-pool.xml
rename to tests/qemuxml2xmloutdata/disk-source-pool.x86_64-latest.xml
index 5d38f1286b9dcc07e4f5bd33ee91935ade7222f8..9ca3ec70a31dfe61d6315c693646259599ab622d 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>
@@ -51,7 +54,7 @@
       <readonly/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 92%
rename from tests/qemuxml2xmloutdata/disk-virtio.xml
rename to tests/qemuxml2xmloutdata/disk-virtio.x86_64-latest.xml
index b54c1915f743e835d6a22a8a8d90928118fbdca8..68830c270ea2869cc821838e4fcb72280550b3f4 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>
@@ -39,7 +42,7 @@
       <target dev='vdb' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 86%
rename from tests/qemuxml2xmloutdata/eoi-disabled.xml
rename to tests/qemuxml2xmloutdata/eoi-disabled.x86_64-latest.xml
index 93cd1973649ff5874a7843d5e1dbf225fd9ffcef..c62aa21f375edff8aa5f068c4a9c7756f1b4f002 100644 (file)
     <apic eoi='off'/>
     <pae/>
   </features>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 86%
rename from tests/qemuxml2xmloutdata/eoi-enabled.xml
rename to tests/qemuxml2xmloutdata/eoi-enabled.x86_64-latest.xml
index 17f1fab0613c7d2309f1fc671d84fed298393e1f..1b9af7ee1380cef12f242b1ac5863834a2917993 100644 (file)
     <apic eoi='on'/>
     <pae/>
   </features>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 92%
rename from tests/qemuxml2xmloutdata/event_idx.xml
rename to tests/qemuxml2xmloutdata/event_idx.x86_64-latest.xml
index 32a5e9ca7e779f8cd057517ccc34995bdf6620e6..44f95a756b93b9163925c7669703f6900da372d8 100644 (file)
@@ -10,6 +10,9 @@
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -29,7 +32,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='virtio-serial' index='0'>
similarity index 89%
rename from tests/qemuxml2xmloutdata/floppy-drive-fat.xml
rename to tests/qemuxml2xmloutdata/floppy-drive-fat.x86_64-latest.xml
index 7b835b7269207e9c7b05f7ff3301f8bdf36bb3c1..f4d81dbe87975c389c2b5109dc9d74572cc0b078 100644 (file)
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='fd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -21,7 +24,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 89%
rename from tests/qemuxml2xmloutdata/hyperv-off.xml
rename to tests/qemuxml2xmloutdata/hyperv-off.x86_64-latest.xml
index 88e97c3de0f42c0e91b0e7ce966895c375bb0c19..5805fea7b78e6ce9849662a7fff2e27b68a6a2f4 100644 (file)
       <evmcs state='off'/>
     </hyperv>
   </features>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 84%
rename from tests/qemuxml2xmloutdata/hyperv-panic.xml
rename to tests/qemuxml2xmloutdata/hyperv-panic.x86_64-latest.xml
index 5f7a097ac95c57d6108ed3754ab39ce07f890d04..28f11e9358302e70e0cf9c1a2685f9cc4dd9569e 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 85%
rename from tests/qemuxml2xmloutdata/hyperv-passthrough.xml
rename to tests/qemuxml2xmloutdata/hyperv-passthrough.x86_64-latest.xml
index de53cb97226a3046421cb2931266b305b1ad81e8..2cfae8fa4cac5c2e3dba625f0aded6edcd41fd43 100644 (file)
     <hyperv mode='passthrough'>
     </hyperv>
   </features>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 86%
rename from tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml
rename to tests/qemuxml2xmloutdata/hyperv-stimer-direct.x86_64-latest.xml
index d495193faddf63f3766f593389e1c1b9f5d353a5..efb9d0072eedabebf3d7bbec7c5a59b34269f46f 100644 (file)
       </stimer>
     </hyperv>
   </features>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 89%
rename from tests/qemuxml2xmloutdata/hyperv.xml
rename to tests/qemuxml2xmloutdata/hyperv.x86_64-latest.xml
index 4445c85118b927f3f0898f84484b3c71ea6767bf..48281772631c47a6044babfcefc150afd550d03c 100644 (file)
       <avic state='on'/>
     </hyperv>
   </features>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 93%
rename from tests/qemuxml2xmloutdata/interface-driver.xml
rename to tests/qemuxml2xmloutdata/interface-driver.x86_64-latest.xml
index 435489e009ec8af6f8b929f457429f062c9f7583..be407826042a705514faee35ee24f891aef0b404 100644 (file)
@@ -10,6 +10,9 @@
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -29,7 +32,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='virtio-serial' index='0'>
similarity index 88%
rename from tests/qemuxml2xmloutdata/misc-no-reboot.xml
rename to tests/qemuxml2xmloutdata/misc-no-reboot.x86_64-latest.xml
index 38bea7aa24d9f8ee095c3668b4fce526aef2ec99..7f4211b94bf0d2f4963eea4d2e7a783c6b761083 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>destroy</on_reboot>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
similarity index 94%
rename from tests/qemuxml2xmloutdata/net-coalesce.xml
rename to tests/qemuxml2xmloutdata/net-coalesce.x86_64-latest.xml
index 9a53b1941a4e9fcd1baf4fd3440cd2f4bc9a13a8..c99ba6c6e5d3e78cad5d39153de41163c3e7940c 100644 (file)
@@ -10,6 +10,9 @@
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -29,7 +32,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='virtio-serial' index='0'>
similarity index 89%
rename from tests/qemuxml2xmloutdata/net-user.xml
rename to tests/qemuxml2xmloutdata/net-user.x86_64-latest.xml
index 7c35a41709f9a63fa8d7f9c5f62d83abd00cceee..e02b451bfe0142aef1315d451c9875d78d90a4e7 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/net-vhostuser.xml
rename to tests/qemuxml2xmloutdata/net-vhostuser.x86_64-latest.xml
index 80817245351ec3f6d6eddde1e2d815ea337114c6..c77d46147e876d6fa6bf6b1dad7cabfc28c71651 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/numatune-auto-prefer.xml
rename to tests/qemuxml2xmloutdata/numatune-auto-prefer.x86_64-latest.xml
index cef9f8c5e6a42121b63a3d5b6a9c9a11b2c1e356..cb34a420bc0fecf94429b42e2c84878558e8bb04 100644 (file)
@@ -11,7 +11,8 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <cpu>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
     <numa>
       <cell id='0' cpus='0' memory='65536' unit='KiB'/>
     </numa>
@@ -22,7 +23,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 95%
rename from tests/qemuxml2xmloutdata/numatune-distances.xml
rename to tests/qemuxml2xmloutdata/numatune-distances.x86_64-latest.xml
index 4f038931c30ea64665a803ddf64b182e89db678c..b99d78daa379c0b12064500b243f7ecd87aefac9 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,11' memory='2097152' unit='KiB'>
         <distances>
@@ -83,7 +84,7 @@
   <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 88%
rename from tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
rename to tests/qemuxml2xmloutdata/numatune-memnode-no-memory.x86_64-latest.xml
index 78a643ec2db22bc3ab5d4dda6fadfc0180e4c790..360d176b2fece9fe727236b8ad290bf19cd30809 100644 (file)
@@ -11,7 +11,8 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <cpu>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
     <numa>
       <cell id='0' cpus='0' memory='32768' unit='KiB'/>
       <cell id='1' cpus='1' memory='32768' unit='KiB'/>
@@ -23,7 +24,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 89%
rename from tests/qemuxml2xmloutdata/numatune-memnode.xml
rename to tests/qemuxml2xmloutdata/numatune-memnode.x86_64-latest.xml
index a117745bfb0fe658724bc4584901661775e007f9..06564a53276b6ed8f6e26316ceca076d866281d3 100644 (file)
@@ -13,7 +13,8 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
-  <cpu>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
     <numa>
       <cell id='0' cpus='0' memory='20002' unit='KiB'/>
       <cell id='1' cpus='1-27,29' memory='660066' unit='KiB'/>
@@ -26,7 +27,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 90%
rename from tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml
rename to tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.x86_64-latest.xml
index a59d837cc6fd27ee2d7ed0df0e4eeab1593a7034..6410d6320e2d1abff1b8715ed29aa299e2dcba15 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 90%
rename from tests/qemuxml2xmloutdata/pci-rom-disabled.xml
rename to tests/qemuxml2xmloutdata/pci-rom-disabled.x86_64-latest.xml
index e6931451630fba67434c1e2c9335fbbcb45f4f87..7c00018a1262a9ff060c150848f97dc82cff3341 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 91%
rename from tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
rename to tests/qemuxml2xmloutdata/pci-serial-dev-chardev.x86_64-latest.xml
index c730a67cec3adfb7a3e7b549ca103a91f81d51ce..5e2b69b4275cf7c9c11af83a365e805a4b00c53d 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/pcihole64-gib.xml
rename to tests/qemuxml2xmloutdata/pcihole64-gib.x86_64-latest.xml
index 1ad7ca40d8281acdf83e72c46a7be78da061ed31..5ebd8787e9bfe0869169d5a8b06ff19a30b8e48e 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>
@@ -17,7 +20,7 @@
     <controller type='pci' index='0' model='pci-root'>
       <pcihole64 unit='KiB'>1048576</pcihole64>
     </controller>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <input type='mouse' bus='ps2'/>
similarity index 86%
rename from tests/qemuxml2xmloutdata/pcihole64.xml
rename to tests/qemuxml2xmloutdata/pcihole64.x86_64-latest.xml
index 505810722793a74b0d49b04edc3e26ce154aab9f..45c245e25be42a57e66dfa4486dfdeeb963da5fa 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>
@@ -17,7 +20,7 @@
     <controller type='pci' index='0' model='pci-root'>
       <pcihole64 unit='KiB'>1048576</pcihole64>
     </controller>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <input type='mouse' bus='ps2'/>
similarity index 86%
rename from tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
rename to tests/qemuxml2xmloutdata/pv-spinlock-disabled.x86_64-latest.xml
index ec1f4b77bd080984cc37508d182beaed8c7882eb..f95daa63b4183622f11759424c0ea2211b6180e7 100644 (file)
     <pae/>
     <pvspinlock state='off'/>
   </features>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 86%
rename from tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
rename to tests/qemuxml2xmloutdata/pv-spinlock-enabled.x86_64-latest.xml
index c82d3af837f80ddbd8f2213305fb471e272cbdff..9093d9509db1ce100f56ff5eb17fb4f655a86a5f 100644 (file)
     <pae/>
     <pvspinlock state='on'/>
   </features>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
similarity index 87%
rename from tests/qemuxml2xmloutdata/serial-debugcon.xml
rename to tests/qemuxml2xmloutdata/serial-debugcon.x86_64-latest.xml
index 4084d3b2fe323d79a2c3fc69124caa972d1d2ed0..b85824c5f2f8647593e1c94488119169ec7bbd63 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 92%
rename from tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
rename to tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.x86_64-latest.xml
index 4cdefed63d00bc67e8e4760ffc63ed4eda95baf6..6fdc0d0d73dbf5fca77badb7a3ec739f49ade380 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 92%
rename from tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
rename to tests/qemuxml2xmloutdata/tap-vhost-incorrect.x86_64-latest.xml
index 12355888104b46a69fa539aad7bdd22f862319b0..803136669ba090d7bcb9661afec5813debacc3d7 100644 (file)
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='virtio-serial' index='0'>
similarity index 93%
rename from tests/qemuxml2xmloutdata/tap-vhost.xml
rename to tests/qemuxml2xmloutdata/tap-vhost.x86_64-latest.xml
index 7f5b192f86cd3aa308fbb80744f1d500ccb8851d..e4f38179ce2789718a803a281e9c22b2b9531d21 100644 (file)
@@ -10,6 +10,9 @@
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -29,7 +32,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='virtio-serial' index='0'>
similarity index 93%
rename from tests/qemuxml2xmloutdata/vhost_queues.xml
rename to tests/qemuxml2xmloutdata/vhost_queues.x86_64-latest.xml
index 46428b59e2c4754a4d5193ffbbca1b1680743ef5..8fbc4ccc99243988080875fcd34dd7974df1dc8c 100644 (file)
@@ -10,6 +10,9 @@
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -29,7 +32,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='virtio-serial' index='0'>
similarity index 92%
rename from tests/qemuxml2xmloutdata/virtio-lun.xml
rename to tests/qemuxml2xmloutdata/virtio-lun.x86_64-latest.xml
index cdb804e9a0143b9203ec7f71de1f25ca59718128..1b891bdb4e4695c28290cc35bf5aa4418442f9e6 100644 (file)
@@ -10,6 +10,9 @@
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -28,7 +31,7 @@
       <target dev='vdb' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='virtio-serial' index='0'>
similarity index 88%
rename from tests/qemuxml2xmloutdata/watchdog.xml
rename to tests/qemuxml2xmloutdata/watchdog.x86_64-latest.xml
index 1dde2ee7000c2ff856139926678280cba58106d9..b87d5c4fdfa2d07c428ea0df71a2e7435899355a 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'>
index 0302a7041053e885cf8bc2e8763179ca5d40ba7f..da59a1676b9a0cfc4caed7ddcd44316306312187 100644 (file)
@@ -193,8 +193,6 @@ mymain(void)
 #define DO_TEST(name, ...) \
     DO_TEST_FULL(name, "", WHEN_BOTH, \
                  ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END)
-#define DO_TEST_NOCAPS(name) \
-    DO_TEST_FULL(name, "", WHEN_BOTH, ARG_END)
 
     /* Unset or set all envvars here that are copied in qemudBuildCommandLine
      * using ADD_ENV_COPY, otherwise these tests may fail due to unexpected
@@ -212,31 +210,31 @@ mymain(void)
     DO_TEST_CAPS_LATEST("machine-smm-off");
     DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-hostdev", "s390x");
     DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-multiple-disks-nets-s390", "s390x");
-    DO_TEST_NOCAPS("default-kvm-host-arch");
-    DO_TEST_NOCAPS("default-qemu-host-arch");
-    DO_TEST_NOCAPS("boot-cdrom");
-    DO_TEST_NOCAPS("boot-network");
-    DO_TEST_NOCAPS("boot-floppy");
+    DO_TEST_CAPS_LATEST("default-kvm-host-arch");
+    DO_TEST_CAPS_LATEST("default-qemu-host-arch");
+    DO_TEST_CAPS_LATEST("boot-cdrom");
+    DO_TEST_CAPS_LATEST("boot-network");
+    DO_TEST_CAPS_LATEST("boot-floppy");
     DO_TEST("boot-floppy-q35",
             QEMU_CAPS_DEVICE_IOH3420,
             QEMU_CAPS_ICH9_AHCI);
-    DO_TEST_NOCAPS("boot-multi");
-    DO_TEST_NOCAPS("boot-menu-enable-with-timeout");
-    DO_TEST_NOCAPS("boot-menu-disable");
-    DO_TEST_NOCAPS("boot-menu-disable-with-timeout");
-    DO_TEST_NOCAPS("boot-order");
+    DO_TEST_CAPS_LATEST("boot-multi");
+    DO_TEST_CAPS_LATEST("boot-menu-enable-with-timeout");
+    DO_TEST_CAPS_LATEST("boot-menu-disable");
+    DO_TEST_CAPS_LATEST("boot-menu-disable-with-timeout");
+    DO_TEST_CAPS_LATEST("boot-order");
 
     DO_TEST_CAPS_LATEST("reboot-timeout-enabled");
     DO_TEST_CAPS_LATEST("reboot-timeout-disabled");
 
     DO_TEST_CAPS_LATEST("clock-utc");
     DO_TEST_CAPS_LATEST("clock-localtime");
-    DO_TEST_NOCAPS("cpu-empty");
+    DO_TEST_CAPS_LATEST("cpu-empty");
     DO_TEST_CAPS_LATEST("cpu-kvmclock");
-    DO_TEST_NOCAPS("cpu-host-kvmclock");
+    DO_TEST_CAPS_LATEST("cpu-host-kvmclock");
     DO_TEST_CAPS_LATEST("cpu-host-passthrough-features");
     DO_TEST_CAPS_LATEST("cpu-host-model-features");
-    DO_TEST_NOCAPS("cpu-host-model-vendor");
+    DO_TEST_CAPS_LATEST("cpu-host-model-vendor");
     DO_TEST("clock-catchup", QEMU_CAPS_KVM_PIT_TICK_POLICY);
     DO_TEST_CAPS_LATEST("kvmclock");
     DO_TEST_CAPS_LATEST("clock-timer-hyperv-rtc");
@@ -244,18 +242,18 @@ mymain(void)
     DO_TEST_CAPS_LATEST("clock-realtime");
     DO_TEST_CAPS_LATEST("clock-absolute");
 
-    DO_TEST_NOCAPS("cpu-eoi-disabled");
-    DO_TEST_NOCAPS("cpu-eoi-enabled");
-    DO_TEST_NOCAPS("eoi-disabled");
-    DO_TEST_NOCAPS("eoi-enabled");
-    DO_TEST_NOCAPS("pv-spinlock-disabled");
-    DO_TEST_NOCAPS("pv-spinlock-enabled");
+    DO_TEST_CAPS_LATEST("cpu-eoi-disabled");
+    DO_TEST_CAPS_LATEST("cpu-eoi-enabled");
+    DO_TEST_CAPS_LATEST("eoi-disabled");
+    DO_TEST_CAPS_LATEST("eoi-enabled");
+    DO_TEST_CAPS_LATEST("pv-spinlock-disabled");
+    DO_TEST_CAPS_LATEST("pv-spinlock-enabled");
 
-    DO_TEST_NOCAPS("hyperv");
-    DO_TEST_NOCAPS("hyperv-off");
-    DO_TEST_NOCAPS("hyperv-panic");
-    DO_TEST_NOCAPS("hyperv-passthrough");
-    DO_TEST_NOCAPS("hyperv-stimer-direct");
+    DO_TEST_CAPS_LATEST("hyperv");
+    DO_TEST_CAPS_LATEST("hyperv-off");
+    DO_TEST_CAPS_LATEST("hyperv-panic");
+    DO_TEST_CAPS_LATEST("hyperv-passthrough");
+    DO_TEST_CAPS_LATEST("hyperv-stimer-direct");
 
     DO_TEST_CAPS_LATEST("kvm-features");
     DO_TEST_CAPS_LATEST("kvm-features-off");
@@ -263,7 +261,7 @@ mymain(void)
     DO_TEST_CAPS_LATEST("pmu-feature");
     DO_TEST_CAPS_LATEST("pmu-feature-off");
 
-    DO_TEST_NOCAPS("pages-discard");
+    DO_TEST_CAPS_LATEST("pages-discard");
     DO_TEST_CAPS_LATEST("pages-discard-hugepages");
     DO_TEST_CAPS_LATEST("pages-dimm-discard");
     DO_TEST_CAPS_LATEST("hugepages-default");
@@ -284,40 +282,40 @@ mymain(void)
     DO_TEST_CAPS_LATEST("migrate");
     DO_TEST_CAPS_LATEST("qemu-ns-no-env");
     DO_TEST_CAPS_LATEST("qemu-ns");
-    DO_TEST_NOCAPS("disk-aio");
+    DO_TEST_CAPS_LATEST("disk-aio");
     DO_TEST_CAPS_LATEST("disk-aio-io_uring");
-    DO_TEST_NOCAPS("disk-cdrom");
+    DO_TEST_CAPS_LATEST("disk-cdrom");
     /* The 'disk-cdrom-empty-network-invalid' test case uses separate
      * '-active'/'-inactive' output files to work around 'virschematest'
      * thinking the output file is invalid XML */
     DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid");
     DO_TEST_CAPS_LATEST("disk-cdrom-network");
     DO_TEST("disk-cdrom-bus-other", QEMU_CAPS_DEVICE_USB_STORAGE);
-    DO_TEST_NOCAPS("disk-floppy");
+    DO_TEST_CAPS_LATEST("disk-floppy");
     DO_TEST("disk-usb-device", QEMU_CAPS_DEVICE_USB_STORAGE);
-    DO_TEST_NOCAPS("disk-virtio");
-    DO_TEST_NOCAPS("floppy-drive-fat");
+    DO_TEST_CAPS_LATEST("disk-virtio");
+    DO_TEST_CAPS_LATEST("floppy-drive-fat");
     DO_TEST_CAPS_LATEST("disk-virtio-queues");
-    DO_TEST_NOCAPS("disk-boot-disk");
-    DO_TEST_NOCAPS("disk-boot-cdrom");
-    DO_TEST_NOCAPS("disk-error-policy");
+    DO_TEST_CAPS_LATEST("disk-boot-disk");
+    DO_TEST_CAPS_LATEST("disk-boot-cdrom");
+    DO_TEST_CAPS_LATEST("disk-error-policy");
     DO_TEST_CAPS_LATEST("disk-transient");
-    DO_TEST_NOCAPS("disk-fmt-qcow");
+    DO_TEST_CAPS_LATEST("disk-fmt-qcow");
     DO_TEST_CAPS_LATEST("disk-cache");
     DO_TEST_CAPS_LATEST("disk-metadata-cache");
-    DO_TEST_NOCAPS("disk-network-nbd");
+    DO_TEST_CAPS_LATEST("disk-network-nbd");
     DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_SCSI_BLOCK);
-    DO_TEST_NOCAPS("disk-network-gluster");
-    DO_TEST_NOCAPS("disk-network-rbd");
+    DO_TEST_CAPS_LATEST("disk-network-gluster");
+    DO_TEST_CAPS_LATEST("disk-network-rbd");
     DO_TEST_CAPS_LATEST("disk-network-rbd-encryption");
     DO_TEST_CAPS_LATEST("disk-network-rbd-encryption-layering");
     DO_TEST_CAPS_LATEST("disk-network-rbd-encryption-luks-any");
-    DO_TEST_NOCAPS("disk-network-source-auth");
-    DO_TEST_NOCAPS("disk-network-sheepdog");
+    DO_TEST_CAPS_LATEST("disk-network-source-auth");
+    DO_TEST_CAPS_LATEST("disk-network-sheepdog");
     DO_TEST_CAPS_VER("disk-network-vxhs", "5.0.0");
     DO_TEST_CAPS_LATEST("disk-network-nfs");
-    DO_TEST_NOCAPS("disk-network-tlsx509-nbd");
+    DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd");
     DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname");
     DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "5.0.0");
     DO_TEST_CAPS_LATEST("disk-nvme");
@@ -428,10 +426,10 @@ mymain(void)
             QEMU_CAPS_PIIX_DISABLE_S3,
             QEMU_CAPS_PIIX_DISABLE_S4);
     DO_TEST("misc-enable-s4", QEMU_CAPS_PIIX_DISABLE_S4);
-    DO_TEST_NOCAPS("misc-no-reboot");
+    DO_TEST_CAPS_LATEST("misc-no-reboot");
     DO_TEST_CAPS_LATEST("misc-uuid");
-    DO_TEST_NOCAPS("net-vhostuser");
-    DO_TEST_NOCAPS("net-user");
+    DO_TEST_CAPS_LATEST("net-vhostuser");
+    DO_TEST_CAPS_LATEST("net-user");
     DO_TEST_CAPS_LATEST("net-user-addr");
     DO_TEST_CAPS_LATEST("net-user-passt");
     DO_TEST_CAPS_LATEST("net-virtio");
@@ -456,18 +454,18 @@ mymain(void)
     DO_TEST_CAPS_LATEST("net-midonet");
     DO_TEST_CAPS_LATEST("net-openvswitch");
     DO_TEST_CAPS_LATEST("sound-device");
-    DO_TEST_NOCAPS("watchdog");
+    DO_TEST_CAPS_LATEST("watchdog");
     DO_TEST_CAPS_LATEST("watchdog-q35-multiple");
     DO_TEST("net-bandwidth", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_VNC);
     DO_TEST("net-bandwidth2", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_VNC);
-    DO_TEST_NOCAPS("net-mtu");
-    DO_TEST_NOCAPS("net-coalesce");
+    DO_TEST_CAPS_LATEST("net-mtu");
+    DO_TEST_CAPS_LATEST("net-coalesce");
     DO_TEST_CAPS_LATEST("net-many-models");
     DO_TEST("net-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA);
     DO_TEST("net-vdpa-multiqueue", QEMU_CAPS_NETDEV_VHOST_VDPA);
     DO_TEST_CAPS_LATEST("net-virtio-rss");
 
-    DO_TEST_NOCAPS("serial-tcp-tlsx509-chardev");
+    DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev");
     DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev-notls");
 
     cfg->spiceTLS = true;
@@ -476,15 +474,15 @@ mymain(void)
             QEMU_CAPS_SPICE);
     cfg->spiceTLS = false;
 
-    DO_TEST_NOCAPS("serial-debugcon");
-    DO_TEST_NOCAPS("console-compat");
+    DO_TEST_CAPS_LATEST("serial-debugcon");
+    DO_TEST_CAPS_LATEST("console-compat");
     DO_TEST_CAPS_LATEST("console-compat2");
     DO_TEST_CAPS_LATEST("console-virtio-many");
     DO_TEST_CAPS_LATEST("channel-guestfwd");
     DO_TEST_CAPS_LATEST("channel-virtio");
     DO_TEST_CAPS_LATEST("channel-virtio-state");
 
-    DO_TEST_NOCAPS("channel-unix-source-path");
+    DO_TEST_CAPS_LATEST("channel-unix-source-path");
 
     DO_TEST_CAPS_LATEST("hostdev-usb-address");
     DO_TEST_CAPS_LATEST("hostdev-pci-address");
@@ -506,9 +504,9 @@ mymain(void)
             QEMU_CAPS_VNC);
     DO_TEST_CAPS_LATEST("hostdev-mdev-display-ramfb");
     DO_TEST_CAPS_LATEST("pci-rom");
-    DO_TEST_NOCAPS("pci-rom-disabled");
-    DO_TEST_NOCAPS("pci-rom-disabled-invalid");
-    DO_TEST_NOCAPS("pci-serial-dev-chardev");
+    DO_TEST_CAPS_LATEST("pci-rom-disabled");
+    DO_TEST_CAPS_LATEST("pci-rom-disabled-invalid");
+    DO_TEST_CAPS_LATEST("pci-serial-dev-chardev");
 
     DO_TEST_CAPS_LATEST("disk-slices");
     DO_TEST_CAPS_LATEST("disk-rotation");
@@ -538,11 +536,11 @@ mymain(void)
     DO_TEST_CAPS_LATEST("iothreads-virtio-scsi-pci");
     DO_TEST_CAPS_ARCH_LATEST("iothreads-virtio-scsi-ccw", "s390x");
     DO_TEST_CAPS_LATEST("lease");
-    DO_TEST_NOCAPS("event_idx");
-    DO_TEST_NOCAPS("vhost_queues");
-    DO_TEST_NOCAPS("interface-driver");
+    DO_TEST_CAPS_LATEST("event_idx");
+    DO_TEST_CAPS_LATEST("vhost_queues");
+    DO_TEST_CAPS_LATEST("interface-driver");
     DO_TEST_CAPS_LATEST("net-server");
-    DO_TEST_NOCAPS("virtio-lun");
+    DO_TEST_CAPS_LATEST("virtio-lun");
 
     DO_TEST_CAPS_LATEST("usb-none");
     DO_TEST_CAPS_LATEST("usb-controller");
@@ -600,14 +598,14 @@ mymain(void)
 
     DO_TEST("disk-scsi-disk-vpd",
             QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI);
-    DO_TEST_NOCAPS("disk-source-pool");
-    DO_TEST_NOCAPS("disk-source-pool-mode");
+    DO_TEST_CAPS_LATEST("disk-source-pool");
+    DO_TEST_CAPS_LATEST("disk-source-pool-mode");
 
     DO_TEST_CAPS_LATEST("disk-discard");
     DO_TEST_CAPS_LATEST("disk-detect-zeroes");
     DO_TEST_CAPS_LATEST("disk-discard_no_unref");
 
-    DO_TEST_NOCAPS("disk-serial");
+    DO_TEST_CAPS_LATEST("disk-serial");
 
     DO_TEST_CAPS_ARCH_LATEST("disk-arm-virtio-sd", "aarch64");
 
@@ -655,7 +653,7 @@ mymain(void)
     DO_TEST_CAPS_LATEST("balloon-device-auto");
     DO_TEST_CAPS_LATEST("balloon-device-period");
     DO_TEST_CAPS_LATEST("channel-virtio-auto");
-    DO_TEST_NOCAPS("console-compat-auto");
+    DO_TEST_CAPS_LATEST("console-compat-auto");
     DO_TEST("disk-scsi-device-auto",
             QEMU_CAPS_SCSI_LSI);
     DO_TEST_CAPS_LATEST("console-virtio");
@@ -667,7 +665,7 @@ mymain(void)
     DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-no-cpuset-and-placement");
     DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-cpuset");
     DO_TEST_CAPS_LATEST("usb-ich9-ehci-addr");
-    DO_TEST_NOCAPS("disk-copy_on_read");
+    DO_TEST_CAPS_LATEST("disk-copy_on_read");
     DO_TEST_CAPS_LATEST("tpm-passthrough");
     DO_TEST_CAPS_LATEST("tpm-passthrough-crb");
     DO_TEST_CAPS_LATEST("tpm-emulator");
@@ -822,8 +820,8 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST("s390-serial-2", "s390x");
     DO_TEST_CAPS_ARCH_LATEST("s390-serial-console", "s390x");
 
-    DO_TEST_NOCAPS("pcihole64");
-    DO_TEST_NOCAPS("pcihole64-gib");
+    DO_TEST_CAPS_LATEST("pcihole64");
+    DO_TEST_CAPS_LATEST("pcihole64-gib");
     DO_TEST("pcihole64-q35",
             QEMU_CAPS_DEVICE_IOH3420,
             QEMU_CAPS_ICH9_AHCI,
@@ -838,8 +836,8 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST("pvpanic-pci-aarch64", "aarch64");
     DO_TEST_CAPS_ARCH_LATEST("pvpanic-pci-no-address-aarch64", "aarch64");
 
-    DO_TEST_NOCAPS("disk-backing-chains-index");
-    DO_TEST_NOCAPS("disk-backing-chains-noindex");
+    DO_TEST_CAPS_LATEST("disk-backing-chains-index");
+    DO_TEST_CAPS_LATEST("disk-backing-chains-noindex");
 
     DO_TEST_CAPS_LATEST("disk-source-fd");
 
@@ -849,17 +847,17 @@ mymain(void)
             QEMU_CAPS_DEVICE_VIRTIO_RNG,
             QEMU_CAPS_OBJECT_RNG_EGD);
 
-    DO_TEST_NOCAPS("cpu-numa1");
-    DO_TEST_NOCAPS("cpu-numa2");
-    DO_TEST_NOCAPS("cpu-numa-no-memory-element");
-    DO_TEST_NOCAPS("cpu-numa-disordered");
-    DO_TEST_NOCAPS("cpu-numa-disjoint");
-    DO_TEST_NOCAPS("cpu-numa-memshared");
-
-    DO_TEST_NOCAPS("numatune-auto-prefer");
-    DO_TEST_NOCAPS("numatune-memnode");
-    DO_TEST_NOCAPS("numatune-memnode-no-memory");
-    DO_TEST_NOCAPS("numatune-distances");
+    DO_TEST_CAPS_LATEST("cpu-numa1");
+    DO_TEST_CAPS_LATEST("cpu-numa2");
+    DO_TEST_CAPS_LATEST("cpu-numa-no-memory-element");
+    DO_TEST_CAPS_LATEST("cpu-numa-disordered");
+    DO_TEST_CAPS_LATEST("cpu-numa-disjoint");
+    DO_TEST_CAPS_LATEST("cpu-numa-memshared");
+
+    DO_TEST_CAPS_LATEST("numatune-auto-prefer");
+    DO_TEST_CAPS_LATEST("numatune-memnode");
+    DO_TEST_CAPS_LATEST("numatune-memnode-no-memory");
+    DO_TEST_CAPS_LATEST("numatune-distances");
     DO_TEST_CAPS_LATEST("numatune-no-vcpu");
     DO_TEST("numatune-hmat", QEMU_CAPS_NUMA_HMAT);
     DO_TEST_CAPS_LATEST("numatune-hmat-none");
@@ -931,8 +929,8 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST("firmware-auto-efi-format-loader-raw", "aarch64");
     DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("firmware-auto-efi-format-loader-raw-abi-update", "aarch64");
 
-    DO_TEST_NOCAPS("tap-vhost");
-    DO_TEST_NOCAPS("tap-vhost-incorrect");
+    DO_TEST_CAPS_LATEST("tap-vhost");
+    DO_TEST_CAPS_LATEST("tap-vhost-incorrect");
     DO_TEST("shmem", QEMU_CAPS_DEVICE_IVSHMEM);
     DO_TEST("shmem-plain-doorbell",
             QEMU_CAPS_DEVICE_IVSHMEM_PLAIN, QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL);
@@ -1076,7 +1074,7 @@ mymain(void)
     DO_TEST_CAPS_LATEST("memfd-memory-numa");
     DO_TEST_CAPS_LATEST("memfd-memory-default-hugepage");
 
-    DO_TEST_NOCAPS("acpi-table");
+    DO_TEST_CAPS_LATEST("acpi-table");
 
     DO_TEST("video-device-pciaddr-default",
             QEMU_CAPS_KVM,
@@ -1102,13 +1100,13 @@ mymain(void)
     DO_TEST_CAPS_LATEST("virtio-iommu-x86_64");
     DO_TEST_CAPS_ARCH_LATEST("virtio-iommu-aarch64", "aarch64");
 
-    DO_TEST_NOCAPS("cpu-check-none");
-    DO_TEST_NOCAPS("cpu-check-partial");
-    DO_TEST_NOCAPS("cpu-check-full");
-    DO_TEST_NOCAPS("cpu-check-default-none");
-    DO_TEST_NOCAPS("cpu-check-default-none2");
-    DO_TEST_NOCAPS("cpu-check-default-partial");
-    DO_TEST_NOCAPS("cpu-check-default-partial2");
+    DO_TEST_CAPS_LATEST("cpu-check-none");
+    DO_TEST_CAPS_LATEST("cpu-check-partial");
+    DO_TEST_CAPS_LATEST("cpu-check-full");
+    DO_TEST_CAPS_LATEST("cpu-check-default-none");
+    DO_TEST_CAPS_LATEST("cpu-check-default-none2");
+    DO_TEST_CAPS_LATEST("cpu-check-default-partial");
+    DO_TEST_CAPS_LATEST("cpu-check-default-partial2");
     DO_TEST("vmcoreinfo", QEMU_CAPS_DEVICE_VMCOREINFO);
 
     DO_TEST("smartcard-host", QEMU_CAPS_CCID_EMULATED);
@@ -1189,7 +1187,7 @@ mymain(void)
 
     DO_TEST_CAPS_LATEST("virtio-9p-multidevs");
     DO_TEST_CAPS_LATEST("virtio-9p-createmode");
-    DO_TEST_NOCAPS("downscript");
+    DO_TEST_CAPS_LATEST("downscript");
 
     /* Simplest possible <audio>, all supported with ENV */
     DO_TEST_CAPS_LATEST("audio-none-minimal");