tests: Update capabilities for QEMU 8.1.0 on s390x

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>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

tests/domaincapsdata/qemu_8.1.0.s390x.xml

@@ -36,15 +36,12 @@
       </enum>
     </mode>
     <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>gen16a-base</model>
+      <model fallback='forbid'>gen15a-base</model>
-      <feature policy='require' name='nnpa'/>
       <feature policy='require' name='aen'/>
-      <feature policy='require' name='cmmnt'/>
       <feature policy='require' name='vxpdeh'/>
       <feature policy='require' name='aefsi'/>
       <feature policy='require' name='diag318'/>
       <feature policy='require' name='csske'/>
-      <feature policy='require' name='mepoch'/>
       <feature policy='require' name='msa9'/>
       <feature policy='require' name='msa8'/>
       <feature policy='require' name='msa7'/>
@@ -56,15 +53,9 @@
       <feature policy='require' name='msa1'/>
       <feature policy='require' name='sthyi'/>
       <feature policy='require' name='edat'/>
-      <feature policy='require' name='ri'/>
       <feature policy='require' name='deflate'/>
-      <feature policy='require' name='edat2'/>
       <feature policy='require' name='etoken'/>
       <feature policy='require' name='vx'/>
-      <feature policy='require' name='ipter'/>
-      <feature policy='require' name='pai'/>
-      <feature policy='require' name='paie'/>
-      <feature policy='require' name='mepochptff'/>
       <feature policy='require' name='ap'/>
       <feature policy='require' name='vxeh'/>
       <feature policy='require' name='vxpd'/>
@@ -72,7 +63,6 @@
       <feature policy='require' name='msa9_pckmo'/>
       <feature policy='require' name='vxeh2'/>
       <feature policy='require' name='esort'/>
-      <feature policy='require' name='apqi'/>
       <feature policy='require' name='apft'/>
       <feature policy='require' name='els'/>
       <feature policy='require' name='iep'/>
@@ -83,33 +73,28 @@
       <feature policy='require' name='gs'/>
       <feature policy='require' name='ppa15'/>
       <feature policy='require' name='zpci'/>
-      <feature policy='require' name='rdp'/>
       <feature policy='require' name='sea_esop2'/>
-      <feature policy='require' name='beareh'/>
       <feature policy='require' name='te'/>
-      <feature policy='require' name='cmm'/>
-      <feature policy='require' name='vxpdeh2'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='IBM'>gen16a-base</model>
+      <model usable='no' vendor='IBM'>gen16a</model>
-      <model usable='yes' vendor='IBM'>gen16a</model>
       <model usable='yes' vendor='IBM'>z800-base</model>
       <model usable='yes' vendor='IBM'>z890.2-base</model>
-      <model usable='yes' vendor='IBM'>z9EC.2</model>
+      <model usable='no' vendor='IBM'>z9EC.2</model>
-      <model usable='yes' vendor='IBM'>z13.2</model>
+      <model usable='no' vendor='IBM'>z13.2</model>
       <model usable='yes' vendor='IBM'>z990.5-base</model>
       <model usable='yes' vendor='IBM'>z9BC-base</model>
       <model usable='yes' vendor='IBM'>z890</model>
       <model usable='yes' vendor='IBM'>z890.2</model>
-      <model usable='yes' vendor='IBM'>z9BC</model>
+      <model usable='no' vendor='IBM'>z9BC</model>
-      <model usable='yes' vendor='IBM'>z13</model>
+      <model usable='no' vendor='IBM'>z196</model>
-      <model usable='yes' vendor='IBM'>z196</model>
+      <model usable='no' vendor='IBM'>z13</model>
-      <model usable='yes' vendor='IBM'>z13s</model>
+      <model usable='no' vendor='IBM'>z13s</model>
-      <model usable='yes' vendor='IBM'>gen16b-base</model>
+      <model usable='no' vendor='IBM'>gen16b-base</model>
       <model usable='yes' vendor='IBM'>z990.3</model>
       <model usable='yes' vendor='IBM'>z13s-base</model>
-      <model usable='yes' vendor='IBM'>z9EC</model>
+      <model usable='no' vendor='IBM'>gen15a</model>
-      <model usable='yes' vendor='IBM'>gen15a</model>
+      <model usable='no' vendor='IBM'>z9EC</model>
       <model usable='yes' vendor='IBM'>z14ZR1-base</model>
       <model usable='yes' vendor='IBM'>z14.2-base</model>
       <model usable='yes' vendor='IBM'>z900.3-base</model>
@@ -118,57 +103,58 @@
       <model usable='yes' vendor='IBM'>zBC12-base</model>
       <model usable='yes' vendor='IBM'>z9BC.2-base</model>
       <model usable='yes' vendor='IBM'>z900.2-base</model>
-      <model usable='yes' vendor='IBM'>z9EC.3</model>
+      <model usable='no' vendor='IBM'>zEC12</model>
-      <model usable='yes' vendor='IBM'>zEC12</model>
+      <model usable='no' vendor='IBM'>z9EC.3</model>
       <model usable='yes' vendor='IBM'>z900</model>
       <model usable='yes' vendor='IBM'>z114-base</model>
       <model usable='yes' vendor='IBM'>zEC12-base</model>
