Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- .../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

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(a)redhat.com&gt; --- 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