On 25.03.20 08:06, Bjoern Walk wrote: > Update s390x capabilities for QEMU 4.2 with the actual GA version for > QEMU and on the latest z15 machine. Maybe add: As these files were generated on a z15 and the previous data was taken on a z13 this now indicates, z15 (gen15a) AND z14 to be available. to the patch description? The cpu features changes look sane to me. Acked-by: Christian Borntraeger <borntraeger@xxxxxxxxxx> > This picks up the new blockdev capability, so we need to refresh a bunch > of test cases as well. > > Reviewed-by: Boris Fiuczynski <fiuczy@xxxxxxxxxxxxx> > Signed-off-by: Bjoern Walk <bwalk@xxxxxxxxxxxxx> > --- > I have stripped the replies file to save some bandwidth on the mailing > list. Full patch can be found here: > > https://gitlab.com/bwalk/libvirt/-/commit/5fc05853f2cc6d191a07f897cdd4e12fa9881562 > > tests/domaincapsdata/qemu_4.2.0.s390x.xml | 47 +- > .../caps_4.2.0.s390x.replies | 3230 +++++++++-------- > .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 216 +- > ...default-video-type-s390x.s390x-latest.args | 8 +- > .../fs9p-ccw.s390x-latest.args | 7 +- > ...othreads-virtio-scsi-ccw.s390x-latest.args | 14 +- > ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 8 +- > .../s390x-ccw-graphics.s390x-latest.args | 8 +- > .../s390x-ccw-headless.s390x-latest.args | 8 +- > .../vhost-vsock-ccw-auto.s390x-latest.args | 7 +- > .../vhost-vsock-ccw.s390x-latest.args | 7 +- > 11 files changed, 1871 insertions(+), 1689 deletions(-) > > diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml > index fbb3905f..6b87e450 100644 > --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml > +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml > @@ -27,9 +27,17 @@ > <cpu> > <mode name='host-passthrough' supported='yes'/> > <mode name='host-model' supported='yes'> > - <model fallback='forbid'>z13.2-base</model> > + <model fallback='forbid'>gen15a-base</model> > <feature policy='require' name='aen'/> > + <feature policy='require' name='cmmnt'/> > + <feature policy='require' name='vxpdeh'/> > <feature policy='require' name='aefsi'/> > + <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'/> > + <feature policy='require' name='msa6'/> > <feature policy='require' name='msa5'/> > <feature policy='require' name='msa4'/> > <feature policy='require' name='msa3'/> > @@ -38,15 +46,26 @@ > <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='mepochptff'/> > <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='apqi'/> > <feature policy='require' name='apft'/> > + <feature policy='require' name='iep'/> > <feature policy='require' name='apqci'/> > <feature policy='require' name='cte'/> > <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'/> > @@ -58,8 +77,8 @@ > <model usable='yes'>z890.2-base</model> > <model usable='yes'>z9EC.2</model> > <model usable='yes'>z13.2</model> > - <model usable='yes'>z990.5-base</model> > <model usable='yes'>z9BC-base</model> > + <model usable='yes'>z990.5-base</model> > <model usable='yes'>z890.2</model> > <model usable='yes'>z890</model> > <model usable='yes'>z9BC</model> > @@ -69,9 +88,9 @@ > <model usable='yes'>z990.3</model> > <model usable='yes'>z13s-base</model> > <model usable='yes'>z9EC</model> > - <model usable='no'>gen15a</model> > - <model usable='no'>z14ZR1-base</model> > - <model usable='no'>z14.2-base</model> > + <model usable='yes'>gen15a</model> > + <model usable='yes'>z14ZR1-base</model> > + <model usable='yes'>z14.2-base</model> > <model usable='yes'>z900.3-base</model> > <model usable='yes'>z13.2-base</model> > <model usable='yes'>z196.2-base</model> > @@ -86,18 +105,18 @@ > <model usable='yes'>z10EC.2</model> > <model usable='yes'>z10EC-base</model> > <model usable='yes'>z900.3</model> > - <model usable='no'>z14ZR1</model> > + <model usable='yes'>z14ZR1</model> > <model usable='yes'>z10BC</model> > <model usable='yes'>z10BC.2-base</model> > - <model usable='yes'>z9BC.2</model> > <model usable='yes'>z990.2</model> > + <model usable='yes'>z9BC.2</model> > <model usable='yes'>z990</model> > - <model usable='no'>z14</model> > - <model usable='no'>gen15b-base</model> > + <model usable='yes'>z14</model> > + <model usable='yes'>gen15b-base</model> > <model usable='yes'>z990.4</model> > <model usable='yes'>max</model> > <model usable='yes'>z10EC.2-base</model> > - <model usable='no'>gen15a-base</model> > + <model usable='yes'>gen15a-base</model> > <model usable='yes'>z800</model> > <model usable='yes'>zEC12.2</model> > <model usable='yes'>z10EC</model> > @@ -111,12 +130,12 @@ > <model usable='yes'>z196-base</model> > <model usable='yes'>z9EC.2-base</model> > <model usable='yes'>z196.2</model> > - <model usable='no'>z14.2</model> > + <model usable='yes'>z14.2</model> > <model usable='yes'>z990-base</model> > <model usable='yes'>z900.2</model> > <model usable='yes'>z890-base</model> > <model usable='yes'>z10EC.3</model> > - <model usable='no'>z14-base</model> > + <model usable='yes'>z14-base</model> > <model usable='yes'>z990.4-base</model> > <model usable='yes'>z10EC.3-base</model> > <model usable='yes'>z10BC-base</model> > @@ -126,7 +145,7 @@ > <model usable='yes'>zBC12</model> > <model usable='yes'>z890.3-base</model> > <model usable='yes'>z990.5</model> > - <model usable='no'>gen15b</model> > + <model usable='yes'>gen15b</model> > <model usable='no'>qemu</model> > </mode> > </cpu> > @@ -198,7 +217,7 @@ > <gic supported='no'/> > <vmcoreinfo supported='no'/> > <genid supported='no'/> > - <backingStoreInput supported='no'/> > + <backingStoreInput supported='yes'/> > <backup supported='no'/> > <sev supported='no'/> > </features> > diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies > index be709b3c..82b60bf0 100644 > --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies > +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies > @@ -17,11 +17,11 @@ > [...] > diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml > index 37776e1b..e46259e6 100644 > --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml > +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml > @@ -8,12 +8,14 @@ > <flag name='virtio-blk-pci.ioeventfd'/> > <flag name='virtio-blk-pci.event_idx'/> > <flag name='virtio-net-pci.event_idx'/> > + <flag name='usb-redir'/> > <flag name='virtio-blk-pci.scsi'/> > <flag name='scsi-disk.channel'/> > <flag name='scsi-block'/> > <flag name='dump-guest-memory'/> > <flag name='virtio-scsi-pci'/> > <flag name='blockio'/> > + <flag name='usb-redir.filter'/> > <flag name='scsi-disk.wwn'/> > <flag name='seccomp-sandbox'/> > <flag name='reboot-timeout'/> > @@ -49,6 +51,7 @@ > <flag name='gic-version'/> > <flag name='incoming-defer'/> > <flag name='virtio-gpu'/> > + <flag name='virtio-gpu.virgl'/> > <flag name='virtio-keyboard'/> > <flag name='virtio-mouse'/> > <flag name='virtio-tablet'/> > @@ -115,6 +118,7 @@ > <flag name='chardev-fd-pass'/> > <flag name='egl-headless'/> > <flag name='vfio-pci.display'/> > + <flag name='blockdev'/> > <flag name='vfio-ap'/> > <flag name='zpci'/> > <flag name='memory-backend-memfd'/> > @@ -134,18 +138,28 @@ > <flag name='query-cpu-model-baseline'/> > <flag name='query-cpu-model-comparison'/> > <flag name='blockdev-file-dynamic-auto-read-only'/> > + <flag name='savevm-monitor-nodes'/> > <flag name='drive-nvme'/> > <flag name='smp-dies'/> > <flag name='rng-builtin'/> > + <flag name='virtio-net.failover'/> > <flag name='vhost-user-fs'/> > - <version>4001050</version> > + <version>4002000</version> > <kvmVersion>0</kvmVersion> > <microcodeVersion>39100242</microcodeVersion> > - <package>v4.1.0-1686-g419af24e7e-dirty</package> > + <package>qemu-4.2.0-20200115.0.1e4aa2da.fc31</package> > <arch>s390x</arch> > - <hostCPU type='kvm' model='z13.2-base' migratability='no'> > + <hostCPU type='kvm' model='gen15a-base' migratability='no'> > <property name='aen' type='boolean' value='true'/> > + <property name='cmmnt' type='boolean' value='true'/> > + <property name='vxpdeh' type='boolean' value='true'/> > <property name='aefsi' type='boolean' value='true'/> > + <property name='csske' type='boolean' value='true'/> > + <property name='mepoch' type='boolean' value='true'/> > + <property name='msa9' type='boolean' value='true'/> > + <property name='msa8' type='boolean' value='true'/> > + <property name='msa7' type='boolean' value='true'/> > + <property name='msa6' type='boolean' value='true'/> > <property name='msa5' type='boolean' value='true'/> > <property name='msa4' type='boolean' value='true'/> > <property name='msa3' type='boolean' value='true'/> > @@ -154,15 +168,26 @@ > <property name='sthyi' type='boolean' value='true'/> > <property name='edat' type='boolean' value='true'/> > <property name='ri' type='boolean' value='true'/> > + <property name='deflate' type='boolean' value='true'/> > <property name='edat2' type='boolean' value='true'/> > + <property name='etoken' type='boolean' value='true'/> > <property name='vx' type='boolean' value='true'/> > <property name='ipter' type='boolean' value='true'/> > + <property name='mepochptff' type='boolean' value='true'/> > <property name='ap' type='boolean' value='true'/> > + <property name='vxeh' type='boolean' value='true'/> > + <property name='vxpd' type='boolean' value='true'/> > <property name='esop' type='boolean' value='true'/> > + <property name='msa9_pckmo' type='boolean' value='true'/> > + <property name='vxeh2' type='boolean' value='true'/> > + <property name='esort' type='boolean' value='true'/> > + <property name='apqi' type='boolean' value='true'/> > <property name='apft' type='boolean' value='true'/> > + <property name='iep' type='boolean' value='true'/> > <property name='apqci' type='boolean' value='true'/> > <property name='cte' type='boolean' value='true'/> > <property name='bpb' type='boolean' value='true'/> > + <property name='gs' type='boolean' value='true'/> > <property name='ppa15' type='boolean' value='true'/> > <property name='zpci' type='boolean' value='true'/> > <property name='sea_esop2' type='boolean' value='true'/> > @@ -173,8 +198,8 @@ > <cpu type='kvm' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z13.2' typename='z13.2-s390x-cpu' usable='yes'/> > - <cpu type='kvm' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='yes'/> > + <cpu type='kvm' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z890.2' typename='z890.2-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z890' typename='z890-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/> > @@ -185,46 +210,9 @@ > <cpu type='kvm' name='z990.3' typename='z990.3-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z13s-base' typename='z13s-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z9EC' typename='z9EC-s390x-cpu' usable='yes'/> > - <cpu type='kvm' name='gen15a' typename='gen15a-s390x-cpu' usable='no'> > - <blocker name='etoken'/> > - <blocker name='vxpdeh'/> > - <blocker name='vxeh2'/> > - <blocker name='mepoch'/> > - <blocker name='vxeh'/> > - <blocker name='vxpd'/> > - <blocker name='gs'/> > - <blocker name='iep'/> > - <blocker name='minste3'/> > - <blocker name='tsi'/> > - <blocker name='sema'/> > - <blocker name='minste2'/> > - <blocker name='eec'/> > - <blocker name='opc'/> > - <blocker name='deflate'/> > - <blocker name='mepochptff'/> > - <blocker name='msa9_pckmo'/> > - <blocker name='msa9'/> > - <blocker name='msa8'/> > - <blocker name='msa7'/> > - <blocker name='msa6'/> > - <blocker name='type'/> > - </cpu> > - <cpu type='kvm' name='z14ZR1-base' typename='z14ZR1-base-s390x-cpu' usable='no'> > - <blocker name='tsi'/> > - <blocker name='sema'/> > - <blocker name='minste2'/> > - <blocker name='eec'/> > - <blocker name='opc'/> > - <blocker name='type'/> > - </cpu> > - <cpu type='kvm' name='z14.2-base' typename='z14.2-base-s390x-cpu' usable='no'> > - <blocker name='tsi'/> > - <blocker name='sema'/> > - <blocker name='minste2'/> > - <blocker name='eec'/> > - <blocker name='opc'/> > - <blocker name='type'/> > - </cpu> > + <cpu type='kvm' name='gen15a' typename='gen15a-s390x-cpu' usable='yes'/> > + <cpu type='kvm' name='z14ZR1-base' typename='z14ZR1-base-s390x-cpu' usable='yes'/> > + <cpu type='kvm' name='z14.2-base' typename='z14.2-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z900.3-base' typename='z900.3-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z13.2-base' typename='z13.2-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z196.2-base' typename='z196.2-base-s390x-cpu' usable='yes'/> > @@ -239,66 +227,18 @@ > <cpu type='kvm' name='z10EC.2' typename='z10EC.2-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z10EC-base' typename='z10EC-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z900.3' typename='z900.3-s390x-cpu' usable='yes'/> > - <cpu type='kvm' name='z14ZR1' typename='z14ZR1-s390x-cpu' usable='no'> > - <blocker name='mepoch'/> > - <blocker name='vxeh'/> > - <blocker name='vxpd'/> > - <blocker name='gs'/> > - <blocker name='iep'/> > - <blocker name='tsi'/> > - <blocker name='sema'/> > - <blocker name='minste2'/> > - <blocker name='eec'/> > - <blocker name='opc'/> > - <blocker name='mepochptff'/> > - <blocker name='msa8'/> > - <blocker name='msa7'/> > - <blocker name='msa6'/> > - <blocker name='type'/> > - </cpu> > + <cpu type='kvm' name='z14ZR1' typename='z14ZR1-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z10BC' typename='z10BC-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z10BC.2-base' typename='z10BC.2-base-s390x-cpu' usable='yes'/> > - <cpu type='kvm' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z990.2' typename='z990.2-s390x-cpu' usable='yes'/> > + <cpu type='kvm' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z990' typename='z990-s390x-cpu' usable='yes'/> > - <cpu type='kvm' name='z14' typename='z14-s390x-cpu' usable='no'> > - <blocker name='mepoch'/> > - <blocker name='vxeh'/> > - <blocker name='vxpd'/> > - <blocker name='gs'/> > - <blocker name='iep'/> > - <blocker name='tsi'/> > - <blocker name='sema'/> > - <blocker name='minste2'/> > - <blocker name='eec'/> > - <blocker name='opc'/> > - <blocker name='mepochptff'/> > - <blocker name='msa8'/> > - <blocker name='msa7'/> > - <blocker name='msa6'/> > - <blocker name='type'/> > - </cpu> > - <cpu type='kvm' name='gen15b-base' typename='gen15b-base-s390x-cpu' usable='no'> > - <blocker name='minste3'/> > - <blocker name='tsi'/> > - <blocker name='sema'/> > - <blocker name='minste2'/> > - <blocker name='eec'/> > - <blocker name='opc'/> > - <blocker name='type'/> > - </cpu> > + <cpu type='kvm' name='z14' typename='z14-s390x-cpu' usable='yes'/> > + <cpu type='kvm' name='gen15b-base' typename='gen15b-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z990.4' typename='z990.4-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='max' typename='max-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z10EC.2-base' typename='z10EC.2-base-s390x-cpu' usable='yes'/> > - <cpu type='kvm' name='gen15a-base' typename='gen15a-base-s390x-cpu' usable='no'> > - <blocker name='minste3'/> > - <blocker name='tsi'/> > - <blocker name='sema'/> > - <blocker name='minste2'/> > - <blocker name='eec'/> > - <blocker name='opc'/> > - <blocker name='type'/> > - </cpu> > + <cpu type='kvm' name='gen15a-base' typename='gen15a-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z800' typename='z800-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='zEC12.2' typename='zEC12.2-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z10EC' typename='z10EC-s390x-cpu' usable='yes'/> > @@ -312,35 +252,12 @@ > <cpu type='kvm' name='z196-base' typename='z196-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z9EC.2-base' typename='z9EC.2-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z196.2' typename='z196.2-s390x-cpu' usable='yes'/> > - <cpu type='kvm' name='z14.2' typename='z14.2-s390x-cpu' usable='no'> > - <blocker name='mepoch'/> > - <blocker name='vxeh'/> > - <blocker name='vxpd'/> > - <blocker name='gs'/> > - <blocker name='iep'/> > - <blocker name='tsi'/> > - <blocker name='sema'/> > - <blocker name='minste2'/> > - <blocker name='eec'/> > - <blocker name='opc'/> > - <blocker name='mepochptff'/> > - <blocker name='msa8'/> > - <blocker name='msa7'/> > - <blocker name='msa6'/> > - <blocker name='type'/> > - </cpu> > + <cpu type='kvm' name='z14.2' typename='z14.2-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z990-base' typename='z990-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z900.2' typename='z900.2-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z890-base' typename='z890-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z10EC.3' typename='z10EC.3-s390x-cpu' usable='yes'/> > - <cpu type='kvm' name='z14-base' typename='z14-base-s390x-cpu' usable='no'> > - <blocker name='tsi'/> > - <blocker name='sema'/> > - <blocker name='minste2'/> > - <blocker name='eec'/> > - <blocker name='opc'/> > - <blocker name='type'/> > - </cpu> > + <cpu type='kvm' name='z14-base' typename='z14-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z990.4-base' typename='z990.4-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z10BC-base' typename='z10BC-base-s390x-cpu' usable='yes'/> > @@ -350,30 +267,7 @@ > <cpu type='kvm' name='zBC12' typename='zBC12-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z890.3-base' typename='z890.3-base-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='z990.5' typename='z990.5-s390x-cpu' usable='yes'/> > - <cpu type='kvm' name='gen15b' typename='gen15b-s390x-cpu' usable='no'> > - <blocker name='etoken'/> > - <blocker name='vxpdeh'/> > - <blocker name='vxeh2'/> > - <blocker name='mepoch'/> > - <blocker name='vxeh'/> > - <blocker name='vxpd'/> > - <blocker name='gs'/> > - <blocker name='iep'/> > - <blocker name='minste3'/> > - <blocker name='tsi'/> > - <blocker name='sema'/> > - <blocker name='minste2'/> > - <blocker name='eec'/> > - <blocker name='opc'/> > - <blocker name='deflate'/> > - <blocker name='mepochptff'/> > - <blocker name='msa9_pckmo'/> > - <blocker name='msa9'/> > - <blocker name='msa8'/> > - <blocker name='msa7'/> > - <blocker name='msa6'/> > - <blocker name='type'/> > - </cpu> > + <cpu type='kvm' name='gen15b' typename='gen15b-s390x-cpu' usable='yes'/> > <cpu type='kvm' name='qemu' typename='qemu-s390x-cpu' usable='no'> > <blocker name='ais'/> > </cpu> > @@ -593,7 +487,7 @@ > <blocker name='gen13ptff'/> > <blocker name='tods'/> > </cpu> > - <cpu type='tcg' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='no'> > + <cpu type='tcg' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='no'> > <blocker name='klmd-sha-1'/> > <blocker name='kimd-sha-1'/> > <blocker name='km-tdea-192'/> > @@ -605,9 +499,13 @@ > <blocker name='kmac-tdea-192'/> > <blocker name='kmac-tdea-128'/> > <blocker name='kmac-dea'/> > + <blocker name='dateh2'/> > + <blocker name='hfpue'/> > <blocker name='hfpm'/> > + <blocker name='asnlxr'/> > + <blocker name='tods'/> > </cpu> > - <cpu type='tcg' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='no'> > + <cpu type='tcg' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='no'> > <blocker name='klmd-sha-1'/> > <blocker name='kimd-sha-1'/> > <blocker name='km-tdea-192'/> > @@ -619,11 +517,7 @@ > <blocker name='kmac-tdea-192'/> > <blocker name='kmac-tdea-128'/> > <blocker name='kmac-dea'/> > - <blocker name='dateh2'/> > - <blocker name='hfpue'/> > <blocker name='hfpm'/> > - <blocker name='asnlxr'/> > - <blocker name='tods'/> > </cpu> > <cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'> > <blocker name='klmd-sha-1'/> > @@ -1867,7 +1761,7 @@ > <blocker name='asnlxr'/> > <blocker name='tods'/> > </cpu> > - <cpu type='tcg' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='no'> > + <cpu type='tcg' name='z990.2' typename='z990.2-s390x-cpu' usable='no'> > <blocker name='klmd-sha-1'/> > <blocker name='kimd-sha-1'/> > <blocker name='km-tdea-192'/> > @@ -1879,16 +1773,9 @@ > <blocker name='kmac-tdea-192'/> > <blocker name='kmac-tdea-128'/> > <blocker name='kmac-dea'/> > - <blocker name='cmm'/> > - <blocker name='dateh2'/> > - <blocker name='sthyi'/> > - <blocker name='hfpue'/> > <blocker name='hfpm'/> > - <blocker name='asnlxr'/> > - <blocker name='msa1'/> > - <blocker name='tods'/> > </cpu> > - <cpu type='tcg' name='z990.2' typename='z990.2-s390x-cpu' usable='no'> > + <cpu type='tcg' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='no'> > <blocker name='klmd-sha-1'/> > <blocker name='kimd-sha-1'/> > <blocker name='km-tdea-192'/> > @@ -1900,7 +1787,14 @@ > <blocker name='kmac-tdea-192'/> > <blocker name='kmac-tdea-128'/> > <blocker name='kmac-dea'/> > + <blocker name='cmm'/> > + <blocker name='dateh2'/> > + <blocker name='sthyi'/> > + <blocker name='hfpue'/> > <blocker name='hfpm'/> > + <blocker name='asnlxr'/> > + <blocker name='msa1'/> > + <blocker name='tods'/> > </cpu> > <cpu type='tcg' name='z990' typename='z990-s390x-cpu' usable='no'> > <blocker name='klmd-sha-1'/> > diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args > index 934c5d59..47818085 100644 > --- a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args > +++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args > @@ -13,9 +13,11 @@ QEMU_AUDIO_DRV=none \ > -object secret,id=masterKey0,format=raw,\ > file=/tmp/lib/domain--1-default-video-type-s/master-key.aes \ > -machine s390-ccw-virtio,accel=kvm,usb=off,dump-guest-core=off \ > --cpu z13.2-base,aen=on,aefsi=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,\ > -sthyi=on,edat=on,ri=on,edat2=on,vx=on,ipter=on,ap=on,esop=on,apft=on,apqci=on,\ > -cte=on,bpb=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \ > +-cpu gen15a-base,aen=on,cmmnt=on,vxpdeh=on,aefsi=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,mepochptff=on,ap=on,\ > +vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,iep=on,\ > +apqci=on,cte=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \ > -m 1024 \ > -overcommit mem-lock=off \ > -smp 1,sockets=1,cores=1,threads=1 \ > diff --git a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args > index 4a93ee37..50d4bc42 100644 > --- a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args > +++ b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args > @@ -26,8 +26,11 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ > -rtc base=utc \ > -no-shutdown \ > -boot strict=on \ > --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ > --device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\ > +-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 virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\ > id=virtio-disk0,bootindex=1 \ > -fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \ > -device virtio-9p-ccw,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,\ > diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args > index bdc060aa..20288f2a 100644 > --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args > +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args > @@ -29,12 +29,18 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ > -no-shutdown \ > -boot strict=on \ > -device virtio-scsi-ccw,iothread=iothread2,id=scsi0,devno=fe.0.0001 \ > --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ > +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ > +"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ > +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\ > +"file":"libvirt-2-storage"}' \ > -device virtio-blk-ccw,iothread=iothread1,scsi=off,devno=fe.0.0000,\ > -drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ > --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-2-0 \ > +drive=libvirt-2-format,id=virtio-disk0,bootindex=1 \ > +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2",\ > +"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 scsi-hd,bus=scsi0.0,channel=0,scsi-id=2,lun=0,\ > -device_id=drive-scsi0-0-2-0,drive=drive-scsi0-0-2-0,id=scsi0-0-2-0 \ > +device_id=drive-scsi0-0-2-0,drive=libvirt-1-format,id=scsi0-0-2-0 \ > -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \ > -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ > resourcecontrol=deny \ > diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args > index 03860194..35093d4f 100644 > --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args > +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args > @@ -13,9 +13,11 @@ QEMU_AUDIO_DRV=none \ > -object secret,id=masterKey0,format=raw,\ > file=/tmp/lib/domain--1-test/master-key.aes \ > -machine s390-ccw-virtio-4.2,accel=kvm,usb=off,dump-guest-core=off \ > --cpu z13.2-base,aen=on,aefsi=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,\ > -sthyi=on,edat=on,ri=on,edat2=on,vx=on,ipter=on,ap=on,esop=on,apft=on,apqci=on,\ > -cte=on,bpb=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \ > +-cpu gen15a-base,aen=on,cmmnt=on,vxpdeh=on,aefsi=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,mepochptff=on,ap=on,\ > +vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,iep=on,\ > +apqci=on,cte=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \ > -m 256 \ > -overcommit mem-lock=off \ > -smp 1,sockets=1,cores=1,threads=1 \ > diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args > index 8f72b20b..5850b265 100644 > --- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args > +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args > @@ -26,9 +26,11 @@ file=/tmp/lib/domain--1-guest/master-key.aes \ > -no-shutdown \ > -boot strict=on \ > -device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0003 \ > --drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\ > -id=drive-virtio-disk0 \ > --device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\ > +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2",\ > +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ > +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\ > +"file":"libvirt-1-storage"}' \ > +-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\ > id=virtio-disk0,bootindex=1 \ > -netdev user,id=hostnet0 \ > -device virtio-net-ccw,netdev=hostnet0,id=net0,mac=52:54:00:09:1a:29,\ > diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args > index 95caf9e9..211cc24b 100644 > --- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args > +++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args > @@ -27,9 +27,11 @@ file=/tmp/lib/domain--1-guest/master-key.aes \ > -no-shutdown \ > -boot strict=on \ > -device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0002 \ > --drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\ > -id=drive-virtio-disk0 \ > --device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\ > +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2",\ > +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ > +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\ > +"file":"libvirt-1-storage"}' \ > +-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\ > id=virtio-disk0,bootindex=1 \ > -netdev user,id=hostnet0 \ > -device virtio-net-ccw,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,\ > diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args > index 17b5ded6..4c5542d8 100644 > --- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args > +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args > @@ -26,8 +26,11 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ > -rtc base=utc \ > -no-shutdown \ > -boot strict=on \ > --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ > --device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\ > +-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 virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\ > id=virtio-disk0,bootindex=1 \ > -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \ > -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ > diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args > index 81a6b8cb..de229bd0 100644 > --- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args > +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args > @@ -26,8 +26,11 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ > -rtc base=utc \ > -no-shutdown \ > -boot strict=on \ > --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ > --device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\ > +-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 virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\ > id=virtio-disk0,bootindex=1 \ > -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \ > -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ >
