qemuxml2xmltests.c: convert pseries tests to DO_TEST_CAPS_ARCH_LATEST

qemuxml2xmltests that have "pseries" in the name now use the
DO_TEST_CAPS_LATEST_ARCH() macro.

Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>

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 cebb977d5ad20323a3f3492c626ecfb42ac8afdf..f22634994cefe8cceb3039118d1aac807757432f 100644 (file)
--- 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 (symlink)
index 0000000..78d6d48
--- /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 (symlink)
index 0d45a89..0000000
--- 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 0a44ea36bc011a62781e01b8fd0056a00d136775..02e3d0136eea4af367e74ea9e395762ecdd9bfba 100644 (file)
--- 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 93d692be0c5d4b670df00cefb0d011046b10ae1b..20843f89891b3649e3e4244d40af85d249ca2044 100644 (file)
--- 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 4b880df6106999374cac75e5be8cc2057e86855b..066708990c0749c992bab24bb44ab94967aabd1c 100644 (file)
--- 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 a8e88d012f914abee4ecf641587eaa4c3d296131..307d434051e3f9da9b7666afde7a7601fa6da57c 100644 (file)
--- 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 94a8f6a66f0e86677ed5c93f44b28bd9950ea0ca..c211da4fb72cb8b21894a5ac5d1d7b56fed8995f 100644 (file)
--- 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 cff29a97c2da9bb3ab26184f8a0d14ca8f7943be..db369a1fc719f1131185955683ad52ecce25b016 100644 (file)
--- 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 598513d78437bbb83092d534931a26253b21c4e3..09b657698db3ec3317c959a8cd95ac71755e9a0a 100644 (file)
--- 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 a1f00ddc7fd83e9e4f10f81a6295883938a38e9c..58ffb09c3b18d17aa12f10d4331844a499aac136 100644 (file)
--- 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 45521c907aaa7b1d1e7d85893691de3acd5d1ce2..dbc5d0a94c882bf9c12e85e3838679cb95b599e4 100644 (file)
--- 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 0b1f670b3f44ddb4700366c03013fa37dbaf22d7..f9c5a78eddef756bd11deef69ef984b2bbae8a12 100644 (file)
--- 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 3c23523c60cf4b88142e928c658094d9f317c970..5abf023b487fc51c65f24633196d57167c41220d 100644 (file)
--- 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 278222ddea3bcd2ef63903c8b47bd4179283f62e..c7a36df4e25de2b24502f05d902fb7458f059e32 100644 (file)
--- 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 cebb977d5ad20323a3f3492c626ecfb42ac8afdf..f22634994cefe8cceb3039118d1aac807757432f 100644 (file)
--- 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 cebb977d5ad20323a3f3492c626ecfb42ac8afdf..f22634994cefe8cceb3039118d1aac807757432f 100644 (file)
--- 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 9fa36ca3dfb8af8d7f653f81acc2bff1a3b0de8d..db513febadde4cfc80af8f73bf9d174b55158807 100644 (file)
--- 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 56d8ee9f86d85ae2431cbbe372ddc88248717dde..59015846fb3265193561b9939d3926d378da48fd 100644 (file)
--- 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 9966c891671340d0a3ab9575a3b826602a526f2e..80231e3dd7f7108e2a079ca58554ac12f45a62a7 100644 (file)
--- 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 (symlink)
index 0000000..78d6d48
--- /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 (symlink)
index 0d45a89..0000000
--- 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 (symlink)
index 0000000..78d6d48
--- /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 (symlink)
index 0d45a89..0000000
--- 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 299ae61081773c7a33a138e80316b44d6d6836d6..ebe7b5738bd576e1839c9d4a164d9af09e098ad2 100644 (file)
--- 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 e7517008ca0fa972f8798974353d82c341903ec5..803bc55010b81b1b314cb52b8c9fbb8950d69f46 100644 (file)
--- 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 4d5989ef4f2cbfa3114fb320120c00c953f08336..3a69273d39a336ed6cdcfd71ba3cd7732f6f0bbc 100644 (file)
--- 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 bef8c4e010f2d69d9eb07dd62bb5d72c2285acc7..9ac43d32946c1b9f034c031ea74f2b96b0b05ffa 100644 (file)
--- 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,