[PATCH 6/7] qemuxml2xmltest: Convert all s390 test cases to real capabilities

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- ...=> disk-virtio-s390-zpci.s390x-latest.xml} | 3 + ...tdev-scsi-vhost-scsi-ccw.s390x-latest.xml} | 4 + ...tdev-subsys-mdev-vfio-ap.s390x-latest.xml} | 4 + ...dev-subsys-mdev-vfio-ccw.s390x-latest.xml} | 4 + ...o-zpci-autogenerate-fids.s390x-latest.xml} | 3 + ...o-zpci-autogenerate-uids.s390x-latest.xml} | 3 + ...v-vfio-zpci-autogenerate.s390x-latest.xml} | 3 + ...dev-vfio-zpci-boundaries.s390x-latest.xml} | 3 + ...vfio-zpci-ccw-memballoon.s390x-latest.xml} | 1 + ...io-zpci-multidomain-many.s390x-latest.xml} | 3 + ...xml => hostdev-vfio-zpci.s390x-latest.xml} | 3 + ....xml => input-virtio-ccw.s390x-latest.xml} | 4 + ...multiple-disks-nets-s390.s390x-latest.xml} | 4 + ...ml => s390-panic-missing.s390x-latest.xml} | 4 + ...=> s390-panic-no-address.s390x-latest.xml} | 4 + ...-panic.xml => s390-panic.s390x-latest.xml} | 2 + ...l-2.xml => s390-serial-2.s390x-latest.xml} | 4 + ...l => s390-serial-console.s390x-latest.xml} | 4 + ...nsole.xml => s390-serial.s390x-latest.xml} | 4 + ... => vhost-vsock-ccw-auto.s390x-latest.xml} | 4 + .../vhost-vsock-ccw.s390x-latest.xml | 37 +++++++++ tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml | 1 - ...ideo-virtio-gpu-ccw-auto.s390x-latest.xml} | 4 + ... => video-virtio-gpu-ccw.s390x-latest.xml} | 4 + tests/qemuxml2xmltest.c | 81 ++++++------------- 25 files changed, 137 insertions(+), 58 deletions(-) rename tests/qemuxml2xmloutdata/{disk-virtio-s390-zpci.xml => disk-virtio-s390-zpci.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{hostdev-scsi-vhost-scsi-ccw.xml => hostdev-scsi-vhost-scsi-ccw.s390x-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{hostdev-subsys-mdev-vfio-ap.xml => hostdev-subsys-mdev-vfio-ap.s390x-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{hostdev-subsys-mdev-vfio-ccw.xml => hostdev-subsys-mdev-vfio-ccw.s390x-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate-fids.xml => hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate-uids.xml => hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate.xml => hostdev-vfio-zpci-autogenerate.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-boundaries.xml => hostdev-vfio-zpci-boundaries.s390x-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-ccw-memballoon.xml => hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml} (96%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-multidomain-many.xml => hostdev-vfio-zpci-multidomain-many.s390x-latest.xml} (97%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci.xml => hostdev-vfio-zpci.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{input-virtio-ccw.xml => input-virtio-ccw.s390x-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{machine-loadparm-multiple-disks-nets-s390.xml => machine-loadparm-multiple-disks-nets-s390.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{s390-panic-missing.xml => s390-panic-missing.s390x-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{s390-panic-no-address.xml => s390-panic-no-address.s390x-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{s390-panic.xml => s390-panic.s390x-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{s390-serial-2.xml => s390-serial-2.s390x-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{s390-serial.xml => s390-serial-console.s390x-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{s390-serial-console.xml => s390-serial.s390x-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{vhost-vsock-ccw-auto.xml => vhost-vsock-ccw-auto.s390x-latest.xml} (87%) create mode 100644 tests/qemuxml2xmloutdata/vhost-vsock-ccw.s390x-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml rename tests/qemuxml2xmloutdata/{video-virtio-gpu-ccw-auto.xml => video-virtio-gpu-ccw-auto.s390x-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{video-virtio-gpu-ccw.xml => video-virtio-gpu-ccw.s390x-latest.xml} (89%) diff --git a/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml b/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.s390x-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml rename to tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.s390x-latest.xml index bf1fe681be..c98bf78160 100644 --- a/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml +++ b/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml rename to tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.xml index 95eff7ead6..efd3027d3e 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -23,6 +26,7 @@ <controller type='scsi' index='0' model='virtio-scsi'> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/> </controller> + <controller type='pci' index='0' model='pci-root'/> <audio id='1' type='none'/> <hostdev mode='subsystem' type='scsi_host' managed='no'> <source protocol='vhost' wwpn='naa.5123456789abcde0'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.xml b/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.xml similarity index 85% rename from tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.xml rename to tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.xml index d8a3043718..96cd88bfdd 100644 --- a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.xml +++ b/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.xml @@ -8,12 +8,16 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</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-s390x</emulator> + <controller type='pci' index='0' model='pci-root'/> <audio id='1' type='none'/> <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-ap'> <source> diff --git a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.xml b/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.xml similarity index 85% rename from tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.xml rename to tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.xml index 37f8385717..b411a2a348 100644 --- a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.xml +++ b/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.xml @@ -8,12 +8,16 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</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-s390x</emulator> + <controller type='pci' index='0' model='pci-root'/> <audio id='1' type='none'/> <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-ccw'> <source> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml similarity index 93% rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml rename to tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml index cc3687db95..dd1dea4e99 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml similarity index 93% rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml rename to tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml index 5b03616d1e..1a52487692 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.s390x-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml rename to tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.s390x-latest.xml index acee69fd86..670f8c68b4 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.s390x-latest.xml similarity index 94% rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml rename to tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.s390x-latest.xml index 09ee053c92..df55f79501 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml similarity index 96% rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.xml rename to tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml index 276c9f3e69..7df6491b68 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml @@ -8,6 +8,7 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='host-model' check='partial'/> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.xml similarity index 97% rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml rename to tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.xml index 72bcf30b43..e64d7de561 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.s390x-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml rename to tests/qemuxml2xmloutdata/hostdev-vfio-zpci.s390x-latest.xml index 3b41c4e0c0..5e14a63810 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/input-virtio-ccw.xml b/tests/qemuxml2xmloutdata/input-virtio-ccw.s390x-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/input-virtio-ccw.xml rename to tests/qemuxml2xmloutdata/input-virtio-ccw.s390x-latest.xml index 3a4fcadda6..bca07c8fd8 100644 --- a/tests/qemuxml2xmloutdata/input-virtio-ccw.xml +++ b/tests/qemuxml2xmloutdata/input-virtio-ccw.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -20,6 +23,7 @@ <target dev='hda' bus='virtio'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </disk> + <controller type='pci' index='0' model='pci-root'/> <input type='keyboard' bus='virtio'> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/> </input> diff --git a/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml b/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml rename to tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.xml index 3ea2c8c1c4..039968d7e4 100644 --- a/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml +++ b/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.xml @@ -7,6 +7,9 @@ <os> <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -27,6 +30,7 @@ <boot order='3' loadparm='3'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/> </disk> + <controller type='pci' index='0' model='pci-root'/> <interface type='user'> <mac address='00:11:22:33:44:54'/> <model type='virtio'/> diff --git a/tests/qemuxml2xmloutdata/s390-panic-missing.xml b/tests/qemuxml2xmloutdata/s390-panic-missing.s390x-latest.xml similarity index 86% rename from tests/qemuxml2xmloutdata/s390-panic-missing.xml rename to tests/qemuxml2xmloutdata/s390-panic-missing.s390x-latest.xml index 1929826541..b36c12e435 100644 --- a/tests/qemuxml2xmloutdata/s390-panic-missing.xml +++ b/tests/qemuxml2xmloutdata/s390-panic-missing.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -17,6 +20,7 @@ <controller type='virtio-serial' index='0'> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </controller> + <controller type='pci' index='0' model='pci-root'/> <console type='pty'> <target type='virtio' port='0'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/> diff --git a/tests/qemuxml2xmloutdata/s390-panic-no-address.xml b/tests/qemuxml2xmloutdata/s390-panic-no-address.s390x-latest.xml similarity index 85% rename from tests/qemuxml2xmloutdata/s390-panic-no-address.xml rename to tests/qemuxml2xmloutdata/s390-panic-no-address.s390x-latest.xml index 1610eacdef..9b9fbf3243 100644 --- a/tests/qemuxml2xmloutdata/s390-panic-no-address.xml +++ b/tests/qemuxml2xmloutdata/s390-panic-no-address.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -17,6 +20,7 @@ <controller type='virtio-serial' index='0'> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </controller> + <controller type='pci' index='0' model='pci-root'/> <console type='pty'> <target type='virtio' port='0'/> </console> diff --git a/tests/qemuxml2xmloutdata/s390-panic.xml b/tests/qemuxml2xmloutdata/s390-panic.s390x-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/s390-panic.xml rename to tests/qemuxml2xmloutdata/s390-panic.s390x-latest.xml index 1c31685fb5..2f27890ceb 100644 --- a/tests/qemuxml2xmloutdata/s390-panic.xml +++ b/tests/qemuxml2xmloutdata/s390-panic.s390x-latest.xml @@ -8,6 +8,7 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='host-model' check='partial'/> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -17,6 +18,7 @@ <controller type='virtio-serial' index='0'> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </controller> + <controller type='pci' index='0' model='pci-root'/> <console type='pty'> <target type='virtio' port='0'/> </console> diff --git a/tests/qemuxml2xmloutdata/s390-serial-2.xml b/tests/qemuxml2xmloutdata/s390-serial-2.s390x-latest.xml similarity index 86% rename from tests/qemuxml2xmloutdata/s390-serial-2.xml rename to tests/qemuxml2xmloutdata/s390-serial-2.s390x-latest.xml index 2ca82ecf03..bf67ed8c12 100644 --- a/tests/qemuxml2xmloutdata/s390-serial-2.xml +++ b/tests/qemuxml2xmloutdata/s390-serial-2.s390x-latest.xml @@ -8,12 +8,16 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</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-s390x</emulator> + <controller type='pci' index='0' model='pci-root'/> <serial type='pty'> <target type='sclp-serial' port='0'> <model name='sclpconsole'/> diff --git a/tests/qemuxml2xmloutdata/s390-serial.xml b/tests/qemuxml2xmloutdata/s390-serial-console.s390x-latest.xml similarity index 84% rename from tests/qemuxml2xmloutdata/s390-serial.xml rename to tests/qemuxml2xmloutdata/s390-serial-console.s390x-latest.xml index f29565f5c2..9ce55598bc 100644 --- a/tests/qemuxml2xmloutdata/s390-serial.xml +++ b/tests/qemuxml2xmloutdata/s390-serial-console.s390x-latest.xml @@ -8,12 +8,16 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</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-s390x</emulator> + <controller type='pci' index='0' model='pci-root'/> <serial type='pty'> <target type='sclp-serial' port='0'> <model name='sclpconsole'/> diff --git a/tests/qemuxml2xmloutdata/s390-serial-console.xml b/tests/qemuxml2xmloutdata/s390-serial.s390x-latest.xml similarity index 84% rename from tests/qemuxml2xmloutdata/s390-serial-console.xml rename to tests/qemuxml2xmloutdata/s390-serial.s390x-latest.xml index f29565f5c2..9ce55598bc 100644 --- a/tests/qemuxml2xmloutdata/s390-serial-console.xml +++ b/tests/qemuxml2xmloutdata/s390-serial.s390x-latest.xml @@ -8,12 +8,16 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</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-s390x</emulator> + <controller type='pci' index='0' model='pci-root'/> <serial type='pty'> <target type='sclp-serial' port='0'> <model name='sclpconsole'/> diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.s390x-latest.xml similarity index 87% rename from tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml rename to tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.s390x-latest.xml index e2111dc738..c384522a42 100644 --- a/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml +++ b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -20,6 +23,7 @@ <target dev='hda' bus='virtio'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </disk> + <controller type='pci' index='0' model='pci-root'/> <audio id='1' type='none'/> <memballoon model='virtio'> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/> diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw.s390x-latest.xml b/tests/qemuxml2xmloutdata/vhost-vsock-ccw.s390x-latest.xml new file mode 100644 index 0000000000..d519028396 --- /dev/null +++ b/tests/qemuxml2xmloutdata/vhost-vsock-ccw.s390x-latest.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</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-s390x</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='virtio'/> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/> + </memballoon> + <panic model='s390'/> + <vsock model='virtio'> + <cid auto='no' address='4'/> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/> + </vsock> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml b/tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml deleted file mode 120000 index e0fa69dba9..0000000000 --- a/tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/vhost-vsock-ccw.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.s390x-latest.xml similarity index 88% rename from tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.xml rename to tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.s390x-latest.xml index 47c70a9301..87ee9eee54 100644 --- a/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.xml +++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -20,6 +23,7 @@ <target dev='hda' bus='virtio'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </disk> + <controller type='pci' index='0' model='pci-root'/> <graphics type='vnc' port='-1' autoport='yes'> <listen type='address'/> </graphics> diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.s390x-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml rename to tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.s390x-latest.xml index ccc58a4a5d..9b6bf6c980 100644 --- a/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml +++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -20,6 +23,7 @@ <target dev='hda' bus='virtio'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </disk> + <controller type='pci' index='0' model='pci-root'/> <graphics type='vnc' port='-1' autoport='yes'> <listen type='address'/> </graphics> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 60ff48550f..a8a6cd6ca7 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -208,7 +208,7 @@ mymain(void) DO_TEST_CAPS_LATEST("machine-smm-on"); DO_TEST_CAPS_LATEST("machine-smm-off"); DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-hostdev", "s390x"); - DO_TEST_NOCAPS("machine-loadparm-multiple-disks-nets-s390"); + DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-multiple-disks-nets-s390", "s390x"); DO_TEST_NOCAPS("default-kvm-host-arch"); DO_TEST_NOCAPS("default-qemu-host-arch"); DO_TEST_NOCAPS("boot-cdrom"); @@ -323,8 +323,7 @@ mymain(void) QEMU_CAPS_PR_MANAGER_HELPER, QEMU_CAPS_SCSI_BLOCK); DO_TEST("controller-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI); - DO_TEST("disk-virtio-s390-zpci", - QEMU_CAPS_DEVICE_ZPCI); + DO_TEST_CAPS_ARCH_LATEST("disk-virtio-s390-zpci", "s390x"); DO_TEST_NOCAPS("disk-mirror-old"); DO_TEST_NOCAPS("disk-mirror"); DO_TEST_NOCAPS("disk-active-commit"); @@ -492,29 +491,13 @@ mymain(void) DO_TEST("hostdev-pci-address-unassigned", QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("hostdev-pci-multifunction", QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("hostdev-vfio", QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST("hostdev-vfio-zpci", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-multidomain-many", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-autogenerate", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-autogenerate-uids", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-autogenerate-fids", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-boundaries", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-ccw-memballoon", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-multidomain-many", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate-uids", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate-fids", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-boundaries", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-ccw-memballoon", "s390x"); DO_TEST("hostdev-mdev-precreated", QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("hostdev-mdev-display", QEMU_CAPS_DEVICE_QXL, @@ -814,8 +797,7 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_HDA_DUPLEX); - DO_TEST("hostdev-scsi-vhost-scsi-ccw", - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); + DO_TEST_CAPS_ARCH_LATEST("hostdev-scsi-vhost-scsi-ccw", "s390x"); DO_TEST("hostdev-scsi-vhost-scsi-pci", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); @@ -838,20 +820,17 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); - DO_TEST("hostdev-subsys-mdev-vfio-ccw", - QEMU_CAPS_DEVICE_VFIO_CCW); - DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw-boot", - "s390x"); - DO_TEST("hostdev-subsys-mdev-vfio-ap", - QEMU_CAPS_DEVICE_VFIO_AP); + DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw-boot", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ap", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-defaultconsole", "s390x"); - DO_TEST_NOCAPS("s390-panic"); - DO_TEST_NOCAPS("s390-panic-missing"); - DO_TEST_NOCAPS("s390-panic-no-address"); - DO_TEST_NOCAPS("s390-serial"); - DO_TEST_NOCAPS("s390-serial-2"); - DO_TEST_NOCAPS("s390-serial-console"); + DO_TEST_CAPS_ARCH_LATEST("s390-panic", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-panic-missing", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-panic-no-address", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-serial", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-serial-2", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-serial-console", "s390x"); DO_TEST_NOCAPS("pcihole64"); DO_TEST_NOCAPS("pcihole64-gib"); @@ -1085,14 +1064,8 @@ mymain(void) DO_TEST("video-qxl-noheads", QEMU_CAPS_DEVICE_QXL); DO_TEST("video-qxl-resolution", QEMU_CAPS_DEVICE_QXL); DO_TEST("video-virtio-gpu-secondary", QEMU_CAPS_DEVICE_VIRTIO_GPU); - DO_TEST("video-virtio-gpu-ccw", - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW); - DO_TEST("video-virtio-gpu-ccw-auto", - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW); + DO_TEST_CAPS_ARCH_LATEST("video-virtio-gpu-ccw", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("video-virtio-gpu-ccw-auto", "s390x"); DO_TEST("video-none-device", QEMU_CAPS_VNC); DO_TEST_CAPS_LATEST("video-virtio-vga-gpu-gl"); DO_TEST_CAPS_LATEST("video-virtio-blob-on"); @@ -1133,20 +1106,14 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-exact", "ppc64"); DO_TEST_CAPS_LATEST("user-aliases"); - DO_TEST("input-virtio-ccw", - QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_CCW, - QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW, - QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW); + DO_TEST_CAPS_ARCH_LATEST("input-virtio-ccw", "s390x"); DO_TEST_CAPS_LATEST("tseg-explicit-size"); DO_TEST_CAPS_LATEST("vhost-vsock"); DO_TEST_CAPS_LATEST("vhost-vsock-auto"); - DO_TEST("vhost-vsock-ccw", QEMU_CAPS_DEVICE_VHOST_VSOCK); - DO_TEST("vhost-vsock-ccw-auto", QEMU_CAPS_DEVICE_VHOST_VSOCK); + DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-auto", "s390x"); DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-iommu", "s390x"); -- 2.39.2