[PATCH 0/5] tests: More USB and capabilities for s390x
*** UNIVERSAL SERIAL BLURB *** https://gitlab.com/abologna/libvirt/-/commits/caps-s390x Andrea Bolognani (5): tests: Rename s390-usb-* tests: Minimize s390-usb-* tests: Add s390-usb-model tests: Update capabilities for QEMU 8.1.0 on s390x tests: Add capabilities for QEMU 8.2.0 on s390x tests/domaincapsdata/qemu_8.1.0.s390x.xml | 80 +- ...u_8.1.0.s390x.xml => qemu_8.2.0.s390x.xml} | 152 +- .../caps_8.1.0_s390x.replies | 5000 +++++---- .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 732 +- ...s390x.replies => caps_8.2.0_s390x.replies} | 9526 ++++++++++------- ...s_8.1.0_s390x.xml => caps_8.2.0_s390x.xml} | 2058 ++-- ...default-video-type-s390x.s390x-latest.args | 2 +- ...vfio-zpci-ccw-memballoon.s390x-latest.args | 2 +- .../launch-security-s390-pv.s390x-latest.args | 2 +- .../s390-allow-bogus-usb-controller.xml | 32 - .../s390-allow-bogus-usb-none.xml | 30 - ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 2 +- .../s390-defaultconsole.s390x-latest.args | 2 +- .../s390-panic.s390x-latest.args | 2 +- ...rgs => s390-usb-address.s390x-latest.args} | 9 - ....xml => s390-usb-address.s390x-latest.xml} | 22 +- tests/qemuxmlconfdata/s390-usb-address.xml | 15 + ....args => s390-usb-model.s390x-latest.args} | 11 +- ...st.xml => s390-usb-model.s390x-latest.xml} | 26 +- tests/qemuxmlconfdata/s390-usb-model.xml | 13 + ...t.args => s390-usb-none.s390x-latest.args} | 12 +- ...est.xml => s390-usb-none.s390x-latest.xml} | 22 +- tests/qemuxmlconfdata/s390-usb-none.xml | 13 + tests/qemuxmlconftest.c | 5 +- 24 files changed, 10053 insertions(+), 7717 deletions(-) copy tests/domaincapsdata/{qemu_8.1.0.s390x.xml => qemu_8.2.0.s390x.xml} (79%) copy tests/qemucapabilitiesdata/{caps_8.1.0_s390x.replies => caps_8.2.0_s390x.replies} (93%) copy tests/qemucapabilitiesdata/{caps_8.1.0_s390x.xml => caps_8.2.0_s390x.xml} (96%) delete mode 100644 tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.xml delete mode 100644 tests/qemuxmlconfdata/s390-allow-bogus-usb-none.xml rename tests/qemuxmlconfdata/{s390-allow-bogus-usb-none.s390x-latest.args => s390-usb-address.s390x-latest.args} (58%) copy tests/qemuxmlconfdata/{s390-allow-bogus-usb-controller.s390x-latest.xml => s390-usb-address.s390x-latest.xml} (55%) create mode 100644 tests/qemuxmlconfdata/s390-usb-address.xml rename tests/qemuxmlconfdata/{s390-allow-bogus-usb-controller.s390x-latest.args => s390-usb-model.s390x-latest.args} (58%) rename tests/qemuxmlconfdata/{s390-allow-bogus-usb-controller.s390x-latest.xml => s390-usb-model.s390x-latest.xml} (51%) create mode 100644 tests/qemuxmlconfdata/s390-usb-model.xml copy tests/qemuxmlconfdata/{s390-defaultconsole.s390x-latest.args => s390-usb-none.s390x-latest.args} (61%) rename tests/qemuxmlconfdata/{s390-allow-bogus-usb-none.s390x-latest.xml => s390-usb-none.s390x-latest.xml} (50%) create mode 100644 tests/qemuxmlconfdata/s390-usb-none.xml -- 2.43.0
These tests currently cover the scenarios in which the guest can end up with no USB controller, one of which is specific to s390x. We are going to add more USB on s390x scenarios, so a different naming convention is needed. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- ...r.s390x-latest.args => s390-usb-address.s390x-latest.args} | 0 ...ler.s390x-latest.xml => s390-usb-address.s390x-latest.xml} | 0 ...90-allow-bogus-usb-controller.xml => s390-usb-address.xml} | 0 ...none.s390x-latest.args => s390-usb-none.s390x-latest.args} | 0 ...b-none.s390x-latest.xml => s390-usb-none.s390x-latest.xml} | 0 .../{s390-allow-bogus-usb-none.xml => s390-usb-none.xml} | 0 tests/qemuxmlconftest.c | 4 ++-- 7 files changed, 2 insertions(+), 2 deletions(-) rename tests/qemuxmlconfdata/{s390-allow-bogus-usb-controller.s390x-latest.args => s390-usb-address.s390x-latest.args} (100%) rename tests/qemuxmlconfdata/{s390-allow-bogus-usb-controller.s390x-latest.xml => s390-usb-address.s390x-latest.xml} (100%) rename tests/qemuxmlconfdata/{s390-allow-bogus-usb-controller.xml => s390-usb-address.xml} (100%) rename tests/qemuxmlconfdata/{s390-allow-bogus-usb-none.s390x-latest.args => s390-usb-none.s390x-latest.args} (100%) rename tests/qemuxmlconfdata/{s390-allow-bogus-usb-none.s390x-latest.xml => s390-usb-none.s390x-latest.xml} (100%) rename tests/qemuxmlconfdata/{s390-allow-bogus-usb-none.xml => s390-usb-none.xml} (100%) diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.s390x-latest.args b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args similarity index 100% rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.s390x-latest.args rename to tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.s390x-latest.xml b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.xml similarity index 100% rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.s390x-latest.xml rename to tests/qemuxmlconfdata/s390-usb-address.s390x-latest.xml diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.xml b/tests/qemuxmlconfdata/s390-usb-address.xml similarity index 100% rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.xml rename to tests/qemuxmlconfdata/s390-usb-address.xml diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-none.s390x-latest.args b/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args similarity index 100% rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-none.s390x-latest.args rename to tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-none.s390x-latest.xml b/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.xml similarity index 100% rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-none.s390x-latest.xml rename to tests/qemuxmlconfdata/s390-usb-none.s390x-latest.xml diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-none.xml b/tests/qemuxmlconfdata/s390-usb-none.xml similarity index 100% rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-none.xml rename to tests/qemuxmlconfdata/s390-usb-none.xml diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 0a27be77a8..4034d7f938 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2319,8 +2319,8 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-rng-egd-crash"); DO_TEST_CAPS_ARCH_LATEST("virtio-rng-ccw", "s390x"); - DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-none", "s390x"); - DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-controller", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-usb-none", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-usb-address", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-panic-no-address", "s390x"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("s390-panic-address", "s390x"); -- 2.43.0
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .../s390-usb-address.s390x-latest.args | 9 -------- .../s390-usb-address.s390x-latest.xml | 22 ++----------------- tests/qemuxmlconfdata/s390-usb-address.xml | 21 ++---------------- .../s390-usb-none.s390x-latest.args | 9 -------- .../s390-usb-none.s390x-latest.xml | 22 ++----------------- tests/qemuxmlconfdata/s390-usb-none.xml | 21 ++---------------- 6 files changed, 8 insertions(+), 96 deletions(-) diff --git a/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args index 1e7eaacad0..485b121a08 100644 --- a/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args @@ -26,15 +26,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --device '{"driver":"virtio-serial-ccw","id":"virtio-serial0","devno":"fe.0.0001"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --chardev pty,id=charconsole0 \ --device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0002"}' \ --object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/hwrng"}' \ --device '{"driver":"virtio-rng-ccw","rng":"objrng0","id":"rng0","devno":"fe.0.0003"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.xml b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.xml index 392f03fbc6..595d0b1a1e 100644 --- a/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.xml +++ b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.xml @@ -6,6 +6,7 @@ <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> @@ -16,33 +17,14 @@ <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'/> - <boot order='1'/> - <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> - </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'> <zpci uid='0x0001' fid='0x00000000'/> </address> </controller> <controller type='pci' index='0' model='pci-root'/> - <controller type='virtio-serial' index='0'> - <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/> - </controller> - <console type='pty'> - <target type='virtio' port='0'/> - </console> <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/> - </memballoon> - <rng model='virtio'> - <backend model='random'>/dev/hwrng</backend> - <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/> - </rng> + <memballoon model='none'/> <panic model='s390'/> </devices> </domain> diff --git a/tests/qemuxmlconfdata/s390-usb-address.xml b/tests/qemuxmlconfdata/s390-usb-address.xml index 5afc23dbba..54d55f6e4c 100644 --- a/tests/qemuxmlconfdata/s390-usb-address.xml +++ b/tests/qemuxmlconfdata/s390-usb-address.xml @@ -2,31 +2,14 @@ <name>test</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory>219100</memory> - <currentMemory>219100</currentMemory> <os> <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> </os> - <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'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='virtio'/> - <boot order='1'/> - </disk> - <console type='pty'> - <target type='virtio'/> - </console> + <emulator>/usr/bin/qemu-system-s390x</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> - <memballoon model='virtio'> - </memballoon> - <rng model='virtio'> - <backend model='random'>/dev/hwrng</backend> - </rng> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args b/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args index 1e7eaacad0..485b121a08 100644 --- a/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args @@ -26,15 +26,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --device '{"driver":"virtio-serial-ccw","id":"virtio-serial0","devno":"fe.0.0001"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --chardev pty,id=charconsole0 \ --device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0002"}' \ --object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/hwrng"}' \ --device '{"driver":"virtio-rng-ccw","rng":"objrng0","id":"rng0","devno":"fe.0.0003"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.xml b/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.xml index 97a14b63f7..e17098a3df 100644 --- a/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.xml +++ b/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.xml @@ -6,6 +6,7 @@ <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> @@ -16,29 +17,10 @@ <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'/> - <boot order='1'/> - <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> - </disk> <controller type='usb' index='0' model='none'/> <controller type='pci' index='0' model='pci-root'/> - <controller type='virtio-serial' index='0'> - <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/> - </controller> - <console type='pty'> - <target type='virtio' port='0'/> - </console> <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/> - </memballoon> - <rng model='virtio'> - <backend model='random'>/dev/hwrng</backend> - <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/> - </rng> + <memballoon model='none'/> <panic model='s390'/> </devices> </domain> diff --git a/tests/qemuxmlconfdata/s390-usb-none.xml b/tests/qemuxmlconfdata/s390-usb-none.xml index c0b2da6569..ca81ff92dd 100644 --- a/tests/qemuxmlconfdata/s390-usb-none.xml +++ b/tests/qemuxmlconfdata/s390-usb-none.xml @@ -2,29 +2,12 @@ <name>test</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory>219100</memory> - <currentMemory>219100</currentMemory> <os> <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> </os> - <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'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='virtio'/> - <boot order='1'/> - </disk> - <console type='pty'> - <target type='virtio'/> - </console> + <emulator>/usr/bin/qemu-system-s390x</emulator> <controller type='usb' index='0' model='none'/> - <memballoon model='virtio'> - </memballoon> - <rng model='virtio'> - <backend model='random'>/dev/hwrng</backend> - </rng> + <memballoon model='none'/> </devices> </domain> -- 2.43.0
Show what happens when trying to use a specific type of USB controller. This currently fails because the QEMU binary doesn't include the necessary device. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .../s390-usb-model.s390x-latest.err | 1 + .../s390-usb-model.s390x-latest.xml | 30 +++++++++++++++++++ tests/qemuxmlconfdata/s390-usb-model.xml | 13 ++++++++ tests/qemuxmlconftest.c | 1 + 4 files changed, 45 insertions(+) create mode 100644 tests/qemuxmlconfdata/s390-usb-model.s390x-latest.err create mode 100644 tests/qemuxmlconfdata/s390-usb-model.s390x-latest.xml create mode 100644 tests/qemuxmlconfdata/s390-usb-model.xml diff --git a/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.err b/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.err new file mode 100644 index 0000000000..aec91f7559 --- /dev/null +++ b/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.err @@ -0,0 +1 @@ +unsupported configuration: USB controller model 'qemu-xhci' not supported in this QEMU binary diff --git a/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.xml b/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.xml new file mode 100644 index 0000000000..52c6c4359d --- /dev/null +++ b/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>test</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</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> + <controller type='usb' index='0' model='qemu-xhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'> + <zpci uid='0x0001' fid='0x00000000'/> + </address> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + <panic model='s390'/> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/s390-usb-model.xml b/tests/qemuxmlconfdata/s390-usb-model.xml new file mode 100644 index 0000000000..d1019a0143 --- /dev/null +++ b/tests/qemuxmlconfdata/s390-usb-model.xml @@ -0,0 +1,13 @@ +<domain type='qemu'> + <name>test</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219100</memory> + <os> + <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-s390x</emulator> + <controller type='usb' index='0' model='qemu-xhci'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 4034d7f938..cdb0d2d701 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2321,6 +2321,7 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("s390-usb-none", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-usb-address", "s390x"); + DO_TEST_CAPS_ARCH_LATEST_FAILURE("s390-usb-model", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-panic-no-address", "s390x"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("s390-panic-address", "s390x"); -- 2.43.0
The existing capabilities were generated against a build made quite early in the QEMU 8.1.0 development cycle. Update them to match the final release. A notable effect of this is that the recently introduced s390-usb-model test now passes instead of failing: QEMU 8.1.0 enables several new devices on s390x, including the qemu-xhci USB controller. There's a small amount of additional churn caused by the fact that the machine on which I have generated these capabilities is apparently slightly less fancy than the one used originally. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- tests/domaincapsdata/qemu_8.1.0.s390x.xml | 80 +- .../caps_8.1.0_s390x.replies | 5000 ++++++++++------- .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 732 ++- ...default-video-type-s390x.s390x-latest.args | 2 +- ...vfio-zpci-ccw-memballoon.s390x-latest.args | 2 +- .../launch-security-s390-pv.s390x-latest.args | 2 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 2 +- .../s390-defaultconsole.s390x-latest.args | 2 +- .../s390-panic.s390x-latest.args | 2 +- ....args => s390-usb-model.s390x-latest.args} | 14 +- .../s390-usb-model.s390x-latest.err | 1 - tests/qemuxmlconftest.c | 2 +- 12 files changed, 3345 insertions(+), 2496 deletions(-) copy tests/qemuxmlconfdata/{s390-defaultconsole.s390x-latest.args => s390-usb-model.s390x-latest.args} (61%) delete mode 100644 tests/qemuxmlconfdata/s390-usb-model.s390x-latest.err diff --git a/tests/domaincapsdata/qemu_8.1.0.s390x.xml b/tests/domaincapsdata/qemu_8.1.0.s390x.xml index 37c7c3b8bf..3f4299237e 100644 --- a/tests/domaincapsdata/qemu_8.1.0.s390x.xml +++ b/tests/domaincapsdata/qemu_8.1.0.s390x.xml @@ -190,6 +176,7 @@ <value>fdc</value> <value>scsi</value> <value>virtio</value> + <value>usb</value> </enum> <enum name='model'> <value>virtio</value> @@ -222,6 +209,7 @@ <value>optional</value> </enum> <enum name='subsysType'> + <value>usb</value> <value>pci</value> <value>scsi</value> </enum> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies index 2ee9655774..77014169cb 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies @@ -16,11 +16,11 @@ { "return": { "qemu": { - "micro": 50, - "minor": 0, + "micro": 0, + "minor": 1, "major": 8 }, - "package": "v8.0.0-1270-g1c12355b" + "package": "v8.1.0" }, "id": "libvirt-2" } @@ -22574,6 +22930,14 @@ "name": "z14ZR1-s390x-cpu", "parent": "s390x-cpu" }, + { + "name": "usb-mtp", + "parent": "usb-device" + }, + { + "name": "qemu-xhci", + "parent": "pci-xhci" + }, { "name": "virtserialport", "parent": "virtio-serial-port" diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml index 19422f08fa..ea5eec0435 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml @@ -5,6 +5,7 @@ <selfvers>0</selfvers> <flag name='kvm'/> <flag name='sdl'/> + <flag name='usb-hub'/> <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> @@ -12,12 +13,16 @@ <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='s390-sclp'/> + <flag name='usb-serial'/> <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> + <flag name='usb-storage'/> + <flag name='usb-kbd'/> + <flag name='usb-audio'/> <flag name='migrate-rdma'/> <flag name='virtio-net'/> <flag name='virtio-gpu'/> @@ -29,6 +34,7 @@ <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> <flag name='query-cpu-definitions'/> + <flag name='qemu-xhci'/> <flag name='chardev-reconnect'/> <flag name='sclplmconsole'/> <flag name='virtio-gpu-ccw'/> @@ -80,7 +86,6 @@ <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> - <flag name='virtio-gpu-gl-pci'/> <flag name='confidential-guest-support'/> <flag name='s390-pv-guest'/> <flag name='set-action'/> @@ -111,21 +116,19 @@ <flag name='virtio-gpu.blob'/> <flag name='rbd-encryption-layering'/> <flag name='rbd-encryption-luks-any'/> + <flag name='qcow2-discard-no-unref'/> <flag name='run-with.async-teardown'/> <flag name='smp-clusters'/> - <version>8000050</version> + <version>8001000</version> <microcodeVersion>39100245</microcodeVersion> - <package>v8.0.0-1270-g1c12355b</package> + <package>v8.1.0</package> <arch>s390x</arch> diff --git a/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args b/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args index e6438482a3..b3f55e8a21 100644 --- a/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args +++ b/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-default-video-type-s/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-default-video-type-s/master-key.aes"}' \ -machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel kvm \ --cpu gen16a-base,nnpa=on,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=on,cmm=on,vxpdeh2=on \ +-cpu gen15a-base,aen=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,deflate=on,etoken=on,vx=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on \ -m size=1048576k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":1073741824}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args index 58e8ae95f5..69f2679f6f 100644 --- a/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args +++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-KVMGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-KVMGuest1/master-key.aes"}' \ -machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel kvm \ --cpu gen16a-base,nnpa=on,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=on,cmm=on,vxpdeh2=on \ +-cpu gen15a-base,aen=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,deflate=on,etoken=on,vx=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args b/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args index 5c8cf9eeec..5c042913a1 100644 --- a/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args +++ b/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram,confidential-guest-support=lsec0 \ -accel kvm \ --cpu gen16a-base,nnpa=on,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=on,cmm=on,vxpdeh2=on \ +-cpu gen15a-base,aen=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,deflate=on,etoken=on,vx=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args index 7f70323720..14954d02a2 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ -machine s390-ccw-virtio-4.2,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel kvm \ --cpu gen16a-base,nnpa=on,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=on,cmm=on,vxpdeh2=on \ +-cpu gen15a-base,aen=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,deflate=on,etoken=on,vx=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on \ -m size=262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args b/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args index dde5b6ad13..09eff14e46 100644 --- a/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ -machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel kvm \ --cpu gen16a-base,nnpa=on,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=on,cmm=on,vxpdeh2=on \ +-cpu gen15a-base,aen=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,deflate=on,etoken=on,vx=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on \ -m size=262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/s390-panic.s390x-latest.args b/tests/qemuxmlconfdata/s390-panic.s390x-latest.args index b4b8c9e63e..e020a9f467 100644 --- a/tests/qemuxmlconfdata/s390-panic.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-panic.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ -machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel kvm \ --cpu gen16a-base,nnpa=on,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=on,cmm=on,vxpdeh2=on \ +-cpu gen15a-base,aen=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,deflate=on,etoken=on,vx=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on \ -m size=262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args b/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.args similarity index 61% copy from tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args copy to tests/qemuxmlconfdata/s390-usb-model.s390x-latest.args index dde5b6ad13..85a3e5a53c 100644 --- a/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.args @@ -11,13 +11,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ -machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ --accel kvm \ --cpu gen16a-base,nnpa=on,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,pai=on,paie=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,rdp=on,sea_esop2=on,beareh=on,te=on,cmm=on,vxpdeh2=on \ --m size=262144k \ --object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \ +-accel tcg \ +-cpu qemu \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ --uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --chardev pty,id=charserial0 \ --device '{"driver":"sclpconsole","chardev":"charserial0","id":"serial0"}' \ +-device '{"driver":"zpci","uid":1,"fid":0,"target":"usb","id":"zpci1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.0","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.err b/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.err deleted file mode 100644 index aec91f7559..0000000000 --- a/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: USB controller model 'qemu-xhci' not supported in this QEMU binary diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index cdb0d2d701..e1ee1fbce3 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2321,7 +2321,7 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("s390-usb-none", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-usb-address", "s390x"); - DO_TEST_CAPS_ARCH_LATEST_FAILURE("s390-usb-model", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-usb-model", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-panic-no-address", "s390x"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("s390-panic-address", "s390x"); -- 2.43.0
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- tests/domaincapsdata/qemu_8.2.0.s390x.xml | 272 + .../caps_8.2.0_s390x.replies | 35300 ++++++++++++++++ .../qemucapabilitiesdata/caps_8.2.0_s390x.xml | 3839 ++ 3 files changed, 39411 insertions(+) create mode 100644 tests/domaincapsdata/qemu_8.2.0.s390x.xml create mode 100644 tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies create mode 100644 tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml diff --git a/tests/domaincapsdata/qemu_8.2.0.s390x.xml b/tests/domaincapsdata/qemu_8.2.0.s390x.xml new file mode 100644 index 0000000000..9c00145370 --- /dev/null +++ b/tests/domaincapsdata/qemu_8.2.0.s390x.xml @@ -0,0 +1,272 @@ +<domainCapabilities> + <path>/usr/bin/qemu-system-s390x</path> + <domain>kvm</domain> + <machine>s390-ccw-virtio-8.2</machine> + <arch>s390x</arch> + <vcpu max='248'/> + <iothreads supported='yes'/> + <os supported='yes'> + <enum name='firmware'/> + <loader supported='yes'> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> + <enum name='type'> + <value>rom</value> + <value>pflash</value> + </enum> + <enum name='readonly'> + <value>yes</value> + <value>no</value> + </enum> + <enum name='secure'> + <value>no</value> + </enum> + </loader> + </os> + <cpu> + <mode name='host-passthrough' supported='yes'> + <enum name='hostPassthroughMigratable'> + <value>off</value> + </enum> + </mode> + <mode name='maximum' supported='yes'> + <enum name='maximumMigratable'> + <value>on</value> + <value>off</value> + </enum> + </mode> + <mode name='host-model' supported='yes'> + <model fallback='forbid'>gen15a-base</model> + <feature policy='require' name='aen'/> + <feature policy='require' name='vxpdeh'/> + <feature policy='require' name='aefsi'/> + <feature policy='require' name='diag318'/> + <feature policy='require' name='csske'/> + <feature policy='require' name='msa9'/> + <feature policy='require' name='msa8'/> + <feature policy='require' name='msa7'/> + <feature policy='require' name='msa6'/> + <feature policy='require' name='msa5'/> + <feature policy='require' name='msa4'/> + <feature policy='require' name='msa3'/> + <feature policy='require' name='msa2'/> + <feature policy='require' name='msa1'/> + <feature policy='require' name='sthyi'/> + <feature policy='require' name='edat'/> + <feature policy='require' name='deflate'/> + <feature policy='require' name='etoken'/> + <feature policy='require' name='vx'/> + <feature policy='require' name='ap'/> + <feature policy='require' name='vxeh'/> + <feature policy='require' name='vxpd'/> + <feature policy='require' name='esop'/> + <feature policy='require' name='msa9_pckmo'/> + <feature policy='require' name='vxeh2'/> + <feature policy='require' name='esort'/> + <feature policy='require' name='apft'/> + <feature policy='require' name='els'/> + <feature policy='require' name='iep'/> + <feature policy='require' name='apqci'/> + <feature policy='require' name='cte'/> + <feature policy='require' name='ais'/> + <feature policy='require' name='bpb'/> + <feature policy='require' name='gs'/> + <feature policy='require' name='ppa15'/> + <feature policy='require' name='zpci'/> + <feature policy='require' name='sea_esop2'/> + <feature policy='require' name='te'/> + </mode> + <mode name='custom' supported='yes'> + <model usable='no' vendor='IBM'>z13</model> + <model usable='yes' vendor='IBM'>z990.3</model> + <model usable='yes' vendor='IBM'>z13-base</model> + <model usable='yes' vendor='IBM'>z990.2</model> + <model usable='yes' vendor='IBM'>z196.2-base</model> + <model usable='no' vendor='IBM'>z14</model> + <model usable='yes' vendor='IBM'>z14.2-base</model> + <model usable='yes' vendor='IBM'>z990.4</model> + <model usable='no' vendor='IBM'>z196</model> + <model usable='yes' vendor='IBM'>z10BC.2-base</model> + <model usable='yes' vendor='IBM'>z114-base</model> + <model usable='no' vendor='IBM'>gen16b</model> + <model usable='yes' vendor='IBM'>z890.3-base</model> + <model usable='no' vendor='IBM'>gen16a</model> + <model usable='yes' vendor='IBM'>z990.5</model> + <model usable='no' vendor='IBM'>z196.2</model> + <model usable='no' vendor='IBM'>zEC12</model> + <model usable='no' vendor='IBM'>zEC12.2</model> + <model usable='no' vendor='IBM'>z9EC.2</model> + <model usable='no' vendor='IBM'>z9BC</model> + <model usable='yes' vendor='IBM'>z9EC.3-base</model> + <model usable='yes' vendor='IBM'>z800-base</model> + <model usable='yes' vendor='IBM'>z14ZR1-base</model> + <model usable='yes' vendor='IBM'>z890</model> + <model usable='yes' vendor='IBM'>z990.4-base</model> + <model usable='no' vendor='IBM'>z9EC.3</model> + <model usable='no' vendor='IBM'>z13.2</model> + <model usable='no' vendor='IBM'>z10BC.2</model> + <model usable='yes' vendor='IBM'>gen15a-base</model> + <model usable='no' vendor='IBM'>z14.2</model> + <model usable='yes' vendor='IBM'>zBC12-base</model> + <model usable='no' vendor='IBM'>gen16a-base</model> + <model usable='yes' vendor='IBM'>z900.3</model> + <model usable='yes' vendor='IBM'>z196-base</model> + <model usable='yes' vendor='IBM'>z990</model> + <model usable='yes' vendor='IBM'>z14-base</model> + <model usable='yes' vendor='IBM'>z900.2</model> + <model usable='yes' vendor='IBM'>z800</model> + <model usable='no' vendor='IBM'>z10EC</model> + <model usable='no' vendor='IBM'>z14ZR1</model> + <model usable='no' vendor='IBM'>z10EC.2</model> + <model usable='yes' vendor='IBM'>z900</model> + <model usable='yes' vendor='IBM'>z10EC.2-base</model> + <model usable='yes' vendor='IBM'>z900.2-base</model> + <model usable='yes' vendor='IBM'>z900-base</model> + <model usable='no' vendor='IBM'>z10EC.3</model> + <model usable='yes' vendor='IBM'>z990.5-base</model> + <model usable='yes' vendor='unknown'>max</model> + <model usable='no' vendor='IBM'>gen15b</model> + <model usable='yes' vendor='IBM'>z9BC.2-base</model> + <model usable='no' vendor='IBM'>gen15a</model> + <model usable='yes' vendor='IBM'>z990.2-base</model> + <model usable='yes' vendor='IBM'>z10EC-base</model> + <model usable='no' vendor='IBM'>gen16b-base</model> + <model usable='no' vendor='IBM'>z114</model> + <model usable='yes' vendor='IBM'>z9EC-base</model> + <model usable='no' vendor='IBM'>z13s</model> + <model usable='yes' vendor='unknown'>qemu</model> + <model usable='yes' vendor='IBM'>gen15b-base</model> + <model usable='yes' vendor='IBM'>zEC12-base</model> + <model usable='yes' vendor='IBM'>z890.3</model> + <model usable='yes' vendor='IBM'>z10EC.3-base</model> + <model usable='yes' vendor='IBM'>z890.2-base</model> + <model usable='yes' vendor='IBM'>z890.2</model> + <model usable='yes' vendor='IBM'>zEC12.2-base</model> + <model usable='yes' vendor='IBM'>z10BC-base</model> + <model usable='yes' vendor='IBM'>z890-base</model> + <model usable='yes' vendor='IBM'>z9BC-base</model> + <model usable='no' vendor='IBM'>z10BC</model> + <model usable='no' vendor='IBM'>z9EC</model> + <model usable='yes' vendor='IBM'>z9EC.2-base</model> + <model usable='yes' vendor='IBM'>z13.2-base</model> + <model usable='yes' vendor='IBM'>z900.3-base</model> + <model usable='yes' vendor='IBM'>z990.3-base</model> + <model usable='yes' vendor='IBM'>z13s-base</model> + <model usable='no' vendor='IBM'>zBC12</model> + <model usable='yes' vendor='IBM'>z990-base</model> + <model usable='no' vendor='IBM'>z9BC.2</model> + </mode> + </cpu> + <memoryBacking supported='yes'> + <enum name='sourceType'> + <value>file</value> + <value>anonymous</value> + <value>memfd</value> + </enum> + </memoryBacking> + <devices> + <disk supported='yes'> + <enum name='diskDevice'> + <value>disk</value> + <value>cdrom</value> + <value>floppy</value> + <value>lun</value> + </enum> + <enum name='bus'> + <value>fdc</value> + <value>scsi</value> + <value>virtio</value> + <value>usb</value> + </enum> + <enum name='model'> + <value>virtio</value> + <value>virtio-transitional</value> + <value>virtio-non-transitional</value> + </enum> + </disk> + <graphics supported='yes'> + <enum name='type'> + <value>sdl</value> + <value>vnc</value> + <value>egl-headless</value> + <value>dbus</value> + </enum> + </graphics> + <video supported='yes'> + <enum name='modelType'> + <value>virtio</value> + <value>none</value> + </enum> + </video> + <hostdev supported='yes'> + <enum name='mode'> + <value>subsystem</value> + </enum> + <enum name='startupPolicy'> + <value>default</value> + <value>mandatory</value> + <value>requisite</value> + <value>optional</value> + </enum> + <enum name='subsysType'> + <value>usb</value> + <value>pci</value> + <value>scsi</value> + </enum> + <enum name='capsType'/> + <enum name='pciBackend'> + <value>default</value> + <value>vfio</value> + </enum> + </hostdev> + <rng supported='yes'> + <enum name='model'> + <value>virtio</value> + <value>virtio-transitional</value> + <value>virtio-non-transitional</value> + </enum> + <enum name='backendModel'> + <value>random</value> + <value>egd</value> + <value>builtin</value> + </enum> + </rng> + <filesystem supported='yes'> + <enum name='driverType'> + <value>path</value> + <value>handle</value> + <value>virtiofs</value> + </enum> + </filesystem> + <tpm supported='no'/> + <redirdev supported='no'/> + <channel supported='yes'> + <enum name='type'> + <value>pty</value> + <value>unix</value> + </enum> + </channel> + <crypto supported='yes'> + <enum name='model'> + <value>virtio</value> + </enum> + <enum name='type'> + <value>qemu</value> + </enum> + <enum name='backendModel'> + <value>builtin</value> + </enum> + </crypto> + </devices> + <features> + <gic supported='no'/> + <vmcoreinfo supported='no'/> + <genid supported='no'/> + <backingStoreInput supported='yes'/> + <backup supported='yes'/> + <async-teardown supported='yes'/> + <s390-pv supported='yes'/> + <sev supported='no'/> + <sgx supported='no'/> + </features> +</domainCapabilities> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies new file mode 100644 index 0000000000..fa9051c305 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies @@ -0,0 +1,35300 @@ +{ + "execute": "qmp_capabilities", + "id": "libvirt-1" +} + +{ + "return": {}, + "id": "libvirt-1" +} + +{ + "execute": "query-version", + "id": "libvirt-2" +} + +{ + "return": { + "qemu": { + "micro": 0, + "minor": 2, + "major": 8 + }, + "package": "v8.2.0" + }, + "id": "libvirt-2" +} diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml new file mode 100644 index 0000000000..bd413b61e7 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml @@ -0,0 +1,3839 @@ +<qemuCaps> + <emulator>/usr/bin/qemu-system-s390x</emulator> + <qemuctime>0</qemuctime> + <selfctime>0</selfctime> + <selfvers>0</selfvers> + <flag name='kvm'/> + <flag name='sdl'/> + <flag name='usb-hub'/> + <flag name='virtio-blk-pci.scsi'/> + <flag name='scsi-disk.channel'/> + <flag name='scsi-block'/> + <flag name='virtio-scsi-pci'/> + <flag name='seccomp-sandbox'/> + <flag name='vnc'/> + <flag name='s390-sclp'/> + <flag name='usb-serial'/> + <flag name='virtio-rng'/> + <flag name='rng-random'/> + <flag name='rng-egd'/> + <flag name='virtio-ccw'/> + <flag name='pci-bridge'/> + <flag name='vfio-pci'/> + <flag name='usb-storage'/> + <flag name='usb-kbd'/> + <flag name='usb-audio'/> + <flag name='migrate-rdma'/> + <flag name='virtio-net'/> + <flag name='virtio-gpu'/> + <flag name='virtio-keyboard'/> + <flag name='virtio-mouse'/> + <flag name='virtio-tablet'/> + <flag name='virtio-input-host'/> + <flag name='virtio-balloon-pci.deflate-on-oom'/> + <flag name='vhost-scsi'/> + <flag name='query-cpu-model-expansion'/> + <flag name='query-cpu-definitions'/> + <flag name='qemu-xhci'/> + <flag name='chardev-reconnect'/> + <flag name='sclplmconsole'/> + <flag name='virtio-gpu-ccw'/> + <flag name='virtio-keyboard-ccw'/> + <flag name='virtio-mouse-ccw'/> + <flag name='virtio-tablet-ccw'/> + <flag name='nbd-tls'/> + <flag name='pr-manager-helper'/> + <flag name='vfio-ccw'/> + <flag name='screendump_device'/> + <flag name='vhost-vsock'/> + <flag name='egl-headless'/> + <flag name='vfio-ap'/> + <flag name='zpci'/> + <flag name='memory-backend-memfd'/> + <flag name='memory-backend-memfd.hugetlb'/> + <flag name='egl-headless.rendernode'/> + <flag name='virtio-pci-non-transitional'/> + <flag name='nbd-bitmap'/> + <flag name='migration-file-drop-cache'/> + <flag name='dbus-vmstate'/> + <flag name='vhost-user-gpu'/> + <flag name='incremental-backup'/> + <flag name='query-cpu-model-baseline'/> + <flag name='query-cpu-model-comparison'/> + <flag name='drive-nvme'/> + <flag name='smp-dies'/> + <flag name='rng-builtin'/> + <flag name='vhost-user-fs'/> + <flag name='query-named-block-nodes.flat'/> + <flag name='blockdev-snapshot.allow-write-only-overlay'/> + <flag name='blockdev-reopen'/> + <flag name='fsdev.multidevs'/> + <flag name='aio.io_uring'/> + <flag name='tcg'/> + <flag name='virtio-blk-pci.scsi.default.disabled'/> + <flag name='numa.hmat'/> + <flag name='virtio-balloon.free-page-reporting'/> + <flag name='block-export-add'/> + <flag name='netdev.vhost-vdpa'/> + <flag name='vhost-user-fs.bootindex'/> + <flag name='vhost-user-blk'/> + <flag name='cpu-max'/> + <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> + <flag name='migration-param.block-bitmap-mapping'/> + <flag name='vnc-power-control'/> + <flag name='object.qapified'/> + <flag name='rotation-rate'/> + <flag name='compat-deprecated'/> + <flag name='acpi-index'/> + <flag name='input-linux'/> + <flag name='confidential-guest-support'/> + <flag name='s390-pv-guest'/> + <flag name='set-action'/> + <flag name='virtio-blk.queue-size'/> + <flag name='memory-backend-file.reserve'/> + <flag name='netdev.json'/> + <flag name='query-dirty-rate'/> + <flag name='rbd-encryption'/> + <flag name='sev-guest-kernel-hashes'/> + <flag name='device.json+hotplug'/> + <flag name='calc-dirty-rate'/> + <flag name='dirtyrate-param.mode'/> + <flag name='blockdev.nbd.tls-hostname'/> + <flag name='memory-backend-file.prealloc-threads'/> + <flag name='virtio-iommu-pci'/> + <flag name='virtio-iommu.boot-bypass'/> + <flag name='virtio-net.rss'/> + <flag name='display-dbus'/> + <flag name='iothread.thread-pool-max'/> + <flag name='migration.blocked-reasons'/> + <flag name='query-stats'/> + <flag name='query-stats-schemas'/> + <flag name='thread-context'/> + <flag name='screenshot-format-png'/> + <flag name='netdev.stream'/> + <flag name='virtio-crypto'/> + <flag name='netdev.stream.reconnect'/> + <flag name='virtio-gpu.blob'/> + <flag name='rbd-encryption-layering'/> + <flag name='rbd-encryption-luks-any'/> + <flag name='qcow2-discard-no-unref'/> + <flag name='run-with.async-teardown'/> + <flag name='smp-clusters'/> + <version>8002000</version> + <microcodeVersion>39100246</microcodeVersion> + <package>v8.2.0</package> + <arch>s390x</arch> -- 2.43.0
On Fri, Feb 09, 2024 at 18:19:45 +0100, Andrea Bolognani wrote:
*** UNIVERSAL SERIAL BLURB ***
https://gitlab.com/abologna/libvirt/-/commits/caps-s390x
Andrea Bolognani (5): tests: Rename s390-usb-* tests: Minimize s390-usb-* tests: Add s390-usb-model tests: Update capabilities for QEMU 8.1.0 on s390x tests: Add capabilities for QEMU 8.2.0 on s390x
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
participants (2)
-
Andrea Bolognani -
Peter Krempa