External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Peter Krempa 2023-08-28 14:24:52 +02:00
parent a8f3d406e3
commit 140ff3c514
6 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/qemuhotplugtestcpus/ppc64-modern-bulk-domain.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory> <currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' current='8'>32</vcpu> <vcpu placement='static' current='8'>32</vcpu>
<os> <os>
<type arch='x86_64' machine='pc'>hvm</type> <type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='network'/> <boot dev='network'/>
</os> </os>
<cpu> <cpu>
@ -15,6 +15,6 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator> <emulator>/usr/bin/qemu-system-ppc64</emulator>
</devices> </devices>
</domain> </domain>

18
tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
View File

@ -39,11 +39,11 @@
<vcpu id='31' enabled='no' hotpluggable='yes'/> <vcpu id='31' enabled='no' hotpluggable='yes'/>
</vcpus> </vcpus>
<os> <os>
<type arch='x86_64' machine='pc'>hvm</type> <type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='network'/> <boot dev='network'/>
</os> </os>
<cpu mode='custom' match='exact' check='none'> <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'/> <topology sockets='1' dies='1' cores='4' threads='8'/>
</cpu> </cpu>
<clock offset='utc'/> <clock offset='utc'/>
@ -51,16 +51,18 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator> <emulator>/usr/bin/qemu-system-ppc64</emulator>
<controller type='usb' index='0' model='piix3-uhci'> <controller type='usb' index='0' model='pci-ohci'>
<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'/>
</controller> </controller>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/> <audio id='1' type='none'/>
<memballoon model='virtio'> <memballoon model='virtio'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</memballoon> </memballoon>
<panic model='pseries'/>
</devices> </devices>
</domain> </domain>

19
tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
View File

@ -39,11 +39,11 @@
<vcpu id='31' enabled='no' hotpluggable='yes'/> <vcpu id='31' enabled='no' hotpluggable='yes'/>
</vcpus> </vcpus>
<os> <os>
<type arch='x86_64' machine='pc'>hvm</type> <type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='network'/> <boot dev='network'/>
</os> </os>
<cpu mode='custom' match='exact' check='none'> <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'/> <topology sockets='1' dies='1' cores='4' threads='8'/>
</cpu> </cpu>
<clock offset='utc'/> <clock offset='utc'/>
@ -51,24 +51,21 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator> <emulator>/usr/bin/qemu-system-ppc64</emulator>
<controller type='usb' index='0' model='piix3-uhci'> <controller type='usb' index='0' model='pci-ohci'>
<alias name='usb'/> <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>
<controller type='pci' index='0' model='pci-root'> <controller type='pci' index='0' model='pci-root'>
<model name='spapr-pci-host-bridge'/>
<target index='0'/>
<alias name='pci.0'/> <alias name='pci.0'/>
</controller> </controller>
<input type='mouse' bus='ps2'>
<alias name='input0'/>
</input>
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
<audio id='1' type='none'/> <audio id='1' type='none'/>
<memballoon model='virtio'> <memballoon model='virtio'>
<alias name='balloon0'/> <alias name='balloon0'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</memballoon> </memballoon>
<panic model='pseries'/>
</devices> </devices>
</domain> </domain>

4
tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory> <currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' current='8'>32</vcpu> <vcpu placement='static' current='8'>32</vcpu>
<os> <os>
<type arch='x86_64' machine='pc'>hvm</type> <type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='network'/> <boot dev='network'/>
</os> </os>
<cpu> <cpu>
@ -15,6 +15,6 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator> <emulator>/usr/bin/qemu-system-ppc64</emulator>
</devices> </devices>
</domain> </domain>

18
tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
View File

@ -39,11 +39,11 @@
<vcpu id='31' enabled='no' hotpluggable='yes'/> <vcpu id='31' enabled='no' hotpluggable='yes'/>
</vcpus> </vcpus>
<os> <os>
<type arch='x86_64' machine='pc'>hvm</type> <type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='network'/> <boot dev='network'/>
</os> </os>
<cpu mode='custom' match='exact' check='none'> <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'/> <topology sockets='1' dies='1' cores='4' threads='8'/>
</cpu> </cpu>
<clock offset='utc'/> <clock offset='utc'/>
@ -51,16 +51,18 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator> <emulator>/usr/bin/qemu-system-ppc64</emulator>
<controller type='usb' index='0' model='piix3-uhci'> <controller type='usb' index='0' model='pci-ohci'>
<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'/>
</controller> </controller>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/> <audio id='1' type='none'/>
<memballoon model='virtio'> <memballoon model='virtio'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</memballoon> </memballoon>
<panic model='pseries'/>
</devices> </devices>
</domain> </domain>

19
tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
View File

@ -39,11 +39,11 @@
<vcpu id='31' enabled='no' hotpluggable='yes'/> <vcpu id='31' enabled='no' hotpluggable='yes'/>
</vcpus> </vcpus>
<os> <os>
<type arch='x86_64' machine='pc'>hvm</type> <type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='network'/> <boot dev='network'/>
</os> </os>
<cpu mode='custom' match='exact' check='none'> <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'/> <topology sockets='1' dies='1' cores='4' threads='8'/>
</cpu> </cpu>
<clock offset='utc'/> <clock offset='utc'/>
@ -51,24 +51,21 @@
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator> <emulator>/usr/bin/qemu-system-ppc64</emulator>
<controller type='usb' index='0' model='piix3-uhci'> <controller type='usb' index='0' model='pci-ohci'>
<alias name='usb'/> <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>
<controller type='pci' index='0' model='pci-root'> <controller type='pci' index='0' model='pci-root'>
<model name='spapr-pci-host-bridge'/>
<target index='0'/>
<alias name='pci.0'/> <alias name='pci.0'/>
</controller> </controller>
<input type='mouse' bus='ps2'>
<alias name='input0'/>
</input>
<input type='keyboard' bus='ps2'>
<alias name='input1'/>
</input>
<audio id='1' type='none'/> <audio id='1' type='none'/>
<memballoon model='virtio'> <memballoon model='virtio'>
<alias name='balloon0'/> <alias name='balloon0'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</memballoon> </memballoon>
<panic model='pseries'/>
</devices> </devices>
</domain> </domain>