[PATCH 5/9] 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(a)redhat.com&gt; --- .../ppc64-modern-bulk-domain.xml | 4 ++-- .../ppc64-modern-bulk-result-conf.xml | 18 ++++++++++-------- .../ppc64-modern-bulk-result-live.xml | 19 ++++++++----------- .../ppc64-modern-individual-domain.xml | 4 ++-- .../ppc64-modern-individual-result-conf.xml | 18 ++++++++++-------- .../ppc64-modern-individual-result-live.xml | 19 ++++++++----------- 6 files changed, 40 insertions(+), 42 deletions(-) diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-domain.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-domain.xml index cc0322762a..f7c754ccf7 100644 --- 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 afb2c85bc2..ad11b2f8a6 100644 --- 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 d86247d70c..2a3b4a495f 100644 --- 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 cc0322762a..f7c754ccf7 100644 --- 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 e8d30f7ddd..34aec9b965 100644 --- 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 afc500657c..5ce2cfd0b0 100644 --- 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> -- 2.41.0