diff --git a/tests/qemuxml2argvdata/net-mtu.xml b/tests/qemuxml2argvdata/net-mtu.xml
index 092978bea0..04fa1a2686 100644
--- a/tests/qemuxml2argvdata/net-mtu.xml
+++ b/tests/qemuxml2argvdata/net-mtu.xml
@@ -10,6 +10,9 @@
+
+ qemu64
+
destroy
restart
@@ -29,7 +32,7 @@
-
+
diff --git a/tests/qemuxml2argvdata/pages-discard.xml b/tests/qemuxml2argvdata/pages-discard.xml
index 99b842dabf..7d7f3351f0 100644
--- a/tests/qemuxml2argvdata/pages-discard.xml
+++ b/tests/qemuxml2argvdata/pages-discard.xml
@@ -11,7 +11,8 @@
hvm
-
+
+ qemu64
|
|
@@ -25,7 +26,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/acpi-table.xml b/tests/qemuxml2xmloutdata/acpi-table.x86_64-latest.xml
similarity index 87%
rename from tests/qemuxml2xmloutdata/acpi-table.xml
rename to tests/qemuxml2xmloutdata/acpi-table.x86_64-latest.xml
index 5a6c859bad..577de310fc 100644
--- a/tests/qemuxml2xmloutdata/acpi-table.xml
+++ b/tests/qemuxml2xmloutdata/acpi-table.x86_64-latest.xml
@@ -14,13 +14,16 @@
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/boot-cdrom.xml b/tests/qemuxml2xmloutdata/boot-cdrom.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/boot-cdrom.xml
rename to tests/qemuxml2xmloutdata/boot-cdrom.x86_64-latest.xml
index 4666777e56..8589f05399 100644
--- a/tests/qemuxml2xmloutdata/boot-cdrom.xml
+++ b/tests/qemuxml2xmloutdata/boot-cdrom.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/boot-floppy.xml b/tests/qemuxml2xmloutdata/boot-floppy.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/boot-floppy.xml
rename to tests/qemuxml2xmloutdata/boot-floppy.x86_64-latest.xml
index 7c163b5c99..97e3d6c17d 100644
--- a/tests/qemuxml2xmloutdata/boot-floppy.xml
+++ b/tests/qemuxml2xmloutdata/boot-floppy.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -26,7 +29,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable.xml b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/boot-menu-disable.xml
rename to tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.x86_64-latest.xml
index 04c8d42513..62549d7ea0 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-disable.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.x86_64-latest.xml
@@ -9,6 +9,9 @@
+
+ qemu64
+
destroy
restart
@@ -22,7 +25,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml b/tests/qemuxml2xmloutdata/boot-menu-disable.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
rename to tests/qemuxml2xmloutdata/boot-menu-disable.x86_64-latest.xml
index 04c8d42513..62549d7ea0 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-disable.x86_64-latest.xml
@@ -9,6 +9,9 @@
+
+ qemu64
+
destroy
restart
@@ -22,7 +25,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
rename to tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.x86_64-latest.xml
index e951750af5..64888293bd 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.x86_64-latest.xml
@@ -9,6 +9,9 @@
+
+ qemu64
+
destroy
restart
@@ -22,7 +25,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/boot-multi.xml b/tests/qemuxml2xmloutdata/boot-multi.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/boot-multi.xml
rename to tests/qemuxml2xmloutdata/boot-multi.x86_64-latest.xml
index 8c16bd9d11..bb44173f60 100644
--- a/tests/qemuxml2xmloutdata/boot-multi.xml
+++ b/tests/qemuxml2xmloutdata/boot-multi.x86_64-latest.xml
@@ -12,6 +12,9 @@
+
+ qemu64
+
destroy
restart
@@ -25,7 +28,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/boot-network.xml b/tests/qemuxml2xmloutdata/boot-network.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/boot-network.xml
rename to tests/qemuxml2xmloutdata/boot-network.x86_64-latest.xml
index 4722ede3b7..0e60dbe5ed 100644
--- a/tests/qemuxml2xmloutdata/boot-network.xml
+++ b/tests/qemuxml2xmloutdata/boot-network.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -20,7 +23,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/boot-order.xml b/tests/qemuxml2xmloutdata/boot-order.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/boot-order.xml
rename to tests/qemuxml2xmloutdata/boot-order.x86_64-latest.xml
index 843bebda9c..64f5880c8a 100644
--- a/tests/qemuxml2xmloutdata/boot-order.xml
+++ b/tests/qemuxml2xmloutdata/boot-order.x86_64-latest.xml
@@ -7,6 +7,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -43,7 +46,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml b/tests/qemuxml2xmloutdata/channel-unix-source-path-active.x86_64-latest.xml
similarity index 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 ec927d37c6..022ad7025a 100644
--- a/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml
+++ b/tests/qemuxml2xmloutdata/channel-unix-source-path-active.x86_64-latest.xml
@@ -8,13 +8,16 @@
hvm
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml b/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.x86_64-latest.xml
similarity index 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 c979bedb39..3b013e9f87 100644
--- a/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml
+++ b/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.x86_64-latest.xml
@@ -8,13 +8,16 @@
hvm
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/console-compat-auto.xml b/tests/qemuxml2xmloutdata/console-compat-auto.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/console-compat-auto.xml
rename to tests/qemuxml2xmloutdata/console-compat-auto.x86_64-latest.xml
index 19c72f811d..59c454375c 100644
--- a/tests/qemuxml2xmloutdata/console-compat-auto.xml
+++ b/tests/qemuxml2xmloutdata/console-compat-auto.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -20,7 +23,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/console-compat.xml b/tests/qemuxml2xmloutdata/console-compat.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/console-compat.xml
rename to tests/qemuxml2xmloutdata/console-compat.x86_64-latest.xml
index ffa6eda9c6..fd9e073e7b 100644
--- a/tests/qemuxml2xmloutdata/console-compat.xml
+++ b/tests/qemuxml2xmloutdata/console-compat.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -20,7 +23,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-none.xml b/tests/qemuxml2xmloutdata/cpu-check-default-none.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-check-default-none.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-none.x86_64-latest.xml
index d2ec332183..9b17034cd2 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-none.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-none.x86_64-latest.xml
@@ -8,14 +8,14 @@
hvm
-
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml b/tests/qemuxml2xmloutdata/cpu-check-default-none2.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-none2.x86_64-latest.xml
index a7b5932314..5e230fcf28 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-none2.x86_64-latest.xml
@@ -17,7 +17,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml b/tests/qemuxml2xmloutdata/cpu-check-default-partial.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-partial.x86_64-latest.xml
index ab1a42929d..8772918cdc 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-partial.x86_64-latest.xml
@@ -15,7 +15,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-check-partial.xml b/tests/qemuxml2xmloutdata/cpu-check-default-partial2.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-partial.xml
rename to tests/qemuxml2xmloutdata/cpu-check-default-partial2.x86_64-latest.xml
index 98f2fc8fd0..1b45eecbef 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-partial.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-partial2.x86_64-latest.xml
@@ -17,7 +17,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-check-full.xml b/tests/qemuxml2xmloutdata/cpu-check-full.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-full.xml
rename to tests/qemuxml2xmloutdata/cpu-check-full.x86_64-latest.xml
index 11fa1349a2..affa241df2 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-full.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-full.x86_64-latest.xml
@@ -17,7 +17,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-check-none.xml b/tests/qemuxml2xmloutdata/cpu-check-none.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-none.xml
rename to tests/qemuxml2xmloutdata/cpu-check-none.x86_64-latest.xml
index 4bf679692c..cbe3910a4a 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-none.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-none.x86_64-latest.xml
@@ -17,7 +17,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml b/tests/qemuxml2xmloutdata/cpu-check-partial.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
rename to tests/qemuxml2xmloutdata/cpu-check-partial.x86_64-latest.xml
index 98f2fc8fd0..1b45eecbef 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-partial.x86_64-latest.xml
@@ -17,7 +17,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-empty.xml b/tests/qemuxml2xmloutdata/cpu-empty.x86_64-latest.xml
similarity index 85%
rename from tests/qemuxml2xmloutdata/cpu-empty.xml
rename to tests/qemuxml2xmloutdata/cpu-empty.x86_64-latest.xml
index ee700da00d..3d64e0cfbf 100644
--- a/tests/qemuxml2xmloutdata/cpu-empty.xml
+++ b/tests/qemuxml2xmloutdata/cpu-empty.x86_64-latest.xml
@@ -8,13 +8,16 @@
hvm
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
rename to tests/qemuxml2xmloutdata/cpu-eoi-disabled.x86_64-latest.xml
index acd17da598..67a5fa4e86 100644
--- a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.x86_64-latest.xml
@@ -22,7 +22,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
rename to tests/qemuxml2xmloutdata/cpu-eoi-enabled.x86_64-latest.xml
index 49900aea9a..fcde7a6877 100644
--- a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.x86_64-latest.xml
@@ -22,7 +22,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml b/tests/qemuxml2xmloutdata/cpu-host-kvmclock.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
rename to tests/qemuxml2xmloutdata/cpu-host-kvmclock.x86_64-latest.xml
index 8de03f032c..f789f34d3d 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-kvmclock.x86_64-latest.xml
@@ -8,7 +8,7 @@
hvm
-
+
@@ -17,7 +17,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml b/tests/qemuxml2xmloutdata/cpu-host-model-vendor.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
rename to tests/qemuxml2xmloutdata/cpu-host-model-vendor.x86_64-latest.xml
index 482edbeb3d..f1ef384558 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-vendor.x86_64-latest.xml
@@ -17,7 +17,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml
index 58707b0d11..fa2ec31463 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml
@@ -8,7 +8,8 @@
hvm
-
+
+ qemu64
|
@@ -21,7 +22,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml b/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml
index 3d57037bf1..1b4d0bfa67 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml
@@ -8,7 +8,8 @@
hvm
-
+
+ qemu64
|
@@ -22,7 +23,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml b/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml
index 1883a8368d..47ed9efd69 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml
@@ -8,7 +8,8 @@
hvm
-
+
+ qemu64
|
@@ -21,7 +22,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-numa1.xml b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa1.xml
rename to tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml
index 02c12542c0..57bbacdff0 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa1.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml
@@ -8,7 +8,8 @@
hvm
-
+
+ qemu64
|
@@ -21,7 +22,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-numa2.xml b/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa2.xml
rename to tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml
index 02c12542c0..57bbacdff0 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa2.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml
@@ -8,7 +8,8 @@
hvm
-
+
+ qemu64
|
@@ -21,7 +22,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml b/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
rename to tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml
index 02c12542c0..57bbacdff0 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml
@@ -8,7 +8,8 @@
hvm
-
+
+ qemu64
|
@@ -21,7 +22,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml b/tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml
similarity index 79%
rename from tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
rename to tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml
index c9f09b2231..a9de07d41c 100644
--- a/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
+++ b/tests/qemuxml2xmloutdata/default-kvm-host-arch.x86_64-latest.xml
@@ -5,16 +5,19 @@
4194304
4
- hvm
+ hvm
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml b/tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml
similarity index 79%
rename from tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
rename to tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml
index 9e3cbab7f8..37673010f6 100644
--- a/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
+++ b/tests/qemuxml2xmloutdata/default-qemu-host-arch.x86_64-latest.xml
@@ -5,16 +5,19 @@
4194304
4
- hvm
+ hvm
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-aio.xml b/tests/qemuxml2xmloutdata/disk-aio.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-aio.xml
rename to tests/qemuxml2xmloutdata/disk-aio.x86_64-latest.xml
index b65bb70589..11e175d26a 100644
--- a/tests/qemuxml2xmloutdata/disk-aio.xml
+++ b/tests/qemuxml2xmloutdata/disk-aio.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -27,7 +30,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.x86_64-latest.xml
similarity index 97%
rename from tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
rename to tests/qemuxml2xmloutdata/disk-backing-chains-index-active.x86_64-latest.xml
index 4f30bc7111..52c8ad6f29 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -147,7 +150,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.x86_64-latest.xml
similarity index 97%
rename from tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
rename to tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.x86_64-latest.xml
index c992679b36..ad81cd4696 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -147,7 +150,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.x86_64-latest.xml
similarity index 97%
rename from tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
rename to tests/qemuxml2xmloutdata/disk-backing-chains-noindex.x86_64-latest.xml
index c992679b36..ad81cd4696 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -147,7 +150,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-boot-cdrom.xml b/tests/qemuxml2xmloutdata/disk-boot-cdrom.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-boot-cdrom.xml
rename to tests/qemuxml2xmloutdata/disk-boot-cdrom.x86_64-latest.xml
index 329e29b8db..a322bb4a0c 100644
--- a/tests/qemuxml2xmloutdata/disk-boot-cdrom.xml
+++ b/tests/qemuxml2xmloutdata/disk-boot-cdrom.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -27,7 +30,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-boot-disk.xml b/tests/qemuxml2xmloutdata/disk-boot-disk.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-boot-disk.xml
rename to tests/qemuxml2xmloutdata/disk-boot-disk.x86_64-latest.xml
index 55e94633dd..07020849a5 100644
--- a/tests/qemuxml2xmloutdata/disk-boot-disk.xml
+++ b/tests/qemuxml2xmloutdata/disk-boot-disk.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -27,7 +30,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-cdrom.xml b/tests/qemuxml2xmloutdata/disk-cdrom.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/disk-cdrom.xml
rename to tests/qemuxml2xmloutdata/disk-cdrom.x86_64-latest.xml
index ff70ce4d97..0a6e32ada1 100644
--- a/tests/qemuxml2xmloutdata/disk-cdrom.xml
+++ b/tests/qemuxml2xmloutdata/disk-cdrom.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -40,7 +43,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-copy_on_read.xml b/tests/qemuxml2xmloutdata/disk-copy_on_read.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/disk-copy_on_read.xml
rename to tests/qemuxml2xmloutdata/disk-copy_on_read.x86_64-latest.xml
index ae76cbafad..9a55b7e04a 100644
--- a/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
+++ b/tests/qemuxml2xmloutdata/disk-copy_on_read.x86_64-latest.xml
@@ -10,6 +10,9 @@
+
+ qemu64
+
destroy
restart
@@ -29,7 +32,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-error-policy.xml b/tests/qemuxml2xmloutdata/disk-error-policy.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/disk-error-policy.xml
rename to tests/qemuxml2xmloutdata/disk-error-policy.x86_64-latest.xml
index 7cc5bd3ca5..d50d7dd5c5 100644
--- a/tests/qemuxml2xmloutdata/disk-error-policy.xml
+++ b/tests/qemuxml2xmloutdata/disk-error-policy.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -32,7 +35,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-floppy.xml b/tests/qemuxml2xmloutdata/disk-floppy.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/disk-floppy.xml
rename to tests/qemuxml2xmloutdata/disk-floppy.x86_64-latest.xml
index 1599ad2180..3542fbb6a9 100644
--- a/tests/qemuxml2xmloutdata/disk-floppy.xml
+++ b/tests/qemuxml2xmloutdata/disk-floppy.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -32,7 +35,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-fmt-qcow.xml b/tests/qemuxml2xmloutdata/disk-fmt-qcow.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-fmt-qcow.xml
rename to tests/qemuxml2xmloutdata/disk-fmt-qcow.x86_64-latest.xml
index b177021d61..11ec85a9ed 100644
--- a/tests/qemuxml2xmloutdata/disk-fmt-qcow.xml
+++ b/tests/qemuxml2xmloutdata/disk-fmt-qcow.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -27,7 +30,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-network-gluster.xml b/tests/qemuxml2xmloutdata/disk-network-gluster.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/disk-network-gluster.xml
rename to tests/qemuxml2xmloutdata/disk-network-gluster.x86_64-latest.xml
index 4be82efe35..3213a6d7c4 100644
--- a/tests/qemuxml2xmloutdata/disk-network-gluster.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-gluster.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -40,7 +43,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-network-nbd.xml b/tests/qemuxml2xmloutdata/disk-network-nbd.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/disk-network-nbd.xml
rename to tests/qemuxml2xmloutdata/disk-network-nbd.x86_64-latest.xml
index 38d1f290c8..26cb503b50 100644
--- a/tests/qemuxml2xmloutdata/disk-network-nbd.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-nbd.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -63,7 +66,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd.xml b/tests/qemuxml2xmloutdata/disk-network-rbd.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/disk-network-rbd.xml
rename to tests/qemuxml2xmloutdata/disk-network-rbd.x86_64-latest.xml
index a8faca96ac..6da7185d18 100644
--- a/tests/qemuxml2xmloutdata/disk-network-rbd.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-rbd.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -76,7 +79,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml b/tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
rename to tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-latest.xml
index a36215b8df..094de3a4d5 100644
--- a/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -28,7 +31,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-network-source-auth.xml b/tests/qemuxml2xmloutdata/disk-network-source-auth.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/disk-network-source-auth.xml
rename to tests/qemuxml2xmloutdata/disk-network-source-auth.x86_64-latest.xml
index 13ebb1d5d7..1c7a2d7c40 100644
--- a/tests/qemuxml2xmloutdata/disk-network-source-auth.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-source-auth.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -51,7 +54,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.xml b/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.x86_64-latest.xml
similarity index 87%
rename from tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.xml
rename to tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.x86_64-latest.xml
index 1810ed3505..cc542f1e19 100644
--- a/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -22,7 +25,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-serial.xml b/tests/qemuxml2xmloutdata/disk-serial.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/disk-serial.xml
rename to tests/qemuxml2xmloutdata/disk-serial.x86_64-latest.xml
index e430a10a93..9d3fc4bc95 100644
--- a/tests/qemuxml2xmloutdata/disk-serial.xml
+++ b/tests/qemuxml2xmloutdata/disk-serial.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -33,7 +36,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml b/tests/qemuxml2xmloutdata/disk-source-pool-mode.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
rename to tests/qemuxml2xmloutdata/disk-source-pool-mode.x86_64-latest.xml
index c9b47a970e..fb863157d8 100644
--- a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
+++ b/tests/qemuxml2xmloutdata/disk-source-pool-mode.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -56,7 +59,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-source-pool.xml b/tests/qemuxml2xmloutdata/disk-source-pool.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/disk-source-pool.xml
rename to tests/qemuxml2xmloutdata/disk-source-pool.x86_64-latest.xml
index 5d38f1286b..9ca3ec70a3 100644
--- a/tests/qemuxml2xmloutdata/disk-source-pool.xml
+++ b/tests/qemuxml2xmloutdata/disk-source-pool.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -51,7 +54,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/disk-virtio.xml b/tests/qemuxml2xmloutdata/disk-virtio.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/disk-virtio.xml
rename to tests/qemuxml2xmloutdata/disk-virtio.x86_64-latest.xml
index b54c1915f7..68830c270e 100644
--- a/tests/qemuxml2xmloutdata/disk-virtio.xml
+++ b/tests/qemuxml2xmloutdata/disk-virtio.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -39,7 +42,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/downscript.xml b/tests/qemuxml2xmloutdata/downscript.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/downscript.xml
rename to tests/qemuxml2xmloutdata/downscript.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/eoi-disabled.xml b/tests/qemuxml2xmloutdata/eoi-disabled.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/eoi-disabled.xml
rename to tests/qemuxml2xmloutdata/eoi-disabled.x86_64-latest.xml
index 93cd197364..c62aa21f37 100644
--- a/tests/qemuxml2xmloutdata/eoi-disabled.xml
+++ b/tests/qemuxml2xmloutdata/eoi-disabled.x86_64-latest.xml
@@ -13,13 +13,16 @@
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/eoi-enabled.xml b/tests/qemuxml2xmloutdata/eoi-enabled.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/eoi-enabled.xml
rename to tests/qemuxml2xmloutdata/eoi-enabled.x86_64-latest.xml
index 17f1fab061..1b9af7ee13 100644
--- a/tests/qemuxml2xmloutdata/eoi-enabled.xml
+++ b/tests/qemuxml2xmloutdata/eoi-enabled.x86_64-latest.xml
@@ -13,13 +13,16 @@
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/event_idx.xml b/tests/qemuxml2xmloutdata/event_idx.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/event_idx.xml
rename to tests/qemuxml2xmloutdata/event_idx.x86_64-latest.xml
index 32a5e9ca7e..44f95a756b 100644
--- a/tests/qemuxml2xmloutdata/event_idx.xml
+++ b/tests/qemuxml2xmloutdata/event_idx.x86_64-latest.xml
@@ -10,6 +10,9 @@
+
+ qemu64
+
destroy
restart
@@ -29,7 +32,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/floppy-drive-fat.xml b/tests/qemuxml2xmloutdata/floppy-drive-fat.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/floppy-drive-fat.xml
rename to tests/qemuxml2xmloutdata/floppy-drive-fat.x86_64-latest.xml
index 7b835b7269..f4d81dbe87 100644
--- a/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
+++ b/tests/qemuxml2xmloutdata/floppy-drive-fat.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -21,7 +24,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/hyperv-off.xml b/tests/qemuxml2xmloutdata/hyperv-off.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/hyperv-off.xml
rename to tests/qemuxml2xmloutdata/hyperv-off.x86_64-latest.xml
index 88e97c3de0..5805fea7b7 100644
--- a/tests/qemuxml2xmloutdata/hyperv-off.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-off.x86_64-latest.xml
@@ -27,13 +27,16 @@
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/hyperv-panic.xml b/tests/qemuxml2xmloutdata/hyperv-panic.x86_64-latest.xml
similarity index 84%
rename from tests/qemuxml2xmloutdata/hyperv-panic.xml
rename to tests/qemuxml2xmloutdata/hyperv-panic.x86_64-latest.xml
index 5f7a097ac9..28f11e9358 100644
--- a/tests/qemuxml2xmloutdata/hyperv-panic.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-panic.x86_64-latest.xml
@@ -11,13 +11,16 @@
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/hyperv-passthrough.xml b/tests/qemuxml2xmloutdata/hyperv-passthrough.x86_64-latest.xml
similarity index 85%
rename from tests/qemuxml2xmloutdata/hyperv-passthrough.xml
rename to tests/qemuxml2xmloutdata/hyperv-passthrough.x86_64-latest.xml
index de53cb9722..2cfae8fa4c 100644
--- a/tests/qemuxml2xmloutdata/hyperv-passthrough.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-passthrough.x86_64-latest.xml
@@ -13,13 +13,16 @@
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml b/tests/qemuxml2xmloutdata/hyperv-stimer-direct.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml
rename to tests/qemuxml2xmloutdata/hyperv-stimer-direct.x86_64-latest.xml
index d495193fad..efb9d0072e 100644
--- a/tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-stimer-direct.x86_64-latest.xml
@@ -18,13 +18,16 @@
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/hyperv.xml b/tests/qemuxml2xmloutdata/hyperv.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/hyperv.xml
rename to tests/qemuxml2xmloutdata/hyperv.x86_64-latest.xml
index 4445c85118..4828177263 100644
--- a/tests/qemuxml2xmloutdata/hyperv.xml
+++ b/tests/qemuxml2xmloutdata/hyperv.x86_64-latest.xml
@@ -28,13 +28,16 @@
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/interface-driver.xml b/tests/qemuxml2xmloutdata/interface-driver.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/interface-driver.xml
rename to tests/qemuxml2xmloutdata/interface-driver.x86_64-latest.xml
index 435489e009..be40782604 100644
--- a/tests/qemuxml2xmloutdata/interface-driver.xml
+++ b/tests/qemuxml2xmloutdata/interface-driver.x86_64-latest.xml
@@ -10,6 +10,9 @@
+
+ qemu64
+
destroy
restart
@@ -29,7 +32,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/misc-no-reboot.xml b/tests/qemuxml2xmloutdata/misc-no-reboot.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/misc-no-reboot.xml
rename to tests/qemuxml2xmloutdata/misc-no-reboot.x86_64-latest.xml
index 38bea7aa24..7f4211b94b 100644
--- a/tests/qemuxml2xmloutdata/misc-no-reboot.xml
+++ b/tests/qemuxml2xmloutdata/misc-no-reboot.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
destroy
@@ -20,7 +23,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/net-coalesce.xml b/tests/qemuxml2xmloutdata/net-coalesce.x86_64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/net-coalesce.xml
rename to tests/qemuxml2xmloutdata/net-coalesce.x86_64-latest.xml
index 9a53b1941a..c99ba6c6e5 100644
--- a/tests/qemuxml2xmloutdata/net-coalesce.xml
+++ b/tests/qemuxml2xmloutdata/net-coalesce.x86_64-latest.xml
@@ -10,6 +10,9 @@
+
+ qemu64
+
destroy
restart
@@ -29,7 +32,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/net-mtu.xml b/tests/qemuxml2xmloutdata/net-mtu.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/net-mtu.xml
rename to tests/qemuxml2xmloutdata/net-mtu.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/net-user.xml b/tests/qemuxml2xmloutdata/net-user.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/net-user.xml
rename to tests/qemuxml2xmloutdata/net-user.x86_64-latest.xml
index 7c35a41709..e02b451bfe 100644
--- a/tests/qemuxml2xmloutdata/net-user.xml
+++ b/tests/qemuxml2xmloutdata/net-user.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -20,7 +23,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/net-vhostuser.xml b/tests/qemuxml2xmloutdata/net-vhostuser.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/net-vhostuser.xml
rename to tests/qemuxml2xmloutdata/net-vhostuser.x86_64-latest.xml
index 8081724535..c77d46147e 100644
--- a/tests/qemuxml2xmloutdata/net-vhostuser.xml
+++ b/tests/qemuxml2xmloutdata/net-vhostuser.x86_64-latest.xml
@@ -8,13 +8,16 @@
hvm
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml b/tests/qemuxml2xmloutdata/numatune-auto-prefer.x86_64-latest.xml
similarity index 87%
rename from tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
rename to tests/qemuxml2xmloutdata/numatune-auto-prefer.x86_64-latest.xml
index cef9f8c5e6..cb34a420bc 100644
--- a/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
+++ b/tests/qemuxml2xmloutdata/numatune-auto-prefer.x86_64-latest.xml
@@ -11,7 +11,8 @@
hvm
-
+
+ qemu64
|
@@ -22,7 +23,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/numatune-distances.xml b/tests/qemuxml2xmloutdata/numatune-distances.x86_64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/numatune-distances.xml
rename to tests/qemuxml2xmloutdata/numatune-distances.x86_64-latest.xml
index 4f038931c3..b99d78daa3 100644
--- a/tests/qemuxml2xmloutdata/numatune-distances.xml
+++ b/tests/qemuxml2xmloutdata/numatune-distances.x86_64-latest.xml
@@ -13,7 +13,8 @@
-
+
+ qemu64
@@ -83,7 +84,7 @@
restart
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml b/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
rename to tests/qemuxml2xmloutdata/numatune-memnode-no-memory.x86_64-latest.xml
index 78a643ec2d..360d176b2f 100644
--- a/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
+++ b/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.x86_64-latest.xml
@@ -11,7 +11,8 @@
hvm
-
+
+ qemu64
|
|
@@ -23,7 +24,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode.xml b/tests/qemuxml2xmloutdata/numatune-memnode.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/numatune-memnode.xml
rename to tests/qemuxml2xmloutdata/numatune-memnode.x86_64-latest.xml
index a117745bfb..06564a5327 100644
--- a/tests/qemuxml2xmloutdata/numatune-memnode.xml
+++ b/tests/qemuxml2xmloutdata/numatune-memnode.x86_64-latest.xml
@@ -13,7 +13,8 @@
hvm
-
+
+ qemu64
|
|
@@ -26,7 +27,7 @@
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/pages-discard.xml b/tests/qemuxml2xmloutdata/pages-discard.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/pages-discard.xml
rename to tests/qemuxml2xmloutdata/pages-discard.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml b/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml
rename to tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.x86_64-latest.xml
index a59d837cc6..6410d6320e 100644
--- a/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
diff --git a/tests/qemuxml2xmloutdata/pci-rom-disabled.xml b/tests/qemuxml2xmloutdata/pci-rom-disabled.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/pci-rom-disabled.xml
rename to tests/qemuxml2xmloutdata/pci-rom-disabled.x86_64-latest.xml
index e693145163..7c00018a12 100644
--- a/tests/qemuxml2xmloutdata/pci-rom-disabled.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom-disabled.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
diff --git a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
rename to tests/qemuxml2xmloutdata/pci-serial-dev-chardev.x86_64-latest.xml
index c730a67cec..5e2b69b427 100644
--- a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
+++ b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -20,7 +23,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/pcihole64-gib.xml b/tests/qemuxml2xmloutdata/pcihole64-gib.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/pcihole64-gib.xml
rename to tests/qemuxml2xmloutdata/pcihole64-gib.x86_64-latest.xml
index 1ad7ca40d8..5ebd8787e9 100644
--- a/tests/qemuxml2xmloutdata/pcihole64-gib.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64-gib.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -17,7 +20,7 @@
1048576
-
+
diff --git a/tests/qemuxml2xmloutdata/pcihole64.xml b/tests/qemuxml2xmloutdata/pcihole64.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/pcihole64.xml
rename to tests/qemuxml2xmloutdata/pcihole64.x86_64-latest.xml
index 5058107227..45c245e25b 100644
--- a/tests/qemuxml2xmloutdata/pcihole64.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -17,7 +20,7 @@
1048576
-
+
diff --git a/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml b/tests/qemuxml2xmloutdata/pv-spinlock-disabled.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
rename to tests/qemuxml2xmloutdata/pv-spinlock-disabled.x86_64-latest.xml
index ec1f4b77bd..f95daa63b4 100644
--- a/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
+++ b/tests/qemuxml2xmloutdata/pv-spinlock-disabled.x86_64-latest.xml
@@ -13,13 +13,16 @@
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml b/tests/qemuxml2xmloutdata/pv-spinlock-enabled.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
rename to tests/qemuxml2xmloutdata/pv-spinlock-enabled.x86_64-latest.xml
index c82d3af837..9093d9509d 100644
--- a/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
+++ b/tests/qemuxml2xmloutdata/pv-spinlock-enabled.x86_64-latest.xml
@@ -13,13 +13,16 @@
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/serial-debugcon.xml b/tests/qemuxml2xmloutdata/serial-debugcon.x86_64-latest.xml
similarity index 87%
rename from tests/qemuxml2xmloutdata/serial-debugcon.xml
rename to tests/qemuxml2xmloutdata/serial-debugcon.x86_64-latest.xml
index 4084d3b2fe..b85824c5f2 100644
--- a/tests/qemuxml2xmloutdata/serial-debugcon.xml
+++ b/tests/qemuxml2xmloutdata/serial-debugcon.x86_64-latest.xml
@@ -8,13 +8,16 @@
hvm
+
+ qemu64
+
destroy
restart
destroy
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
rename to tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.x86_64-latest.xml
index 4cdefed63d..6fdc0d0d73 100644
--- a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
+++ b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -20,7 +23,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml b/tests/qemuxml2xmloutdata/tap-vhost-incorrect.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
rename to tests/qemuxml2xmloutdata/tap-vhost-incorrect.x86_64-latest.xml
index 1235588810..803136669b 100644
--- a/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
+++ b/tests/qemuxml2xmloutdata/tap-vhost-incorrect.x86_64-latest.xml
@@ -10,13 +10,16 @@
+
+ qemu64
+
destroy
restart
restart
/usr/bin/qemu-system-x86_64
-
+
diff --git a/tests/qemuxml2xmloutdata/tap-vhost.xml b/tests/qemuxml2xmloutdata/tap-vhost.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/tap-vhost.xml
rename to tests/qemuxml2xmloutdata/tap-vhost.x86_64-latest.xml
index 7f5b192f86..e4f38179ce 100644
--- a/tests/qemuxml2xmloutdata/tap-vhost.xml
+++ b/tests/qemuxml2xmloutdata/tap-vhost.x86_64-latest.xml
@@ -10,6 +10,9 @@
+
+ qemu64
+
destroy
restart
@@ -29,7 +32,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/vhost_queues.xml b/tests/qemuxml2xmloutdata/vhost_queues.x86_64-latest.xml
similarity index 93%
rename from tests/qemuxml2xmloutdata/vhost_queues.xml
rename to tests/qemuxml2xmloutdata/vhost_queues.x86_64-latest.xml
index 46428b59e2..8fbc4ccc99 100644
--- a/tests/qemuxml2xmloutdata/vhost_queues.xml
+++ b/tests/qemuxml2xmloutdata/vhost_queues.x86_64-latest.xml
@@ -10,6 +10,9 @@
+
+ qemu64
+
destroy
restart
@@ -29,7 +32,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/virtio-lun.xml b/tests/qemuxml2xmloutdata/virtio-lun.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/virtio-lun.xml
rename to tests/qemuxml2xmloutdata/virtio-lun.x86_64-latest.xml
index cdb804e9a0..1b891bdb4e 100644
--- a/tests/qemuxml2xmloutdata/virtio-lun.xml
+++ b/tests/qemuxml2xmloutdata/virtio-lun.x86_64-latest.xml
@@ -10,6 +10,9 @@
+
+ qemu64
+
destroy
restart
@@ -28,7 +31,7 @@
-
+
diff --git a/tests/qemuxml2xmloutdata/watchdog.xml b/tests/qemuxml2xmloutdata/watchdog.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/watchdog.xml
rename to tests/qemuxml2xmloutdata/watchdog.x86_64-latest.xml
index 1dde2ee700..b87d5c4fdf 100644
--- a/tests/qemuxml2xmloutdata/watchdog.xml
+++ b/tests/qemuxml2xmloutdata/watchdog.x86_64-latest.xml
@@ -8,6 +8,9 @@
hvm
+
+ qemu64
+
destroy
restart
@@ -20,7 +23,7 @@
-
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 0302a70410..da59a1676b 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -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_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_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("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 |