qemuxml2xmltests that have "pseries" in the name now use the
DO_TEST_CAPS_LATEST_ARCH() macro.
Signed-off-by: Daniel Henrique Barboza <danielhb413@xxxxxxxxx>
---
...ies.xml => panic-pseries.ppc64-latest.xml} | 5 +-
.../pseries-console-native.ppc64-latest.xml | 1 +
.../pseries-console-native.xml | 1 -
...> pseries-console-virtio.ppc64-latest.xml} | 3 +
...series-cpu-compat-power9.ppc64-latest.xml} | 2 +-
...ml => pseries-cpu-compat.ppc64-latest.xml} | 2 +-
...xml => pseries-cpu-exact.ppc64-latest.xml} | 2 +-
....xml => pseries-features.ppc64-latest.xml} | 3 +
...ml => pseries-hostdevs-1.ppc64-latest.xml} | 3 +
...ml => pseries-hostdevs-2.ppc64-latest.xml} | 3 +
...ml => pseries-hostdevs-3.ppc64-latest.xml} | 3 +
... => pseries-many-buses-1.ppc64-latest.xml} | 3 +
... => pseries-many-buses-2.ppc64-latest.xml} | 3 +
... => pseries-many-devices.ppc64-latest.xml} | 3 +
...ram.xml => pseries-nvram.ppc64-latest.xml} | 5 +-
...=> pseries-panic-missing.ppc64-latest.xml} | 5 +-
...pseries-panic-no-address.ppc64-latest.xml} | 5 +-
...ries-phb-default-missing.ppc64-latest.xml} | 11 +-
...=> pseries-phb-numa-node.ppc64-latest.xml} | 3 +-
...ml => pseries-phb-simple.ppc64-latest.xml} | 11 +-
...ies-serial+console-native.ppc64-latest.xml | 1 +
.../pseries-serial+console-native.xml | 1 -
.../pseries-serial-compat.ppc64-latest.xml | 1 +
.../pseries-serial-compat.xml | 1 -
...=> pseries-serial-native.ppc64-latest.xml} | 3 +
...ml => pseries-serial-pci.ppc64-latest.xml} | 3 +
...ml => pseries-serial-usb.ppc64-latest.xml} | 3 +
tests/qemuxml2xmltest.c | 107 +++++-------------
28 files changed, 99 insertions(+), 98 deletions(-)
rename tests/qemuxml2xmloutdata/{panic-pseries.xml => panic-pseries.ppc64-latest.xml} (88%)
create mode 120000 tests/qemuxml2xmloutdata/pseries-console-native.ppc64-latest.xml
delete mode 120000 tests/qemuxml2xmloutdata/pseries-console-native.xml
rename tests/qemuxml2xmloutdata/{pseries-console-virtio.xml => pseries-console-virtio.ppc64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{pseries-cpu-compat-power9.xml => pseries-cpu-compat-power9.ppc64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{pseries-cpu-compat.xml => pseries-cpu-compat.ppc64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{pseries-cpu-exact.xml => pseries-cpu-exact.ppc64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{pseries-features.xml => pseries-features.ppc64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{pseries-hostdevs-1.xml => pseries-hostdevs-1.ppc64-latest.xml} (95%)
rename tests/qemuxml2xmloutdata/{pseries-hostdevs-2.xml => pseries-hostdevs-2.ppc64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{pseries-hostdevs-3.xml => pseries-hostdevs-3.ppc64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{pseries-many-buses-1.xml => pseries-many-buses-1.ppc64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{pseries-many-buses-2.xml => pseries-many-buses-2.ppc64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{pseries-many-devices.xml => pseries-many-devices.ppc64-latest.xml} (98%)
rename tests/qemuxml2xmloutdata/{pseries-nvram.xml => pseries-nvram.ppc64-latest.xml} (85%)
rename tests/qemuxml2xmloutdata/{pseries-panic-missing.xml => pseries-panic-missing.ppc64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{pseries-panic-no-address.xml => pseries-panic-no-address.ppc64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{pseries-phb-simple.xml => pseries-phb-default-missing.ppc64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{pseries-phb-numa-node.xml => pseries-phb-numa-node.ppc64-latest.xml} (94%)
rename tests/qemuxml2xmloutdata/{pseries-phb-default-missing.xml => pseries-phb-simple.ppc64-latest.xml} (91%)
create mode 120000 tests/qemuxml2xmloutdata/pseries-serial+console-native.ppc64-latest.xml
delete mode 120000 tests/qemuxml2xmloutdata/pseries-serial+console-native.xml
create mode 120000 tests/qemuxml2xmloutdata/pseries-serial-compat.ppc64-latest.xml
delete mode 120000 tests/qemuxml2xmloutdata/pseries-serial-compat.xml
rename tests/qemuxml2xmloutdata/{pseries-serial-native.xml => pseries-serial-native.ppc64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{pseries-serial-pci.xml => pseries-serial-pci.ppc64-latest.xml} (90%)
rename tests/qemuxml2xmloutdata/{pseries-serial-usb.xml => pseries-serial-usb.ppc64-latest.xml} (91%)
diff --git a/tests/qemuxml2xmloutdata/panic-pseries.xml b/tests/qemuxml2xmloutdata/panic-pseries.ppc64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/panic-pseries.xml
rename to tests/qemuxml2xmloutdata/panic-pseries.ppc64-latest.xml
index cebb977d5a..f22634994c 100644
--- a/tests/qemuxml2xmloutdata/panic-pseries.xml
+++ b/tests/qemuxml2xmloutdata/panic-pseries.ppc64-latest.xml
@@ -8,13 +8,16 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</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-ppc64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='pci-ohci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'>
diff --git a/tests/qemuxml2xmloutdata/pseries-console-native.ppc64-latest.xml b/tests/qemuxml2xmloutdata/pseries-console-native.ppc64-latest.xml
new file mode 120000
index 0000000000..78d6d489ee
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-console-native.ppc64-latest.xml
@@ -0,0 +1 @@
+pseries-serial-native.ppc64-latest.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/pseries-console-native.xml b/tests/qemuxml2xmloutdata/pseries-console-native.xml
deleted file mode 120000
index 0d45a892c8..0000000000
--- a/tests/qemuxml2xmloutdata/pseries-console-native.xml
+++ /dev/null
@@ -1 +0,0 @@
-pseries-serial-native.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/pseries-console-virtio.xml b/tests/qemuxml2xmloutdata/pseries-console-virtio.ppc64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/pseries-console-virtio.xml
rename to tests/qemuxml2xmloutdata/pseries-console-virtio.ppc64-latest.xml
index 0a44ea36bc..02e3d0136e 100644
--- a/tests/qemuxml2xmloutdata/pseries-console-virtio.xml
+++ b/tests/qemuxml2xmloutdata/pseries-console-virtio.ppc64-latest.xml
@@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.xml b/tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.ppc64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.xml
rename to tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.ppc64-latest.xml
index 93d692be0c..20843f8989 100644
--- a/tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.xml
+++ b/tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.ppc64-latest.xml
@@ -17,7 +17,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-ppc64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='pci-ohci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'>
diff --git a/tests/qemuxml2xmloutdata/pseries-cpu-compat.xml b/tests/qemuxml2xmloutdata/pseries-cpu-compat.ppc64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/pseries-cpu-compat.xml
rename to tests/qemuxml2xmloutdata/pseries-cpu-compat.ppc64-latest.xml
index 4b880df610..066708990c 100644
--- a/tests/qemuxml2xmloutdata/pseries-cpu-compat.xml
+++ b/tests/qemuxml2xmloutdata/pseries-cpu-compat.ppc64-latest.xml
@@ -17,7 +17,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-ppc64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='pci-ohci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'>
diff --git a/tests/qemuxml2xmloutdata/pseries-cpu-exact.xml b/tests/qemuxml2xmloutdata/pseries-cpu-exact.ppc64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/pseries-cpu-exact.xml
rename to tests/qemuxml2xmloutdata/pseries-cpu-exact.ppc64-latest.xml
index a8e88d012f..307d434051 100644
--- a/tests/qemuxml2xmloutdata/pseries-cpu-exact.xml
+++ b/tests/qemuxml2xmloutdata/pseries-cpu-exact.ppc64-latest.xml
@@ -18,7 +18,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-ppc64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='pci-ohci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'>
diff --git a/tests/qemuxml2xmloutdata/pseries-features.xml b/tests/qemuxml2xmloutdata/pseries-features.ppc64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/pseries-features.xml
rename to tests/qemuxml2xmloutdata/pseries-features.ppc64-latest.xml
index 94a8f6a66f..c211da4fb7 100644
--- a/tests/qemuxml2xmloutdata/pseries-features.xml
+++ b/tests/qemuxml2xmloutdata/pseries-features.ppc64-latest.xml
@@ -19,6 +19,9 @@
<sbbc value='broken'/>
<ibs value='fixed-ccd'/>
</features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/pseries-hostdevs-1.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-1.ppc64-latest.xml
similarity index 95%
rename from tests/qemuxml2xmloutdata/pseries-hostdevs-1.xml
rename to tests/qemuxml2xmloutdata/pseries-hostdevs-1.ppc64-latest.xml
index cff29a97c2..db369a1fc7 100644
--- a/tests/qemuxml2xmloutdata/pseries-hostdevs-1.xml
+++ b/tests/qemuxml2xmloutdata/pseries-hostdevs-1.ppc64-latest.xml
@@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/pseries-hostdevs-2.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-2.ppc64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/pseries-hostdevs-2.xml
rename to tests/qemuxml2xmloutdata/pseries-hostdevs-2.ppc64-latest.xml
index 598513d784..09b657698d 100644
--- a/tests/qemuxml2xmloutdata/pseries-hostdevs-2.xml
+++ b/tests/qemuxml2xmloutdata/pseries-hostdevs-2.ppc64-latest.xml
@@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/pseries-hostdevs-3.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-3.ppc64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/pseries-hostdevs-3.xml
rename to tests/qemuxml2xmloutdata/pseries-hostdevs-3.ppc64-latest.xml
index a1f00ddc7f..58ffb09c3b 100644
--- a/tests/qemuxml2xmloutdata/pseries-hostdevs-3.xml
+++ b/tests/qemuxml2xmloutdata/pseries-hostdevs-3.ppc64-latest.xml
@@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/pseries-many-buses-1.xml b/tests/qemuxml2xmloutdata/pseries-many-buses-1.ppc64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/pseries-many-buses-1.xml
rename to tests/qemuxml2xmloutdata/pseries-many-buses-1.ppc64-latest.xml
index 45521c907a..dbc5d0a94c 100644
--- a/tests/qemuxml2xmloutdata/pseries-many-buses-1.xml
+++ b/tests/qemuxml2xmloutdata/pseries-many-buses-1.ppc64-latest.xml
@@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/pseries-many-buses-2.xml b/tests/qemuxml2xmloutdata/pseries-many-buses-2.ppc64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/pseries-many-buses-2.xml
rename to tests/qemuxml2xmloutdata/pseries-many-buses-2.ppc64-latest.xml
index 0b1f670b3f..f9c5a78edd 100644
--- a/tests/qemuxml2xmloutdata/pseries-many-buses-2.xml
+++ b/tests/qemuxml2xmloutdata/pseries-many-buses-2.ppc64-latest.xml
@@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/pseries-many-devices.xml b/tests/qemuxml2xmloutdata/pseries-many-devices.ppc64-latest.xml
similarity index 98%
rename from tests/qemuxml2xmloutdata/pseries-many-devices.xml
rename to tests/qemuxml2xmloutdata/pseries-many-devices.ppc64-latest.xml
index 3c23523c60..5abf023b48 100644
--- a/tests/qemuxml2xmloutdata/pseries-many-devices.xml
+++ b/tests/qemuxml2xmloutdata/pseries-many-devices.ppc64-latest.xml
@@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/pseries-nvram.xml b/tests/qemuxml2xmloutdata/pseries-nvram.ppc64-latest.xml
similarity index 85%
rename from tests/qemuxml2xmloutdata/pseries-nvram.xml
rename to tests/qemuxml2xmloutdata/pseries-nvram.ppc64-latest.xml
index 278222ddea..c7a36df4e2 100644
--- a/tests/qemuxml2xmloutdata/pseries-nvram.xml
+++ b/tests/qemuxml2xmloutdata/pseries-nvram.ppc64-latest.xml
@@ -8,13 +8,16 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</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-ppc64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='pci-ohci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'>
diff --git a/tests/qemuxml2xmloutdata/pseries-panic-missing.xml b/tests/qemuxml2xmloutdata/pseries-panic-missing.ppc64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/pseries-panic-missing.xml
rename to tests/qemuxml2xmloutdata/pseries-panic-missing.ppc64-latest.xml
index cebb977d5a..f22634994c 100644
--- a/tests/qemuxml2xmloutdata/pseries-panic-missing.xml
+++ b/tests/qemuxml2xmloutdata/pseries-panic-missing.ppc64-latest.xml
@@ -8,13 +8,16 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</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-ppc64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='pci-ohci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'>
diff --git a/tests/qemuxml2xmloutdata/pseries-panic-no-address.xml b/tests/qemuxml2xmloutdata/pseries-panic-no-address.ppc64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/pseries-panic-no-address.xml
rename to tests/qemuxml2xmloutdata/pseries-panic-no-address.ppc64-latest.xml
index cebb977d5a..f22634994c 100644
--- a/tests/qemuxml2xmloutdata/pseries-panic-no-address.xml
+++ b/tests/qemuxml2xmloutdata/pseries-panic-no-address.ppc64-latest.xml
@@ -8,13 +8,16 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</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-ppc64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='pci-ohci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'>
diff --git a/tests/qemuxml2xmloutdata/pseries-phb-simple.xml b/tests/qemuxml2xmloutdata/pseries-phb-default-missing.ppc64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/pseries-phb-simple.xml
rename to tests/qemuxml2xmloutdata/pseries-phb-default-missing.ppc64-latest.xml
index 9fa36ca3df..db513febad 100644
--- a/tests/qemuxml2xmloutdata/pseries-phb-simple.xml
+++ b/tests/qemuxml2xmloutdata/pseries-phb-default-missing.ppc64-latest.xml
@@ -8,16 +8,15 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</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-ppc64</emulator>
- <controller type='pci' index='0' model='pci-root'>
- <model name='spapr-pci-host-bridge'/>
- <target index='0'/>
- </controller>
<controller type='pci' index='1' model='pci-root'>
<model name='spapr-pci-host-bridge'/>
<target index='1'/>
@@ -27,6 +26,10 @@
<target index='2'/>
</controller>
<controller type='usb' index='0' model='none'/>
+ <controller type='pci' index='0' model='pci-root'>
+ <model name='spapr-pci-host-bridge'/>
+ <target index='0'/>
+ </controller>
<audio id='1' type='none'/>
<memballoon model='none'/>
<panic model='pseries'/>
diff --git a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml
similarity index 94%
rename from tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
rename to tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml
index 56d8ee9f86..59015846fb 100644
--- a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
+++ b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml
@@ -12,7 +12,8 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
<topology sockets='2' dies='1' cores='1' threads='4'/>
<numa>
<cell id='0' cpus='0-3' memory='1048576' unit='KiB'/>
diff --git a/tests/qemuxml2xmloutdata/pseries-phb-default-missing.xml b/tests/qemuxml2xmloutdata/pseries-phb-simple.ppc64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/pseries-phb-default-missing.xml
rename to tests/qemuxml2xmloutdata/pseries-phb-simple.ppc64-latest.xml
index 9966c89167..80231e3dd7 100644
--- a/tests/qemuxml2xmloutdata/pseries-phb-default-missing.xml
+++ b/tests/qemuxml2xmloutdata/pseries-phb-simple.ppc64-latest.xml
@@ -8,12 +8,19 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</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-ppc64</emulator>
+ <controller type='pci' index='0' model='pci-root'>
+ <model name='spapr-pci-host-bridge'/>
+ <target index='0'/>
+ </controller>
<controller type='pci' index='1' model='pci-root'>
<model name='spapr-pci-host-bridge'/>
<target index='1'/>
@@ -23,10 +30,6 @@
<target index='2'/>
</controller>
<controller type='usb' index='0' model='none'/>
- <controller type='pci' index='0' model='pci-root'>
- <model name='spapr-pci-host-bridge'/>
- <target index='0'/>
- </controller>
<audio id='1' type='none'/>
<memballoon model='none'/>
<panic model='pseries'/>
diff --git a/tests/qemuxml2xmloutdata/pseries-serial+console-native.ppc64-latest.xml b/tests/qemuxml2xmloutdata/pseries-serial+console-native.ppc64-latest.xml
new file mode 120000
index 0000000000..78d6d489ee
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-serial+console-native.ppc64-latest.xml
@@ -0,0 +1 @@
+pseries-serial-native.ppc64-latest.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/pseries-serial+console-native.xml b/tests/qemuxml2xmloutdata/pseries-serial+console-native.xml
deleted file mode 120000
index 0d45a892c8..0000000000
--- a/tests/qemuxml2xmloutdata/pseries-serial+console-native.xml
+++ /dev/null
@@ -1 +0,0 @@
-pseries-serial-native.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/pseries-serial-compat.ppc64-latest.xml b/tests/qemuxml2xmloutdata/pseries-serial-compat.ppc64-latest.xml
new file mode 120000
index 0000000000..78d6d489ee
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-serial-compat.ppc64-latest.xml
@@ -0,0 +1 @@
+pseries-serial-native.ppc64-latest.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/pseries-serial-compat.xml b/tests/qemuxml2xmloutdata/pseries-serial-compat.xml
deleted file mode 120000
index 0d45a892c8..0000000000
--- a/tests/qemuxml2xmloutdata/pseries-serial-compat.xml
+++ /dev/null
@@ -1 +0,0 @@
-pseries-serial-native.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/pseries-serial-native.xml b/tests/qemuxml2xmloutdata/pseries-serial-native.ppc64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/pseries-serial-native.xml
rename to tests/qemuxml2xmloutdata/pseries-serial-native.ppc64-latest.xml
index 299ae61081..ebe7b5738b 100644
--- a/tests/qemuxml2xmloutdata/pseries-serial-native.xml
+++ b/tests/qemuxml2xmloutdata/pseries-serial-native.ppc64-latest.xml
@@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/pseries-serial-pci.xml b/tests/qemuxml2xmloutdata/pseries-serial-pci.ppc64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/pseries-serial-pci.xml
rename to tests/qemuxml2xmloutdata/pseries-serial-pci.ppc64-latest.xml
index e7517008ca..803bc55010 100644
--- a/tests/qemuxml2xmloutdata/pseries-serial-pci.xml
+++ b/tests/qemuxml2xmloutdata/pseries-serial-pci.ppc64-latest.xml
@@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmloutdata/pseries-serial-usb.xml b/tests/qemuxml2xmloutdata/pseries-serial-usb.ppc64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/pseries-serial-usb.xml
rename to tests/qemuxml2xmloutdata/pseries-serial-usb.ppc64-latest.xml
index 4d5989ef4f..3a69273d39 100644
--- a/tests/qemuxml2xmloutdata/pseries-serial-usb.xml
+++ b/tests/qemuxml2xmloutdata/pseries-serial-usb.ppc64-latest.xml
@@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>POWER9</model>
+ </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index bef8c4e010..9ac43d3294 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -691,77 +691,30 @@ mymain(void)
QEMU_CAPS_OBJECT_RNG_EGD);
DO_TEST_CAPS_LATEST("virtio-rng-builtin");
- DO_TEST("pseries-nvram",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_DEVICE_NVRAM);
- DO_TEST("pseries-panic-missing",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
- DO_TEST("pseries-panic-no-address",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
-
- DO_TEST("pseries-phb-simple",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
- DO_TEST("pseries-phb-default-missing",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
- DO_TEST("pseries-phb-numa-node",
- QEMU_CAPS_NUMA,
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE,
- QEMU_CAPS_OBJECT_MEMORY_FILE);
-
- DO_TEST("pseries-many-devices",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_VIRTIO_SCSI);
- DO_TEST("pseries-many-buses-1",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_VIRTIO_SCSI);
- DO_TEST("pseries-many-buses-2",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_VIRTIO_SCSI);
- DO_TEST("pseries-hostdevs-1",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_DEVICE_VFIO_PCI);
- DO_TEST("pseries-hostdevs-2",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_DEVICE_VFIO_PCI);
- DO_TEST("pseries-hostdevs-3",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_DEVICE_VFIO_PCI);
-
- DO_TEST("pseries-features",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE,
- QEMU_CAPS_MACHINE_PSERIES_CAP_HTM,
- QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV,
- QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST,
- QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC,
- QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC,
- QEMU_CAPS_MACHINE_PSERIES_CAP_IBS);
-
- DO_TEST("pseries-serial-native",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_DEVICE_SPAPR_VTY);
- DO_TEST("pseries-serial+console-native",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_DEVICE_SPAPR_VTY);
- DO_TEST("pseries-serial-compat",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_DEVICE_SPAPR_VTY);
- DO_TEST("pseries-serial-pci",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_DEVICE_PCI_SERIAL);
- DO_TEST("pseries-serial-usb",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_DEVICE_QEMU_XHCI,
- QEMU_CAPS_DEVICE_USB_SERIAL);
- DO_TEST("pseries-console-native",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_DEVICE_SPAPR_VTY);
- DO_TEST("pseries-console-virtio",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
+ DO_TEST_CAPS_ARCH_LATEST("pseries-nvram", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("pseries-panic-missing", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("pseries-panic-no-address", "ppc64");
+
+ DO_TEST_CAPS_ARCH_LATEST("pseries-phb-simple", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("pseries-phb-default-missing", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("pseries-phb-numa-node", "ppc64");
+
+ DO_TEST_CAPS_ARCH_LATEST("pseries-many-devices", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("pseries-many-buses-1", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("pseries-many-buses-2", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("pseries-hostdevs-1", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("pseries-hostdevs-2", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("pseries-hostdevs-3", "ppc64");
+
+ DO_TEST_CAPS_ARCH_LATEST("pseries-features", "ppc64");
+
+ DO_TEST_CAPS_ARCH_LATEST("pseries-serial-native", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("pseries-serial+console-native", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("pseries-serial-compat", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("pseries-serial-pci", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("pseries-serial-usb", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("pseries-console-native", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("pseries-console-virtio", "ppc64");
DO_TEST_NOCAPS("mach-virt-serial-native");
DO_TEST_NOCAPS("mach-virt-serial+console-native");
@@ -1087,10 +1040,9 @@ mymain(void)
QEMU_CAPS_Q35_PCI_HOLE64_SIZE);
DO_TEST("panic", QEMU_CAPS_DEVICE_PANIC);
- DO_TEST("panic-pseries",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
DO_TEST("panic-double", QEMU_CAPS_DEVICE_PANIC);
DO_TEST("panic-no-address", QEMU_CAPS_DEVICE_PANIC);
+ DO_TEST_CAPS_ARCH_LATEST("panic-pseries", "ppc64");
DO_TEST_NOCAPS("disk-backing-chains");
DO_TEST_NOCAPS("disk-backing-chains-index");
@@ -1333,12 +1285,9 @@ mymain(void)
QEMU_CAPS_DEVICE_CIRRUS_VGA);
DO_TEST("smartcard-controller", QEMU_CAPS_CCID_EMULATED);
- DO_TEST("pseries-cpu-compat-power9",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
- DO_TEST("pseries-cpu-compat",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
- DO_TEST("pseries-cpu-exact",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
+ DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-compat-power9", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-compat", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-exact", "ppc64");
DO_TEST("user-aliases",
QEMU_CAPS_DEVICE_CIRRUS_VGA,
--
2.32.0
