External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-28 23:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: qemuxml2xml: Modernize 's390-defaultconsole' case

Browse Source 
Don't use the 's390-virtio' machine which was removed in qemu 2.6 and
use real capabilities for the test.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-06-11 10:21:57 +02:00
parent 7b31066658
commit 21144ed89c
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemuxml2argvdata/s390-defaultconsole.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>262144</currentMemory> <currentMemory unit='KiB'>262144</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='s390x' machine='s390-virtio'>hvm</type> <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>

4
tests/qemuxml2xmloutdata/s390-defaultconsole.xml → tests/qemuxml2xmloutdata/s390-defaultconsole.s390x-latest.xml
View File

@ -5,15 +5,17 @@
<currentMemory unit='KiB'>262144</currentMemory> <currentMemory unit='KiB'>262144</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='s390x' machine='s390-virtio'>hvm</type> <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<cpu mode='host-model' check='partial'/>
<clock offset='utc'/> <clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<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-s390x</emulator> <emulator>/usr/bin/qemu-system-s390x</emulator>
<controller type='pci' index='0' model='pci-root'/>
<serial type='pty'> <serial type='pty'>
<target type='sclp-serial' port='0'> <target type='sclp-serial' port='0'>
<model name='sclpconsole'/> <model name='sclpconsole'/>

3
tests/qemuxml2xmltest.c
View File

@ -1051,8 +1051,7 @@ mymain(void)
QEMU_CAPS_CCW_CSSID_UNRESTRICTED, QEMU_CAPS_CCW_CSSID_UNRESTRICTED,
QEMU_CAPS_DEVICE_VFIO_AP); QEMU_CAPS_DEVICE_VFIO_AP);
DO_TEST("s390-defaultconsole", DO_TEST_CAPS_ARCH_LATEST("s390-defaultconsole", "s390x");
QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("s390-panic", DO_TEST("s390-panic",
QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("s390-panic-missing", DO_TEST("s390-panic-missing",