tests: qemuhotplugtest: Fix arch-specific parts of 'ppc64' test XMLs

The tests were using a copy of a x86_64 based XML and thus
'qemuhotplugtest' was selecting wrong capabilities to use for that
specific test.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-domain.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-domain.xml
index cc0322762a3c380d8e64713f4029a332e3be8e76..f7c754ccf7bd3759baa9680e7b111c30e35cf75d 100644 (file)
--- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-domain.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-domain.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static' current='8'>32</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='ppc64' machine='pseries'>hvm</type>
     <boot dev='network'/>
   </os>
   <cpu>
@@ -15,6 +15,6 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-      <emulator>/usr/bin/qemu-system-x86_64</emulator>
+      <emulator>/usr/bin/qemu-system-ppc64</emulator>
   </devices>
 </domain>

diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
index afb2c85bc21476b6ac468c5fd2c41bcc468de6c0..ad11b2f8a613b6b9301bc3bfc310d248e357aa1c 100644 (file)
--- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
@@ -39,11 +39,11 @@
     <vcpu id='31' enabled='no' hotpluggable='yes'/>
   </vcpus>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='ppc64' machine='pseries'>hvm</type>
     <boot dev='network'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>
-    <model fallback='forbid'>qemu64</model>
+    <model fallback='forbid'>POWER9</model>
     <topology sockets='1' dies='1' cores='4' threads='8'/>
   </cpu>
   <clock offset='utc'/>
@@ -51,16 +51,18 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0' model='piix3-uhci'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <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'>
+      <model name='spapr-pci-host-bridge'/>
+      <target index='0'/>
     </controller>
-    <controller type='pci' index='0' model='pci-root'/>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
+    <panic model='pseries'/>
   </devices>
 </domain>

diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
index d86247d70c6c2a17cd0dff4558b3ae886894b7dd..2a3b4a495fd856d2ba618f24646228fb186281c0 100644 (file)
--- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
@@ -39,11 +39,11 @@
     <vcpu id='31' enabled='no' hotpluggable='yes'/>
   </vcpus>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='ppc64' machine='pseries'>hvm</type>
     <boot dev='network'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>
-    <model fallback='forbid'>qemu64</model>
+    <model fallback='forbid'>POWER9</model>
     <topology sockets='1' dies='1' cores='4' threads='8'/>
   </cpu>
   <clock offset='utc'/>
@@ -51,24 +51,21 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0' model='piix3-uhci'>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type='usb' index='0' model='pci-ohci'>
       <alias name='usb'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'>
+      <model name='spapr-pci-host-bridge'/>
+      <target index='0'/>
       <alias name='pci.0'/>
     </controller>
-    <input type='mouse' bus='ps2'>
-      <alias name='input0'/>
-    </input>
-    <input type='keyboard' bus='ps2'>
-      <alias name='input1'/>
-    </input>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <alias name='balloon0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
+    <panic model='pseries'/>
   </devices>
 </domain>

diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml
index cc0322762a3c380d8e64713f4029a332e3be8e76..f7c754ccf7bd3759baa9680e7b111c30e35cf75d 100644 (file)
--- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static' current='8'>32</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='ppc64' machine='pseries'>hvm</type>
     <boot dev='network'/>
   </os>
   <cpu>
@@ -15,6 +15,6 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-      <emulator>/usr/bin/qemu-system-x86_64</emulator>
+      <emulator>/usr/bin/qemu-system-ppc64</emulator>
   </devices>
 </domain>

diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
index e8d30f7ddd63679f55f5dc2e2623cd22becb4a0e..34aec9b96557243449f930765a02b24735905a2e 100644 (file)
--- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
@@ -39,11 +39,11 @@
     <vcpu id='31' enabled='no' hotpluggable='yes'/>
   </vcpus>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='ppc64' machine='pseries'>hvm</type>
     <boot dev='network'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>
-    <model fallback='forbid'>qemu64</model>
+    <model fallback='forbid'>POWER9</model>
     <topology sockets='1' dies='1' cores='4' threads='8'/>
   </cpu>
   <clock offset='utc'/>
@@ -51,16 +51,18 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0' model='piix3-uhci'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <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'>
+      <model name='spapr-pci-host-bridge'/>
+      <target index='0'/>
     </controller>
-    <controller type='pci' index='0' model='pci-root'/>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
+    <panic model='pseries'/>
   </devices>
 </domain>

diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
index afc500657c532f5a82e11cbadf35b6f0de09caca..5ce2cfd0b0df4774dd49fb8d87f8723f387f251e 100644 (file)
--- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
@@ -39,11 +39,11 @@
     <vcpu id='31' enabled='no' hotpluggable='yes'/>
   </vcpus>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='ppc64' machine='pseries'>hvm</type>
     <boot dev='network'/>
   </os>
   <cpu mode='custom' match='exact' check='none'>
-    <model fallback='forbid'>qemu64</model>
+    <model fallback='forbid'>POWER9</model>
     <topology sockets='1' dies='1' cores='4' threads='8'/>
   </cpu>
   <clock offset='utc'/>
@@ -51,24 +51,21 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0' model='piix3-uhci'>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type='usb' index='0' model='pci-ohci'>
       <alias name='usb'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'>
+      <model name='spapr-pci-host-bridge'/>
+      <target index='0'/>
       <alias name='pci.0'/>
     </controller>
-    <input type='mouse' bus='ps2'>
-      <alias name='input0'/>
-    </input>
-    <input type='keyboard' bus='ps2'>
-      <alias name='input1'/>
-    </input>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <alias name='balloon0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
+    <panic model='pseries'/>
   </devices>
 </domain>