-      <model usable='yes' vendor='IBM'>z10EC.2</model>
+      <model usable='no' vendor='IBM'>z10EC.2</model>
       <model usable='yes' vendor='IBM'>z10EC-base</model>
       <model usable='yes' vendor='IBM'>z900.3</model>
-      <model usable='yes' vendor='IBM'>z14ZR1</model>
+      <model usable='no' vendor='IBM'>z14ZR1</model>
-      <model usable='yes' vendor='IBM'>z10BC</model>
+      <model usable='no' vendor='IBM'>z10BC</model>
       <model usable='yes' vendor='IBM'>z10BC.2-base</model>
-      <model usable='yes' vendor='IBM'>z9BC.2</model>
+      <model usable='no' vendor='IBM'>z9BC.2</model>
-      <model usable='yes' vendor='IBM'>z990.2</model>
       <model usable='yes' vendor='IBM'>z990</model>
-      <model usable='yes' vendor='IBM'>z14</model>
+      <model usable='yes' vendor='IBM'>z990.2</model>
+      <model usable='no' vendor='IBM'>z14</model>
       <model usable='yes' vendor='IBM'>gen15b-base</model>
       <model usable='yes' vendor='IBM'>z990.4</model>
       <model usable='yes' vendor='unknown'>max</model>
+      <model usable='no' vendor='IBM'>gen16b</model>
       <model usable='yes' vendor='IBM'>z10EC.2-base</model>
       <model usable='yes' vendor='IBM'>gen15a-base</model>
       <model usable='yes' vendor='IBM'>z800</model>
-      <model usable='yes' vendor='IBM'>z10EC</model>
+      <model usable='no' vendor='IBM'>zEC12.2</model>
-      <model usable='yes' vendor='IBM'>zEC12.2</model>
+      <model usable='no' vendor='IBM'>z10EC</model>
       <model usable='yes' vendor='IBM'>z990.2-base</model>
-      <model usable='yes' vendor='IBM'>gen16b</model>
       <model usable='yes' vendor='IBM'>z900-base</model>
-      <model usable='yes' vendor='IBM'>z10BC.2</model>
+      <model usable='no' vendor='IBM'>z10BC.2</model>
       <model usable='yes' vendor='IBM'>z9EC-base</model>
       <model usable='yes' vendor='IBM'>z9EC.3-base</model>
-      <model usable='yes' vendor='IBM'>z114</model>
+      <model usable='no' vendor='IBM'>z114</model>
       <model usable='yes' vendor='IBM'>z890.3</model>
       <model usable='yes' vendor='IBM'>z196-base</model>
       <model usable='yes' vendor='IBM'>z9EC.2-base</model>
-      <model usable='yes' vendor='IBM'>z196.2</model>
+      <model usable='no' vendor='IBM'>z196.2</model>
-      <model usable='yes' vendor='IBM'>z14.2</model>
+      <model usable='no' vendor='IBM'>z14.2</model>
       <model usable='yes' vendor='IBM'>z990-base</model>
-      <model usable='yes' vendor='IBM'>z900.2</model>
+      <model usable='no' vendor='IBM'>z10EC.3</model>
       <model usable='yes' vendor='IBM'>z890-base</model>
-      <model usable='yes' vendor='IBM'>z10EC.3</model>
+      <model usable='yes' vendor='IBM'>z900.2</model>
       <model usable='yes' vendor='IBM'>z14-base</model>
       <model usable='yes' vendor='IBM'>z990.4-base</model>
+      <model usable='yes' vendor='IBM'>zEC12.2-base</model>
       <model usable='yes' vendor='IBM'>z10EC.3-base</model>
       <model usable='yes' vendor='IBM'>z10BC-base</model>
       <model usable='yes' vendor='IBM'>z13-base</model>
       <model usable='yes' vendor='IBM'>z990.3-base</model>
       <model usable='yes' vendor='IBM'>z990.5</model>
-      <model usable='yes' vendor='IBM'>zEC12.2-base</model>
+      <model usable='no' vendor='IBM'>zBC12</model>
-      <model usable='yes' vendor='IBM'>zBC12</model>
       <model usable='yes' vendor='IBM'>z890.3-base</model>
       <model usable='yes' vendor='unknown'>qemu</model>
-      <model usable='yes' vendor='IBM'>gen15b</model>
+      <model usable='no' vendor='IBM'>gen15b</model>
+      <model usable='no' vendor='IBM'>gen16a-base</model>
     </mode>
   </cpu>
   <memoryBacking supported='yes'>
@@ -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>

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 \

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 \

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 \

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 \

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 \

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 \

tests/qemuxmlconfdata/s390-usb-model.s390x-latest.args

@@ -0,0 +1,33 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-test/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-test/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
+/usr/bin/qemu-system-s390x \
+-name guest=test,debug-threads=on \
+-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 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 c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-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

tests/qemuxmlconfdata/s390-usb-model.s390x-latest.err

@@ -1 +0,0 @@
-unsupported configuration: USB controller model 'qemu-xhci' not supported in this QEMU binary

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");