• Subject: [libvirt] [PATCH] tests: Update caps for QEMU 2.12.0 on s390x
  • Author: Shalini Chellathurai Saroja
  • Date: May 15, 2018, 11:46 a.m.
  • Patches: 1 / 1
Changeset
tests/domaincapsschemadata/qemu_2.12.0.s390x.xml   |   99 +-
.../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 5001 +++++++++++---------
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   |  113 +-
3 files changed, 2974 insertions(+), 2239 deletions(-)
Git apply log
Switched to a new branch '20180515114644.38522-1-shalini@linux.vnet.ibm.com'
Applying: tests: Update caps for QEMU 2.12.0 on s390x
Using index info to reconstruct a base tree...
M	tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
Falling back to patching base and 3-way merge...
Auto-merging tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
CONFLICT (content): Merge conflict in tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
error: Failed to merge in the changes.
Patch failed at 0001 tests: Update caps for QEMU 2.12.0 on s390x
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Failed to apply patch:
[libvirt] [PATCH] tests: Update caps for QEMU 2.12.0 on s390x
Test passed: syntax-check

loading

[libvirt] [PATCH] tests: Update caps for QEMU 2.12.0 on s390x
Posted by Shalini Chellathurai Saroja, 1 week ago
Let us update the existing xml and replies files for QEMU 2.12.0 on
s390x.

Signed-off-by: Shalini Chellathurai Saroja <shalini@linux.vnet.ibm.com>
---
 tests/domaincapsschemadata/qemu_2.12.0.s390x.xml   |   99 +-
 .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 5001 +++++++++++---------
 tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   |  113 +-
 3 files changed, 2974 insertions(+), 2239 deletions(-)

diff --git a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
index 4bacb879fe..1475451e68 100644
--- a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
+++ b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
@@ -22,8 +22,103 @@
   </os>
   <cpu>
     <mode name='host-passthrough' supported='yes'/>
-    <mode name='host-model' supported='no'/>
-    <mode name='custom' supported='no'/>
+    <mode name='host-model' supported='yes'>
+      <model fallback='forbid'>z14-base</model>
+      <feature policy='require' name='aen'/>
+      <feature policy='require' name='aefsi'/>
+      <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='ri'/>
+      <feature policy='require' name='edat2'/>
+      <feature policy='require' name='vx'/>
+      <feature policy='require' name='ipter'/>
+      <feature policy='require' name='vxeh'/>
+      <feature policy='require' name='vxpd'/>
+      <feature policy='require' name='esop'/>
+      <feature policy='require' name='iep'/>
+      <feature policy='require' name='cte'/>
+      <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'/>
+      <feature policy='require' name='cmm'/>
+    </mode>
+    <mode name='custom' supported='yes'>
+      <model usable='yes'>z890.2</model>
+      <model usable='yes'>z990.4</model>
+      <model usable='yes'>z10BC.2</model>
+      <model usable='yes'>z196.2</model>
+      <model usable='yes'>z14</model>
+      <model usable='yes'>z9BC-base</model>
+      <model usable='yes'>zEC12-base</model>
+      <model usable='yes'>z196-base</model>
+      <model usable='yes'>z13-base</model>
+      <model usable='yes'>z990.3</model>
+      <model usable='yes'>z9EC</model>
+      <model usable='yes'>zBC12</model>
+      <model usable='yes'>z9EC.3</model>
+      <model usable='yes'>z196.2-base</model>
+      <model usable='no'>qemu</model>
+      <model usable='yes'>zEC12.2-base</model>
+      <model usable='yes'>z800-base</model>
+      <model usable='yes'>z9EC.2</model>
+      <model usable='yes'>z900.2-base</model>
+      <model usable='yes'>z900.3</model>
+      <model usable='yes'>z890-base</model>
+      <model usable='yes'>z890</model>
+      <model usable='yes'>z990.4-base</model>
+      <model usable='yes'>z10BC.2-base</model>
+      <model usable='yes'>z900.2</model>
+      <model usable='yes'>z9BC.2-base</model>
+      <model usable='yes'>z800</model>
+      <model usable='yes'>z114</model>
+      <model usable='yes'>z13</model>
+      <model usable='yes'>z13s-base</model>
+      <model usable='yes'>z990</model>
+      <model usable='yes'>z990.2</model>
+      <model usable='yes'>z14-base</model>
+      <model usable='yes'>z890.2-base</model>
+      <model usable='yes'>z196</model>
+      <model usable='yes'>z10EC</model>
+      <model usable='yes'>z13s</model>
+      <model usable='yes'>z900</model>
+      <model usable='yes'>z10EC.3</model>
+      <model usable='yes'>z10EC.2-base</model>
+      <model usable='yes'>z114-base</model>
+      <model usable='yes'>z990.2-base</model>
+      <model usable='yes'>z9EC.2-base</model>
+      <model usable='yes'>z890.3</model>
+      <model usable='yes'>z900.3-base</model>
+      <model usable='yes'>z9BC.2</model>
+      <model usable='yes'>z10BC</model>
+      <model usable='yes'>z990.5</model>
+      <model usable='yes'>zEC12.2</model>
+      <model usable='yes'>z10EC-base</model>
+      <model usable='yes'>z9EC-base</model>
+      <model usable='yes'>z9EC.3-base</model>
+      <model usable='yes'>zEC12</model>
+      <model usable='yes'>z990.5-base</model>
+      <model usable='yes'>z10BC-base</model>
+      <model usable='yes'>z900-base</model>
+      <model usable='yes'>z13.2</model>
+      <model usable='yes'>z890.3-base</model>
+      <model usable='yes'>zBC12-base</model>
+      <model usable='yes'>z13.2-base</model>
+      <model usable='yes'>z990-base</model>
+      <model usable='yes'>z10EC.2</model>
+      <model usable='yes'>z9BC</model>
+      <model usable='yes'>z10EC.3-base</model>
+      <model usable='yes'>z990.3-base</model>
+    </mode>
   </cpu>
   <devices>
     <disk supported='yes'>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
index a93e5984c6..29c3403550 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
@@ -2,14 +2,13 @@
   "QMP": {
     "version": {
       "qemu": {
-        "micro": 90,
-        "minor": 11,
+        "micro": 0,
+        "minor": 12,
         "major": 2
       },
-      "package": "v2.12.0-rc0"
+      "package": ""
     },
     "capabilities": [
-      "oob"
     ]
   }
 }
@@ -23,11 +22,11 @@
 {
   "return": {
     "qemu": {
-      "micro": 90,
-      "minor": 11,
+      "micro": 0,
+      "minor": 12,
       "major": 2
     },
-    "package": "v2.12.0-rc0"
+    "package": ""
   },
   "id": "libvirt-2"
 }
@@ -530,7 +529,7 @@
 
 {
   "return": {
-    "fd": 17,
+    "fd": 18,
     "fdset-id": 0
   },
   "id": "libvirt-5"
@@ -546,7 +545,7 @@
 
 {
   "return": {
-    "enabled": false,
+    "enabled": true,
     "present": true
   },
   "id": "libvirt-7"
@@ -1241,10 +1240,6 @@
       "name": "fw_cfg_io",
       "parent": "fw_cfg"
     },
-    {
-      "name": "chardev-file",
-      "parent": "chardev-fd"
-    },
     {
       "name": "s390-ccw-virtio-2.10-machine",
       "parent": "s390-ccw-machine"
@@ -1258,8 +1253,8 @@
       "parent": "s390x-cpu"
     },
     {
-      "name": "chardev-braille",
-      "parent": "chardev"
+      "name": "chardev-file",
+      "parent": "chardev-fd"
     },
     {
       "name": "chardev-wctablet",
@@ -2904,102 +2899,93 @@
 {
   "return": [
     {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "port_index",
+      "name": "min_io_size",
       "type": "uint16"
     },
     {
-      "name": "dpofua",
+      "name": "removable",
       "description": "on/off",
       "type": "bool"
     },
     {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "logical_block_size",
-      "description": "A power of two between 512 and 32768",
-      "type": "uint16"
+      "name": "channel",
+      "type": "uint32"
     },
     {
-      "name": "discard_granularity",
-      "type": "uint32"
+      "name": "serial",
+      "type": "str"
     },
     {
       "name": "lun",
       "type": "uint32"
     },
     {
-      "name": "max_unmap_size",
-      "type": "uint64"
+      "name": "dpofua",
+      "description": "on/off",
+      "type": "bool"
     },
     {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
+      "name": "ver",
       "type": "str"
     },
     {
-      "name": "port_wwn",
-      "type": "uint64"
-    },
-    {
-      "name": "write-cache",
-      "description": "on/off/auto",
-      "type": "OnOffAuto"
-    },
-    {
-      "name": "share-rw",
-      "type": "bool"
-    },
-    {
-      "name": "opt_io_size",
+      "name": "scsi-id",
       "type": "uint32"
     },
     {
-      "name": "min_io_size",
+      "name": "logical_block_size",
+      "description": "A power of two between 512 and 32768",
       "type": "uint16"
     },
     {
-      "name": "product",
+      "name": "drive",
+      "description": "Node name or ID of a block device to use as a backend",
       "type": "str"
     },
     {
-      "name": "scsi-id",
-      "type": "uint32"
+      "name": "scsi_version",
+      "type": "int32"
     },
     {
-      "name": "channel",
+      "name": "werror",
+      "description": "Error handling policy, report/ignore/enospc/stop/auto",
+      "type": "BlockdevOnError"
+    },
+    {
+      "name": "discard_granularity",
       "type": "uint32"
     },
     {
-      "name": "vendor",
-      "type": "str"
+      "name": "port_wwn",
+      "type": "uint64"
     },
     {
-      "name": "wwn",
+      "name": "max_unmap_size",
       "type": "uint64"
     },
     {
-      "name": "werror",
+      "name": "rerror",
       "description": "Error handling policy, report/ignore/enospc/stop/auto",
       "type": "BlockdevOnError"
     },
     {
-      "name": "removable",
-      "description": "on/off",
+      "name": "max_io_size",
+      "type": "uint64"
+    },
+    {
+      "name": "wwn",
+      "type": "uint64"
+    },
+    {
+      "name": "share-rw",
       "type": "bool"
     },
     {
-      "name": "rerror",
-      "description": "Error handling policy, report/ignore/enospc/stop/auto",
-      "type": "BlockdevOnError"
+      "name": "product",
+      "type": "str"
     },
     {
-      "name": "ver",
+      "name": "vendor",
       "type": "str"
     },
     {
@@ -3008,8 +2994,21 @@
       "type": "uint16"
     },
     {
-      "name": "max_io_size",
-      "type": "uint64"
+      "name": "port_index",
+      "type": "uint16"
+    },
+    {
+      "name": "bootindex",
+      "type": "int32"
+    },
+    {
+      "name": "write-cache",
+      "description": "on/off/auto",
+      "type": "OnOffAuto"
+    },
+    {
+      "name": "opt_io_size",
+      "type": "uint32"
     }
   ],
   "id": "libvirt-20"
@@ -3747,18 +3746,6 @@
       "name": "z890.2",
       "typename": "z890.2-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "hfpm"
       ],
       "static": false,
       "migration-safe": true
@@ -3767,18 +3754,6 @@
       "name": "z990.4",
       "typename": "z990.4-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "hfpm"
       ],
       "static": false,
       "migration-safe": true
@@ -3787,32 +3762,6 @@
       "name": "z10BC.2",
       "typename": "z10BC.2-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "sthyi",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "csske",
-        "edat",
-        "asnlxr",
-        "msa2",
-        "msa1",
-        "tods"
       ],
       "static": false,
       "migration-safe": true
@@ -3821,122 +3770,6 @@
       "name": "z196.2",
       "typename": "z196.2-s390x-cpu",
       "unavailable-features": [
-        "pcc-xts-eaes-256",
-        "pcc-xts-eaes-128",
-        "pcc-xts-aes-256",
-        "pcc-xts-aes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-eaes-192",
-        "pcc-cmac-eaes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-aes-192",
-        "pcc-cmac-aes-128",
-        "pcc-cmac-etdea-192",
-        "pcc-cmac-etdea-128",
-        "pcc-cmac-edea",
-        "pcc-cmac-tdea-192",
-        "pcc-cmac-tdea-128",
-        "pcc-cmac-dea",
-        "kmo-eaes-256",
-        "kmo-eaes-192",
-        "kmo-eaes-128",
-        "kmo-aes-256",
-        "kmo-aes-192",
-        "kmo-aes-128",
-        "kmo-etdea-192",
-        "kmo-etdea-128",
-        "kmo-edea",
-        "kmo-tdea-192",
-        "kmo-tdea-128",
-        "kmo-dea",
-        "kmf-eaes-256",
-        "kmf-eaes-192",
-        "kmf-eaes-128",
-        "kmf-aes-256",
-        "kmf-aes-192",
-        "kmf-aes-128",
-        "kmf-etdea-192",
-        "kmf-etdea-128",
-        "kmf-edea",
-        "kmf-tdea-192",
-        "kmf-tdea-128",
-        "kmf-dea",
-        "kmctr-eaes-256",
-        "kmctr-eaes-192",
-        "kmctr-eaes-128",
-        "kmctr-aes-256",
-        "kmctr-aes-192",
-        "kmctr-aes-128",
-        "kmctr-etdea-192",
-        "kmctr-etdea-128",
-        "kmctr-edea",
-        "kmctr-tdea-192",
-        "kmctr-tdea-128",
-        "kmctr-dea",
-        "pckmo-aes-256",
-        "pckmo-aes-192",
-        "pckmo-aes-128",
-        "pckmo-etdea-192",
-        "pckmo-etdea-128",
-        "pckmo-edea",
-        "klmd-sha-1",
-        "kimd-ghash",
-        "kimd-sha-1",
-        "km-xts-eaes-256",
-        "km-xts-eaes-128",
-        "km-xts-aes-256",
-        "km-xts-aes-128",
-        "km-eaes-256",
-        "km-eaes-192",
-        "km-eaes-128",
-        "km-etdea-192",
-        "km-etdea-128",
-        "km-edea",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-eaes-256",
-        "kmc-eaes-192",
-        "kmc-eaes-128",
-        "kmc-etdea-192",
-        "kmc-etdea-128",
-        "kmc-edea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-eaes-256",
-        "kmac-eaes-192",
-        "kmac-eaes-128",
-        "kmac-aes-256",
-        "kmac-aes-192",
-        "kmac-aes-128",
-        "kmac-etdea-192",
-        "kmac-etdea-128",
-        "kmac-edea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "aefsi",
-        "sthyi",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "ipter",
-        "csske",
-        "edat",
-        "asnlxr",
-        "msa2",
-        "msa1",
-        "tods"
       ],
       "static": false,
       "migration-safe": true
@@ -3945,152 +3778,6 @@
       "name": "z14",
       "typename": "z14-s390x-cpu",
       "unavailable-features": [
-        "kma-gcm-eaes-256",
-        "kma-gcm-eaes-192",
-        "kma-gcm-eaes-128",
-        "kma-gcm-aes-256",
-        "kma-gcm-aes-192",
-        "kma-gcm-aes-128",
-        "ppno-sha-512-drng",
-        "pcc-xts-eaes-256",
-        "pcc-xts-eaes-128",
-        "pcc-xts-aes-256",
-        "pcc-xts-aes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-eaes-192",
-        "pcc-cmac-eaes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-aes-192",
-        "pcc-cmac-aes-128",
-        "pcc-cmac-etdea-192",
-        "pcc-cmac-etdea-128",
-        "pcc-cmac-edea",
-        "pcc-cmac-tdea-192",
-        "pcc-cmac-tdea-128",
-        "pcc-cmac-dea",
-        "kmo-eaes-256",
-        "kmo-eaes-192",
-        "kmo-eaes-128",
-        "kmo-aes-256",
-        "kmo-aes-192",
-        "kmo-aes-128",
-        "kmo-etdea-192",
-        "kmo-etdea-128",
-        "kmo-edea",
-        "kmo-tdea-192",
-        "kmo-tdea-128",
-        "kmo-dea",
-        "kmf-eaes-256",
-        "kmf-eaes-192",
-        "kmf-eaes-128",
-        "kmf-aes-256",
-        "kmf-aes-192",
-        "kmf-aes-128",
-        "kmf-etdea-192",
-        "kmf-etdea-128",
-        "kmf-edea",
-        "kmf-tdea-192",
-        "kmf-tdea-128",
-        "kmf-dea",
-        "kmctr-eaes-256",
-        "kmctr-eaes-192",
-        "kmctr-eaes-128",
-        "kmctr-aes-256",
-        "kmctr-aes-192",
-        "kmctr-aes-128",
-        "kmctr-etdea-192",
-        "kmctr-etdea-128",
-        "kmctr-edea",
-        "kmctr-tdea-192",
-        "kmctr-tdea-128",
-        "kmctr-dea",
-        "pckmo-aes-256",
-        "pckmo-aes-192",
-        "pckmo-aes-128",
-        "pckmo-etdea-192",
-        "pckmo-etdea-128",
-        "pckmo-edea",
-        "klmd-sha-1",
-        "kimd-ghash",
-        "kimd-sha-1",
-        "km-xts-eaes-256",
-        "km-xts-eaes-128",
-        "km-xts-aes-256",
-        "km-xts-aes-128",
-        "km-eaes-256",
-        "km-eaes-192",
-        "km-eaes-128",
-        "km-etdea-192",
-        "km-etdea-128",
-        "km-edea",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-eaes-256",
-        "kmc-eaes-192",
-        "kmc-eaes-128",
-        "kmc-etdea-192",
-        "kmc-etdea-128",
-        "kmc-edea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-eaes-256",
-        "kmac-eaes-192",
-        "kmac-eaes-128",
-        "kmac-aes-256",
-        "kmac-aes-192",
-        "kmac-aes-128",
-        "kmac-etdea-192",
-        "kmac-etdea-128",
-        "kmac-edea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "esop",
-        "msa8-base",
-        "vxeh",
-        "vxpd",
-        "gs",
-        "sea_esop2",
-        "iep",
-        "vx",
-        "dfppc",
-        "edat2",
-        "aefsi",
-        "sthyi",
-        "te",
-        "ri",
-        "tsi",
-        "sema",
-        "minste2",
-        "eec",
-        "cte",
-        "dfpzc",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "opc",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "ipter",
-        "csske",
-        "edat",
-        "asnlxr",
-        "msa7",
-        "msa6",
-        "msa2",
-        "msa1",
-        "gen13ptff",
-        "tods",
-        "type"
       ],
       "static": false,
       "migration-safe": true
@@ -4099,22 +3786,6 @@
       "name": "z9BC-base",
       "typename": "z9BC-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "hfpue",
-        "hfpm",
-        "asnlxr",
-        "tods"
       ],
       "static": true,
       "migration-safe": true
@@ -4123,32 +3794,6 @@
       "name": "zEC12-base",
       "typename": "zEC12-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "dfpzc",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "csske",
-        "asnlxr",
-        "tods"
       ],
       "static": true,
       "migration-safe": true
@@ -4157,31 +3802,6 @@
       "name": "z196-base",
       "typename": "z196-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "csske",
-        "asnlxr",
-        "tods"
       ],
       "static": true,
       "migration-safe": true
@@ -4190,35 +3810,6 @@
       "name": "z13-base",
       "typename": "z13-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "dfppc",
-        "dfpzc",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "csske",
-        "asnlxr",
-        "gen13ptff",
-        "tods",
-        "type"
       ],
       "static": true,
       "migration-safe": true
@@ -4227,18 +3818,6 @@
       "name": "z990.3",
       "typename": "z990.3-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "hfpm"
       ],
       "static": false,
       "migration-safe": true
@@ -4246,6 +3825,8 @@
     {
       "name": "host",
       "typename": "host-s390x-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": false
     },
@@ -4253,25 +3834,6 @@
       "name": "z9EC",
       "typename": "z9EC-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "sthyi",
-        "hfpue",
-        "hfpm",
-        "asnlxr",
-        "msa1",
-        "tods"
       ],
       "static": false,
       "migration-safe": true
@@ -4280,129 +3842,6 @@
       "name": "zBC12",
       "typename": "zBC12-s390x-cpu",
       "unavailable-features": [
-        "pcc-xts-eaes-256",
-        "pcc-xts-eaes-128",
-        "pcc-xts-aes-256",
-        "pcc-xts-aes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-eaes-192",
-        "pcc-cmac-eaes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-aes-192",
-        "pcc-cmac-aes-128",
-        "pcc-cmac-etdea-192",
-        "pcc-cmac-etdea-128",
-        "pcc-cmac-edea",
-        "pcc-cmac-tdea-192",
-        "pcc-cmac-tdea-128",
-        "pcc-cmac-dea",
-        "kmo-eaes-256",
-        "kmo-eaes-192",
-        "kmo-eaes-128",
-        "kmo-aes-256",
-        "kmo-aes-192",
-        "kmo-aes-128",
-        "kmo-etdea-192",
-        "kmo-etdea-128",
-        "kmo-edea",
-        "kmo-tdea-192",
-        "kmo-tdea-128",
-        "kmo-dea",
-        "kmf-eaes-256",
-        "kmf-eaes-192",
-        "kmf-eaes-128",
-        "kmf-aes-256",
-        "kmf-aes-192",
-        "kmf-aes-128",
-        "kmf-etdea-192",
-        "kmf-etdea-128",
-        "kmf-edea",
-        "kmf-tdea-192",
-        "kmf-tdea-128",
-        "kmf-dea",
-        "kmctr-eaes-256",
-        "kmctr-eaes-192",
-        "kmctr-eaes-128",
-        "kmctr-aes-256",
-        "kmctr-aes-192",
-        "kmctr-aes-128",
-        "kmctr-etdea-192",
-        "kmctr-etdea-128",
-        "kmctr-edea",
-        "kmctr-tdea-192",
-        "kmctr-tdea-128",
-        "kmctr-dea",
-        "pckmo-aes-256",
-        "pckmo-aes-192",
-        "pckmo-aes-128",
-        "pckmo-etdea-192",
-        "pckmo-etdea-128",
-        "pckmo-edea",
-        "klmd-sha-1",
-        "kimd-ghash",
-        "kimd-sha-1",
-        "km-xts-eaes-256",
-        "km-xts-eaes-128",
-        "km-xts-aes-256",
-        "km-xts-aes-128",
-        "km-eaes-256",
-        "km-eaes-192",
-        "km-eaes-128",
-        "km-etdea-192",
-        "km-etdea-128",
-        "km-edea",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-eaes-256",
-        "kmc-eaes-192",
-        "kmc-eaes-128",
-        "kmc-etdea-192",
-        "kmc-etdea-128",
-        "kmc-edea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-eaes-256",
-        "kmac-eaes-192",
-        "kmac-eaes-128",
-        "kmac-aes-256",
-        "kmac-aes-192",
-        "kmac-aes-128",
-        "kmac-etdea-192",
-        "kmac-etdea-128",
-        "kmac-edea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "esop",
-        "sea_esop2",
-        "edat2",
-        "aefsi",
-        "sthyi",
-        "te",
-        "ri",
-        "cte",
-        "dfpzc",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "ipter",
-        "csske",
-        "edat",
-        "asnlxr",
-        "msa2",
-        "msa1",
-        "tods"
       ],
       "static": false,
       "migration-safe": true
@@ -4411,25 +3850,6 @@
       "name": "z9EC.3",
       "typename": "z9EC.3-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "sthyi",
-        "hfpue",
-        "hfpm",
-        "asnlxr",
-        "msa1",
-        "tods"
       ],
       "static": false,
       "migration-safe": true
@@ -4438,31 +3858,6 @@
       "name": "z196.2-base",
       "typename": "z196.2-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "csske",
-        "asnlxr",
-        "tods"
       ],
       "static": true,
       "migration-safe": true
@@ -4471,6 +3866,7 @@
       "name": "qemu",
       "typename": "qemu-s390x-cpu",
       "unavailable-features": [
+        "ais"
       ],
       "static": false,
       "migration-safe": true
@@ -4479,32 +3875,6 @@
       "name": "zEC12.2-base",
       "typename": "zEC12.2-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "dfpzc",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "csske",
-        "asnlxr",
-        "tods"
       ],
       "static": true,
       "migration-safe": true
@@ -4521,25 +3891,6 @@
       "name": "z9EC.2",
       "typename": "z9EC.2-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "sthyi",
-        "hfpue",
-        "hfpm",
-        "asnlxr",
-        "msa1",
-        "tods"
       ],
       "static": false,
       "migration-safe": true
@@ -4564,18 +3915,6 @@
       "name": "z890-base",
       "typename": "z890-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "hfpm"
       ],
       "static": true,
       "migration-safe": true
@@ -4584,18 +3923,6 @@
       "name": "z890",
       "typename": "z890-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "hfpm"
       ],
       "static": false,
       "migration-safe": true
@@ -4604,18 +3931,6 @@
       "name": "z990.4-base",
       "typename": "z990.4-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "hfpm"
       ],
       "static": true,
       "migration-safe": true
@@ -4624,27 +3939,6 @@
       "name": "z10BC.2-base",
       "typename": "z10BC.2-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "csske",
-        "asnlxr",
-        "tods"
       ],
       "static": true,
       "migration-safe": true
@@ -4661,22 +3955,6 @@
       "name": "z9BC.2-base",
       "typename": "z9BC.2-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "hfpue",
-        "hfpm",
-        "asnlxr",
-        "tods"
       ],
       "static": true,
       "migration-safe": true
@@ -4693,122 +3971,6 @@
       "name": "z114",
       "typename": "z114-s390x-cpu",
       "unavailable-features": [
-        "pcc-xts-eaes-256",
-        "pcc-xts-eaes-128",
-        "pcc-xts-aes-256",
-        "pcc-xts-aes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-eaes-192",
-        "pcc-cmac-eaes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-aes-192",
-        "pcc-cmac-aes-128",
-        "pcc-cmac-etdea-192",
-        "pcc-cmac-etdea-128",
-        "pcc-cmac-edea",
-        "pcc-cmac-tdea-192",
-        "pcc-cmac-tdea-128",
-        "pcc-cmac-dea",
-        "kmo-eaes-256",
-        "kmo-eaes-192",
-        "kmo-eaes-128",
-        "kmo-aes-256",
-        "kmo-aes-192",
-        "kmo-aes-128",
-        "kmo-etdea-192",
-        "kmo-etdea-128",
-        "kmo-edea",
-        "kmo-tdea-192",
-        "kmo-tdea-128",
-        "kmo-dea",
-        "kmf-eaes-256",
-        "kmf-eaes-192",
-        "kmf-eaes-128",
-        "kmf-aes-256",
-        "kmf-aes-192",
-        "kmf-aes-128",
-        "kmf-etdea-192",
-        "kmf-etdea-128",
-        "kmf-edea",
-        "kmf-tdea-192",
-        "kmf-tdea-128",
-        "kmf-dea",
-        "kmctr-eaes-256",
-        "kmctr-eaes-192",
-        "kmctr-eaes-128",
-        "kmctr-aes-256",
-        "kmctr-aes-192",
-        "kmctr-aes-128",
-        "kmctr-etdea-192",
-        "kmctr-etdea-128",
-        "kmctr-edea",
-        "kmctr-tdea-192",
-        "kmctr-tdea-128",
-        "kmctr-dea",
-        "pckmo-aes-256",
-        "pckmo-aes-192",
-        "pckmo-aes-128",
-        "pckmo-etdea-192",
-        "pckmo-etdea-128",
-        "pckmo-edea",
-        "klmd-sha-1",
-        "kimd-ghash",
-        "kimd-sha-1",
-        "km-xts-eaes-256",
-        "km-xts-eaes-128",
-        "km-xts-aes-256",
-        "km-xts-aes-128",
-        "km-eaes-256",
-        "km-eaes-192",
-        "km-eaes-128",
-        "km-etdea-192",
-        "km-etdea-128",
-        "km-edea",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-eaes-256",
-        "kmc-eaes-192",
-        "kmc-eaes-128",
-        "kmc-etdea-192",
-        "kmc-etdea-128",
-        "kmc-edea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-eaes-256",
-        "kmac-eaes-192",
-        "kmac-eaes-128",
-        "kmac-aes-256",
-        "kmac-aes-192",
-        "kmac-aes-128",
-        "kmac-etdea-192",
-        "kmac-etdea-128",
-        "kmac-edea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "aefsi",
-        "sthyi",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "ipter",
-        "csske",
-        "edat",
-        "asnlxr",
-        "msa2",
-        "msa1",
-        "tods"
       ],
       "static": false,
       "migration-safe": true
@@ -4817,134 +3979,6 @@
       "name": "z13",
       "typename": "z13-s390x-cpu",
       "unavailable-features": [
-        "ppno-sha-512-drng",
-        "pcc-xts-eaes-256",
-        "pcc-xts-eaes-128",
-        "pcc-xts-aes-256",
-        "pcc-xts-aes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-eaes-192",
-        "pcc-cmac-eaes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-aes-192",
-        "pcc-cmac-aes-128",
-        "pcc-cmac-etdea-192",
-        "pcc-cmac-etdea-128",
-        "pcc-cmac-edea",
-        "pcc-cmac-tdea-192",
-        "pcc-cmac-tdea-128",
-        "pcc-cmac-dea",
-        "kmo-eaes-256",
-        "kmo-eaes-192",
-        "kmo-eaes-128",
-        "kmo-aes-256",
-        "kmo-aes-192",
-        "kmo-aes-128",
-        "kmo-etdea-192",
-        "kmo-etdea-128",
-        "kmo-edea",
-        "kmo-tdea-192",
-        "kmo-tdea-128",
-        "kmo-dea",
-        "kmf-eaes-256",
-        "kmf-eaes-192",
-        "kmf-eaes-128",
-        "kmf-aes-256",
-        "kmf-aes-192",
-        "kmf-aes-128",
-        "kmf-etdea-192",
-        "kmf-etdea-128",
-        "kmf-edea",
-        "kmf-tdea-192",
-        "kmf-tdea-128",
-        "kmf-dea",
-        "kmctr-eaes-256",
-        "kmctr-eaes-192",
-        "kmctr-eaes-128",
-        "kmctr-aes-256",
-        "kmctr-aes-192",
-        "kmctr-aes-128",
-        "kmctr-etdea-192",
-        "kmctr-etdea-128",
-        "kmctr-edea",
-        "kmctr-tdea-192",
-        "kmctr-tdea-128",
-        "kmctr-dea",
-        "pckmo-aes-256",
-        "pckmo-aes-192",
-        "pckmo-aes-128",
-        "pckmo-etdea-192",
-        "pckmo-etdea-128",
-        "pckmo-edea",
-        "klmd-sha-1",
-        "kimd-ghash",
-        "kimd-sha-1",
-        "km-xts-eaes-256",
-        "km-xts-eaes-128",
-        "km-xts-aes-256",
-        "km-xts-aes-128",
-        "km-eaes-256",
-        "km-eaes-192",
-        "km-eaes-128",
-        "km-etdea-192",
-        "km-etdea-128",
-        "km-edea",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-eaes-256",
-        "kmc-eaes-192",
-        "kmc-eaes-128",
-        "kmc-etdea-192",
-        "kmc-etdea-128",
-        "kmc-edea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-eaes-256",
-        "kmac-eaes-192",
-        "kmac-eaes-128",
-        "kmac-aes-256",
-        "kmac-aes-192",
-        "kmac-aes-128",
-        "kmac-etdea-192",
-        "kmac-etdea-128",
-        "kmac-edea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "esop",
-        "sea_esop2",
-        "vx",
-        "dfppc",
-        "edat2",
-        "aefsi",
-        "sthyi",
-        "te",
-        "ri",
-        "cte",
-        "dfpzc",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "ipter",
-        "csske",
-        "edat",
-        "asnlxr",
-        "msa2",
-        "msa1",
-        "gen13ptff",
-        "tods",
-        "type"
       ],
       "static": false,
       "migration-safe": true
@@ -4953,35 +3987,6 @@
       "name": "z13s-base",
       "typename": "z13s-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "dfppc",
-        "dfpzc",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "csske",
-        "asnlxr",
-        "gen13ptff",
-        "tods",
-        "type"
       ],
       "static": true,
       "migration-safe": true
@@ -4990,18 +3995,6 @@
       "name": "z990",
       "typename": "z990-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "hfpm"
       ],
       "static": false,
       "migration-safe": true
@@ -5010,18 +4003,6 @@
       "name": "z990.2",
       "typename": "z990.2-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "hfpm"
       ],
       "static": false,
       "migration-safe": true
@@ -5030,40 +4011,6 @@
       "name": "z14-base",
       "typename": "z14-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "dfppc",
-        "tsi",
-        "sema",
-        "minste2",
-        "eec",
-        "dfpzc",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "opc",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "csske",
-        "asnlxr",
-        "gen13ptff",
-        "tods",
-        "type"
       ],
       "static": true,
       "migration-safe": true
@@ -5072,18 +4019,6 @@
       "name": "z890.2-base",
       "typename": "z890.2-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "hfpm"
       ],
       "static": true,
       "migration-safe": true
@@ -5092,122 +4027,6 @@
       "name": "z196",
       "typename": "z196-s390x-cpu",
       "unavailable-features": [
-        "pcc-xts-eaes-256",
-        "pcc-xts-eaes-128",
-        "pcc-xts-aes-256",
-        "pcc-xts-aes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-eaes-192",
-        "pcc-cmac-eaes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-aes-192",
-        "pcc-cmac-aes-128",
-        "pcc-cmac-etdea-192",
-        "pcc-cmac-etdea-128",
-        "pcc-cmac-edea",
-        "pcc-cmac-tdea-192",
-        "pcc-cmac-tdea-128",
-        "pcc-cmac-dea",
-        "kmo-eaes-256",
-        "kmo-eaes-192",
-        "kmo-eaes-128",
-        "kmo-aes-256",
-        "kmo-aes-192",
-        "kmo-aes-128",
-        "kmo-etdea-192",
-        "kmo-etdea-128",
-        "kmo-edea",
-        "kmo-tdea-192",
-        "kmo-tdea-128",
-        "kmo-dea",
-        "kmf-eaes-256",
-        "kmf-eaes-192",
-        "kmf-eaes-128",
-        "kmf-aes-256",
-        "kmf-aes-192",
-        "kmf-aes-128",
-        "kmf-etdea-192",
-        "kmf-etdea-128",
-        "kmf-edea",
-        "kmf-tdea-192",
-        "kmf-tdea-128",
-        "kmf-dea",
-        "kmctr-eaes-256",
-        "kmctr-eaes-192",
-        "kmctr-eaes-128",
-        "kmctr-aes-256",
-        "kmctr-aes-192",
-        "kmctr-aes-128",
-        "kmctr-etdea-192",
-        "kmctr-etdea-128",
-        "kmctr-edea",
-        "kmctr-tdea-192",
-        "kmctr-tdea-128",
-        "kmctr-dea",
-        "pckmo-aes-256",
-        "pckmo-aes-192",
-        "pckmo-aes-128",
-        "pckmo-etdea-192",
-        "pckmo-etdea-128",
-        "pckmo-edea",
-        "klmd-sha-1",
-        "kimd-ghash",
-        "kimd-sha-1",
-        "km-xts-eaes-256",
-        "km-xts-eaes-128",
-        "km-xts-aes-256",
-        "km-xts-aes-128",
-        "km-eaes-256",
-        "km-eaes-192",
-        "km-eaes-128",
-        "km-etdea-192",
-        "km-etdea-128",
-        "km-edea",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-eaes-256",
-        "kmc-eaes-192",
-        "kmc-eaes-128",
-        "kmc-etdea-192",
-        "kmc-etdea-128",
-        "kmc-edea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-eaes-256",
-        "kmac-eaes-192",
-        "kmac-eaes-128",
-        "kmac-aes-256",
-        "kmac-aes-192",
-        "kmac-aes-128",
-        "kmac-etdea-192",
-        "kmac-etdea-128",
-        "kmac-edea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "aefsi",
-        "sthyi",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "ipter",
-        "csske",
-        "edat",
-        "asnlxr",
-        "msa2",
-        "msa1",
-        "tods"
       ],
       "static": false,
       "migration-safe": true
@@ -5216,32 +4035,6 @@
       "name": "z10EC",
       "typename": "z10EC-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "sthyi",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "csske",
-        "edat",
-        "asnlxr",
-        "msa2",
-        "msa1",
-        "tods"
       ],
       "static": false,
       "migration-safe": true
@@ -5250,134 +4043,6 @@
       "name": "z13s",
       "typename": "z13s-s390x-cpu",
       "unavailable-features": [
-        "ppno-sha-512-drng",
-        "pcc-xts-eaes-256",
-        "pcc-xts-eaes-128",
-        "pcc-xts-aes-256",
-        "pcc-xts-aes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-eaes-192",
-        "pcc-cmac-eaes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-aes-192",
-        "pcc-cmac-aes-128",
-        "pcc-cmac-etdea-192",
-        "pcc-cmac-etdea-128",
-        "pcc-cmac-edea",
-        "pcc-cmac-tdea-192",
-        "pcc-cmac-tdea-128",
-        "pcc-cmac-dea",
-        "kmo-eaes-256",
-        "kmo-eaes-192",
-        "kmo-eaes-128",
-        "kmo-aes-256",
-        "kmo-aes-192",
-        "kmo-aes-128",
-        "kmo-etdea-192",
-        "kmo-etdea-128",
-        "kmo-edea",
-        "kmo-tdea-192",
-        "kmo-tdea-128",
-        "kmo-dea",
-        "kmf-eaes-256",
-        "kmf-eaes-192",
-        "kmf-eaes-128",
-        "kmf-aes-256",
-        "kmf-aes-192",
-        "kmf-aes-128",
-        "kmf-etdea-192",
-        "kmf-etdea-128",
-        "kmf-edea",
-        "kmf-tdea-192",
-        "kmf-tdea-128",
-        "kmf-dea",
-        "kmctr-eaes-256",
-        "kmctr-eaes-192",
-        "kmctr-eaes-128",
-        "kmctr-aes-256",
-        "kmctr-aes-192",
-        "kmctr-aes-128",
-        "kmctr-etdea-192",
-        "kmctr-etdea-128",
-        "kmctr-edea",
-        "kmctr-tdea-192",
-        "kmctr-tdea-128",
-        "kmctr-dea",
-        "pckmo-aes-256",
-        "pckmo-aes-192",
-        "pckmo-aes-128",
-        "pckmo-etdea-192",
-        "pckmo-etdea-128",
-        "pckmo-edea",
-        "klmd-sha-1",
-        "kimd-ghash",
-        "kimd-sha-1",
-        "km-xts-eaes-256",
-        "km-xts-eaes-128",
-        "km-xts-aes-256",
-        "km-xts-aes-128",
-        "km-eaes-256",
-        "km-eaes-192",
-        "km-eaes-128",
-        "km-etdea-192",
-        "km-etdea-128",
-        "km-edea",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-eaes-256",
-        "kmc-eaes-192",
-        "kmc-eaes-128",
-        "kmc-etdea-192",
-        "kmc-etdea-128",
-        "kmc-edea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-eaes-256",
-        "kmac-eaes-192",
-        "kmac-eaes-128",
-        "kmac-aes-256",
-        "kmac-aes-192",
-        "kmac-aes-128",
-        "kmac-etdea-192",
-        "kmac-etdea-128",
-        "kmac-edea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "esop",
-        "sea_esop2",
-        "vx",
-        "dfppc",
-        "edat2",
-        "aefsi",
-        "sthyi",
-        "te",
-        "ri",
-        "cte",
-        "dfpzc",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "ipter",
-        "csske",
-        "edat",
-        "asnlxr",
-        "msa2",
-        "msa1",
-        "gen13ptff",
-        "tods",
-        "type"
       ],
       "static": false,
       "migration-safe": true
@@ -5394,32 +4059,6 @@
       "name": "z10EC.3",
       "typename": "z10EC.3-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "sthyi",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "csske",
-        "edat",
-        "asnlxr",
-        "msa2",
-        "msa1",
-        "tods"
       ],
       "static": false,
       "migration-safe": true
@@ -5428,27 +4067,6 @@
       "name": "z10EC.2-base",
       "typename": "z10EC.2-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "csske",
-        "asnlxr",
-        "tods"
       ],
       "static": true,
       "migration-safe": true
@@ -5457,31 +4075,6 @@
       "name": "z114-base",
       "typename": "z114-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "csske",
-        "asnlxr",
-        "tods"
       ],
       "static": true,
       "migration-safe": true
@@ -5490,18 +4083,6 @@
       "name": "z990.2-base",
       "typename": "z990.2-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "hfpm"
       ],
       "static": true,
       "migration-safe": true
@@ -5510,22 +4091,6 @@
       "name": "z9EC.2-base",
       "typename": "z9EC.2-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "hfpue",
-        "hfpm",
-        "asnlxr",
-        "tods"
       ],
       "static": true,
       "migration-safe": true
@@ -5534,18 +4099,6 @@
       "name": "z890.3",
       "typename": "z890.3-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "hfpm"
       ],
       "static": false,
       "migration-safe": true
@@ -5562,25 +4115,6 @@
       "name": "z9BC.2",
       "typename": "z9BC.2-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "sthyi",
-        "hfpue",
-        "hfpm",
-        "asnlxr",
-        "msa1",
-        "tods"
       ],
       "static": false,
       "migration-safe": true
@@ -5589,32 +4123,6 @@
       "name": "z10BC",
       "typename": "z10BC-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "sthyi",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "csske",
-        "edat",
-        "asnlxr",
-        "msa2",
-        "msa1",
-        "tods"
       ],
       "static": false,
       "migration-safe": true
@@ -5623,18 +4131,6 @@
       "name": "z990.5",
       "typename": "z990.5-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "hfpm"
       ],
       "static": false,
       "migration-safe": true
@@ -5643,129 +4139,6 @@
       "name": "zEC12.2",
       "typename": "zEC12.2-s390x-cpu",
       "unavailable-features": [
-        "pcc-xts-eaes-256",
-        "pcc-xts-eaes-128",
-        "pcc-xts-aes-256",
-        "pcc-xts-aes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-eaes-192",
-        "pcc-cmac-eaes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-aes-192",
-        "pcc-cmac-aes-128",
-        "pcc-cmac-etdea-192",
-        "pcc-cmac-etdea-128",
-        "pcc-cmac-edea",
-        "pcc-cmac-tdea-192",
-        "pcc-cmac-tdea-128",
-        "pcc-cmac-dea",
-        "kmo-eaes-256",
-        "kmo-eaes-192",
-        "kmo-eaes-128",
-        "kmo-aes-256",
-        "kmo-aes-192",
-        "kmo-aes-128",
-        "kmo-etdea-192",
-        "kmo-etdea-128",
-        "kmo-edea",
-        "kmo-tdea-192",
-        "kmo-tdea-128",
-        "kmo-dea",
-        "kmf-eaes-256",
-        "kmf-eaes-192",
-        "kmf-eaes-128",
-        "kmf-aes-256",
-        "kmf-aes-192",
-        "kmf-aes-128",
-        "kmf-etdea-192",
-        "kmf-etdea-128",
-        "kmf-edea",
-        "kmf-tdea-192",
-        "kmf-tdea-128",
-        "kmf-dea",
-        "kmctr-eaes-256",
-        "kmctr-eaes-192",
-        "kmctr-eaes-128",
-        "kmctr-aes-256",
-        "kmctr-aes-192",
-        "kmctr-aes-128",
-        "kmctr-etdea-192",
-        "kmctr-etdea-128",
-        "kmctr-edea",
-        "kmctr-tdea-192",
-        "kmctr-tdea-128",
-        "kmctr-dea",
-        "pckmo-aes-256",
-        "pckmo-aes-192",
-        "pckmo-aes-128",
-        "pckmo-etdea-192",
-        "pckmo-etdea-128",
-        "pckmo-edea",
-        "klmd-sha-1",
-        "kimd-ghash",
-        "kimd-sha-1",
-        "km-xts-eaes-256",
-        "km-xts-eaes-128",
-        "km-xts-aes-256",
-        "km-xts-aes-128",
-        "km-eaes-256",
-        "km-eaes-192",
-        "km-eaes-128",
-        "km-etdea-192",
-        "km-etdea-128",
-        "km-edea",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-eaes-256",
-        "kmc-eaes-192",
-        "kmc-eaes-128",
-        "kmc-etdea-192",
-        "kmc-etdea-128",
-        "kmc-edea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-eaes-256",
-        "kmac-eaes-192",
-        "kmac-eaes-128",
-        "kmac-aes-256",
-        "kmac-aes-192",
-        "kmac-aes-128",
-        "kmac-etdea-192",
-        "kmac-etdea-128",
-        "kmac-edea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "esop",
-        "sea_esop2",
-        "edat2",
-        "aefsi",
-        "sthyi",
-        "te",
-        "ri",
-        "cte",
-        "dfpzc",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "ipter",
-        "csske",
-        "edat",
-        "asnlxr",
-        "msa2",
-        "msa1",
-        "tods"
       ],
       "static": false,
       "migration-safe": true
@@ -5774,27 +4147,6 @@
       "name": "z10EC-base",
       "typename": "z10EC-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "csske",
-        "asnlxr",
-        "tods"
       ],
       "static": true,
       "migration-safe": true
@@ -5803,22 +4155,6 @@
       "name": "z9EC-base",
       "typename": "z9EC-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "hfpue",
-        "hfpm",
-        "asnlxr",
-        "tods"
       ],
       "static": true,
       "migration-safe": true
@@ -5827,22 +4163,6 @@
       "name": "z9EC.3-base",
       "typename": "z9EC.3-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "hfpue",
-        "hfpm",
-        "asnlxr",
-        "tods"
       ],
       "static": true,
       "migration-safe": true
@@ -5851,129 +4171,6 @@
       "name": "zEC12",
       "typename": "zEC12-s390x-cpu",
       "unavailable-features": [
-        "pcc-xts-eaes-256",
-        "pcc-xts-eaes-128",
-        "pcc-xts-aes-256",
-        "pcc-xts-aes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-eaes-192",
-        "pcc-cmac-eaes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-aes-192",
-        "pcc-cmac-aes-128",
-        "pcc-cmac-etdea-192",
-        "pcc-cmac-etdea-128",
-        "pcc-cmac-edea",
-        "pcc-cmac-tdea-192",
-        "pcc-cmac-tdea-128",
-        "pcc-cmac-dea",
-        "kmo-eaes-256",
-        "kmo-eaes-192",
-        "kmo-eaes-128",
-        "kmo-aes-256",
-        "kmo-aes-192",
-        "kmo-aes-128",
-        "kmo-etdea-192",
-        "kmo-etdea-128",
-        "kmo-edea",
-        "kmo-tdea-192",
-        "kmo-tdea-128",
-        "kmo-dea",
-        "kmf-eaes-256",
-        "kmf-eaes-192",
-        "kmf-eaes-128",
-        "kmf-aes-256",
-        "kmf-aes-192",
-        "kmf-aes-128",
-        "kmf-etdea-192",
-        "kmf-etdea-128",
-        "kmf-edea",
-        "kmf-tdea-192",
-        "kmf-tdea-128",
-        "kmf-dea",
-        "kmctr-eaes-256",
-        "kmctr-eaes-192",
-        "kmctr-eaes-128",
-        "kmctr-aes-256",
-        "kmctr-aes-192",
-        "kmctr-aes-128",
-        "kmctr-etdea-192",
-        "kmctr-etdea-128",
-        "kmctr-edea",
-        "kmctr-tdea-192",
-        "kmctr-tdea-128",
-        "kmctr-dea",
-        "pckmo-aes-256",
-        "pckmo-aes-192",
-        "pckmo-aes-128",
-        "pckmo-etdea-192",
-        "pckmo-etdea-128",
-        "pckmo-edea",
-        "klmd-sha-1",
-        "kimd-ghash",
-        "kimd-sha-1",
-        "km-xts-eaes-256",
-        "km-xts-eaes-128",
-        "km-xts-aes-256",
-        "km-xts-aes-128",
-        "km-eaes-256",
-        "km-eaes-192",
-        "km-eaes-128",
-        "km-etdea-192",
-        "km-etdea-128",
-        "km-edea",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-eaes-256",
-        "kmc-eaes-192",
-        "kmc-eaes-128",
-        "kmc-etdea-192",
-        "kmc-etdea-128",
-        "kmc-edea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-eaes-256",
-        "kmac-eaes-192",
-        "kmac-eaes-128",
-        "kmac-aes-256",
-        "kmac-aes-192",
-        "kmac-aes-128",
-        "kmac-etdea-192",
-        "kmac-etdea-128",
-        "kmac-edea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "esop",
-        "sea_esop2",
-        "edat2",
-        "aefsi",
-        "sthyi",
-        "te",
-        "ri",
-        "cte",
-        "dfpzc",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "ipter",
-        "csske",
-        "edat",
-        "asnlxr",
-        "msa2",
-        "msa1",
-        "tods"
       ],
       "static": false,
       "migration-safe": true
@@ -5982,18 +4179,6 @@
       "name": "z990.5-base",
       "typename": "z990.5-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "hfpm"
       ],
       "static": true,
       "migration-safe": true
@@ -6002,27 +4187,6 @@
       "name": "z10BC-base",
       "typename": "z10BC-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "csske",
-        "asnlxr",
-        "tods"
       ],
       "static": true,
       "migration-safe": true
@@ -6039,134 +4203,6 @@
       "name": "z13.2",
       "typename": "z13.2-s390x-cpu",
       "unavailable-features": [
-        "ppno-sha-512-drng",
-        "pcc-xts-eaes-256",
-        "pcc-xts-eaes-128",
-        "pcc-xts-aes-256",
-        "pcc-xts-aes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-eaes-192",
-        "pcc-cmac-eaes-128",
-        "pcc-cmac-eaes-256",
-        "pcc-cmac-aes-192",
-        "pcc-cmac-aes-128",
-        "pcc-cmac-etdea-192",
-        "pcc-cmac-etdea-128",
-        "pcc-cmac-edea",
-        "pcc-cmac-tdea-192",
-        "pcc-cmac-tdea-128",
-        "pcc-cmac-dea",
-        "kmo-eaes-256",
-        "kmo-eaes-192",
-        "kmo-eaes-128",
-        "kmo-aes-256",
-        "kmo-aes-192",
-        "kmo-aes-128",
-        "kmo-etdea-192",
-        "kmo-etdea-128",
-        "kmo-edea",
-        "kmo-tdea-192",
-        "kmo-tdea-128",
-        "kmo-dea",
-        "kmf-eaes-256",
-        "kmf-eaes-192",
-        "kmf-eaes-128",
-        "kmf-aes-256",
-        "kmf-aes-192",
-        "kmf-aes-128",
-        "kmf-etdea-192",
-        "kmf-etdea-128",
-        "kmf-edea",
-        "kmf-tdea-192",
-        "kmf-tdea-128",
-        "kmf-dea",
-        "kmctr-eaes-256",
-        "kmctr-eaes-192",
-        "kmctr-eaes-128",
-        "kmctr-aes-256",
-        "kmctr-aes-192",
-        "kmctr-aes-128",
-        "kmctr-etdea-192",
-        "kmctr-etdea-128",
-        "kmctr-edea",
-        "kmctr-tdea-192",
-        "kmctr-tdea-128",
-        "kmctr-dea",
-        "pckmo-aes-256",
-        "pckmo-aes-192",
-        "pckmo-aes-128",
-        "pckmo-etdea-192",
-        "pckmo-etdea-128",
-        "pckmo-edea",
-        "klmd-sha-1",
-        "kimd-ghash",
-        "kimd-sha-1",
-        "km-xts-eaes-256",
-        "km-xts-eaes-128",
-        "km-xts-aes-256",
-        "km-xts-aes-128",
-        "km-eaes-256",
-        "km-eaes-192",
-        "km-eaes-128",
-        "km-etdea-192",
-        "km-etdea-128",
-        "km-edea",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-eaes-256",
-        "kmc-eaes-192",
-        "kmc-eaes-128",
-        "kmc-etdea-192",
-        "kmc-etdea-128",
-        "kmc-edea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-eaes-256",
-        "kmac-eaes-192",
-        "kmac-eaes-128",
-        "kmac-aes-256",
-        "kmac-aes-192",
-        "kmac-aes-128",
-        "kmac-etdea-192",
-        "kmac-etdea-128",
-        "kmac-edea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "esop",
-        "sea_esop2",
-        "vx",
-        "dfppc",
-        "edat2",
-        "aefsi",
-        "sthyi",
-        "te",
-        "ri",
-        "cte",
-        "dfpzc",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "ipter",
-        "csske",
-        "edat",
-        "asnlxr",
-        "msa2",
-        "msa1",
-        "gen13ptff",
-        "tods",
-        "type"
       ],
       "static": false,
       "migration-safe": true
@@ -6175,18 +4211,6 @@
       "name": "z890.3-base",
       "typename": "z890.3-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "hfpm"
       ],
       "static": true,
       "migration-safe": true
@@ -6195,32 +4219,6 @@
       "name": "zBC12-base",
       "typename": "zBC12-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "dfpzc",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "csske",
-        "asnlxr",
-        "tods"
       ],
       "static": true,
       "migration-safe": true
@@ -6229,35 +4227,6 @@
       "name": "z13.2-base",
       "typename": "z13.2-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "dfppc",
-        "dfpzc",
-        "cmpsceh",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "fpe",
-        "emon",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "nonqks",
-        "csske",
-        "asnlxr",
-        "gen13ptff",
-        "tods",
-        "type"
       ],
       "static": true,
       "migration-safe": true
@@ -6266,18 +4235,6 @@
       "name": "z990-base",
       "typename": "z990-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "hfpm"
       ],
       "static": true,
       "migration-safe": true
@@ -6286,32 +4243,6 @@
       "name": "z10EC.2",
       "typename": "z10EC.2-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "sthyi",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "csske",
-        "edat",
-        "asnlxr",
-        "msa2",
-        "msa1",
-        "tods"
       ],
       "static": false,
       "migration-safe": true
@@ -6320,25 +4251,6 @@
       "name": "z9BC",
       "typename": "z9BC-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "cmm",
-        "dateh2",
-        "sthyi",
-        "hfpue",
-        "hfpm",
-        "asnlxr",
-        "msa1",
-        "tods"
       ],
       "static": false,
       "migration-safe": true
@@ -6347,27 +4259,6 @@
       "name": "z10EC.3-base",
       "typename": "z10EC.3-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "dateh2",
-        "pfpo",
-        "dfphp",
-        "dfp",
-        "parseh",
-        "hfpue",
-        "hfpm",
-        "csske",
-        "asnlxr",
-        "tods"
       ],
       "static": true,
       "migration-safe": true
@@ -6376,18 +4267,6 @@
       "name": "z990.3-base",
       "typename": "z990.3-base-s390x-cpu",
       "unavailable-features": [
-        "klmd-sha-1",
-        "kimd-sha-1",
-        "km-tdea-192",
-        "km-tdea-128",
-        "km-dea",
-        "kmc-tdea-192",
-        "kmc-tdea-128",
-        "kmc-dea",
-        "kmac-tdea-192",
-        "kmac-tdea-128",
-        "kmac-dea",
-        "hfpm"
       ],
       "static": true,
       "migration-safe": true
@@ -6411,41 +4290,6 @@
 
 {
   "return": [
-    {
-      "parameters": [
-        {
-          "name": "timeout",
-          "help": "Request timeout in seconds (default 0 = no timeout)",
-          "type": "number"
-        },
-        {
-          "name": "initiator-name",
-          "help": "Initiator iqn name to use when connecting",
-          "type": "string"
-        },
-        {
-          "name": "header-digest",
-          "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}",
-          "type": "string"
-        },
-        {
-          "name": "password-secret",
-          "help": "ID of the secret providing password for CHAP authentication to target",
-          "type": "string"
-        },
-        {
-          "name": "password",
-          "help": "password for CHAP authentication to target",
-          "type": "string"
-        },
-        {
-          "name": "user",
-          "help": "username for CHAP authentication to target",
-          "type": "string"
-        }
-      ],
-      "option": "iscsi"
-    },
     {
       "parameters": [
         {
@@ -7107,6 +4951,10 @@
     },
     {
       "parameters": [
+        {
+          "name": "x-oob",
+          "type": "boolean"
+        },
         {
           "name": "pretty",
           "type": "boolean"
@@ -15253,9 +13101,9 @@
           "type": "int"
         },
         {
-          "name": "static",
+          "name": "preallocation",
           "default": null,
-          "type": "bool"
+          "type": "356"
         }
       ],
       "meta-type": "object"
@@ -18996,7 +16844,2708 @@
 }
 
 {
-  "id": "libvirt-44",
+  "return": {
+    "model": {
+      "name": "z14-base",
+      "props": {
+        "aen": true,
+        "aefsi": true,
+        "msa8": true,
+        "msa7": true,
+        "msa6": true,
+        "msa5": true,
+        "msa4": true,
+        "msa3": true,
+        "msa2": true,
+        "msa1": true,
+        "sthyi": true,
+        "edat": true,
+        "ri": true,
+        "edat2": true,
+        "vx": true,
+        "ipter": true,
+        "vxeh": true,
+        "vxpd": true,
+        "esop": true,
+        "iep": true,
+        "cte": true,
+        "gs": true,
+        "ppa15": true,
+        "zpci": true,
+        "sea_esop2": true,
+        "te": true,
+        "cmm": true
+      }
+    }
+  },
+  "id": "libvirt-44"
+}
+
+{
+  "id": "libvirt-45",
+  "error": {
+    "class": "GenericError",
+    "desc": "Property '.migratable' not found"
+  }
+}
+
+{
+  "return": {
+  },
+  "id": "libvirt-1"
+}
+
+{
+  "return": [
+    {
+      "name": "z890.2",
+      "typename": "z890.2-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "hfpm"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z990.4",
+      "typename": "z990.4-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "hfpm"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z10BC.2",
+      "typename": "z10BC.2-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "sthyi",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "csske",
+        "edat",
+        "asnlxr",
+        "msa2",
+        "msa1",
+        "tods"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z196.2",
+      "typename": "z196.2-s390x-cpu",
+      "unavailable-features": [
+        "pcc-xts-eaes-256",
+        "pcc-xts-eaes-128",
+        "pcc-xts-aes-256",
+        "pcc-xts-aes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-eaes-192",
+        "pcc-cmac-eaes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-aes-192",
+        "pcc-cmac-aes-128",
+        "pcc-cmac-etdea-192",
+        "pcc-cmac-etdea-128",
+        "pcc-cmac-edea",
+        "pcc-cmac-tdea-192",
+        "pcc-cmac-tdea-128",
+        "pcc-cmac-dea",
+        "kmo-eaes-256",
+        "kmo-eaes-192",
+        "kmo-eaes-128",
+        "kmo-aes-256",
+        "kmo-aes-192",
+        "kmo-aes-128",
+        "kmo-etdea-192",
+        "kmo-etdea-128",
+        "kmo-edea",
+        "kmo-tdea-192",
+        "kmo-tdea-128",
+        "kmo-dea",
+        "kmf-eaes-256",
+        "kmf-eaes-192",
+        "kmf-eaes-128",
+        "kmf-aes-256",
+        "kmf-aes-192",
+        "kmf-aes-128",
+        "kmf-etdea-192",
+        "kmf-etdea-128",
+        "kmf-edea",
+        "kmf-tdea-192",
+        "kmf-tdea-128",
+        "kmf-dea",
+        "kmctr-eaes-256",
+        "kmctr-eaes-192",
+        "kmctr-eaes-128",
+        "kmctr-aes-256",
+        "kmctr-aes-192",
+        "kmctr-aes-128",
+        "kmctr-etdea-192",
+        "kmctr-etdea-128",
+        "kmctr-edea",
+        "kmctr-tdea-192",
+        "kmctr-tdea-128",
+        "kmctr-dea",
+        "pckmo-aes-256",
+        "pckmo-aes-192",
+        "pckmo-aes-128",
+        "pckmo-etdea-192",
+        "pckmo-etdea-128",
+        "pckmo-edea",
+        "klmd-sha-1",
+        "kimd-ghash",
+        "kimd-sha-1",
+        "km-xts-eaes-256",
+        "km-xts-eaes-128",
+        "km-xts-aes-256",
+        "km-xts-aes-128",
+        "km-eaes-256",
+        "km-eaes-192",
+        "km-eaes-128",
+        "km-etdea-192",
+        "km-etdea-128",
+        "km-edea",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-eaes-256",
+        "kmc-eaes-192",
+        "kmc-eaes-128",
+        "kmc-etdea-192",
+        "kmc-etdea-128",
+        "kmc-edea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-eaes-256",
+        "kmac-eaes-192",
+        "kmac-eaes-128",
+        "kmac-aes-256",
+        "kmac-aes-192",
+        "kmac-aes-128",
+        "kmac-etdea-192",
+        "kmac-etdea-128",
+        "kmac-edea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "aefsi",
+        "sthyi",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "ipter",
+        "csske",
+        "edat",
+        "asnlxr",
+        "msa2",
+        "msa1",
+        "tods"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z14",
+      "typename": "z14-s390x-cpu",
+      "unavailable-features": [
+        "ppno-sha-512-drng",
+        "pcc-xts-eaes-256",
+        "pcc-xts-eaes-128",
+        "pcc-xts-aes-256",
+        "pcc-xts-aes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-eaes-192",
+        "pcc-cmac-eaes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-aes-192",
+        "pcc-cmac-aes-128",
+        "pcc-cmac-etdea-192",
+        "pcc-cmac-etdea-128",
+        "pcc-cmac-edea",
+        "pcc-cmac-tdea-192",
+        "pcc-cmac-tdea-128",
+        "pcc-cmac-dea",
+        "kmo-eaes-256",
+        "kmo-eaes-192",
+        "kmo-eaes-128",
+        "kmo-aes-256",
+        "kmo-aes-192",
+        "kmo-aes-128",
+        "kmo-etdea-192",
+        "kmo-etdea-128",
+        "kmo-edea",
+        "kmo-tdea-192",
+        "kmo-tdea-128",
+        "kmo-dea",
+        "kmf-eaes-256",
+        "kmf-eaes-192",
+        "kmf-eaes-128",
+        "kmf-aes-256",
+        "kmf-aes-192",
+        "kmf-aes-128",
+        "kmf-etdea-192",
+        "kmf-etdea-128",
+        "kmf-edea",
+        "kmf-tdea-192",
+        "kmf-tdea-128",
+        "kmf-dea",
+        "kmctr-eaes-256",
+        "kmctr-eaes-192",
+        "kmctr-eaes-128",
+        "kmctr-aes-256",
+        "kmctr-aes-192",
+        "kmctr-aes-128",
+        "kmctr-etdea-192",
+        "kmctr-etdea-128",
+        "kmctr-edea",
+        "kmctr-tdea-192",
+        "kmctr-tdea-128",
+        "kmctr-dea",
+        "pckmo-aes-256",
+        "pckmo-aes-192",
+        "pckmo-aes-128",
+        "pckmo-etdea-192",
+        "pckmo-etdea-128",
+        "pckmo-edea",
+        "klmd-sha-1",
+        "kimd-ghash",
+        "kimd-sha-1",
+        "km-xts-eaes-256",
+        "km-xts-eaes-128",
+        "km-xts-aes-256",
+        "km-xts-aes-128",
+        "km-eaes-256",
+        "km-eaes-192",
+        "km-eaes-128",
+        "km-etdea-192",
+        "km-etdea-128",
+        "km-edea",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-eaes-256",
+        "kmc-eaes-192",
+        "kmc-eaes-128",
+        "kmc-etdea-192",
+        "kmc-etdea-128",
+        "kmc-edea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-eaes-256",
+        "kmac-eaes-192",
+        "kmac-eaes-128",
+        "kmac-aes-256",
+        "kmac-aes-192",
+        "kmac-aes-128",
+        "kmac-etdea-192",
+        "kmac-etdea-128",
+        "kmac-edea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "esop",
+        "vxeh",
+        "vxpd",
+        "gs",
+        "sea_esop2",
+        "iep",
+        "vx",
+        "dfppc",
+        "edat2",
+        "aefsi",
+        "sthyi",
+        "te",
+        "ri",
+        "tsi",
+        "sema",
+        "minste2",
+        "eec",
+        "cte",
+        "dfpzc",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "opc",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "ipter",
+        "csske",
+        "edat",
+        "asnlxr",
+        "msa8",
+        "msa7",
+        "msa6",
+        "msa2",
+        "msa1",
+        "gen13ptff",
+        "tods",
+        "type"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z9BC-base",
+      "typename": "z9BC-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "hfpue",
+        "hfpm",
+        "asnlxr",
+        "tods"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "zEC12-base",
+      "typename": "zEC12-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "dfpzc",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "csske",
+        "asnlxr",
+        "tods"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z196-base",
+      "typename": "z196-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "csske",
+        "asnlxr",
+        "tods"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z13-base",
+      "typename": "z13-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "dfppc",
+        "dfpzc",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "csske",
+        "asnlxr",
+        "gen13ptff",
+        "tods",
+        "type"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z990.3",
+      "typename": "z990.3-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "hfpm"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "host",
+      "typename": "host-s390x-cpu",
+      "static": false,
+      "migration-safe": false
+    },
+    {
+      "name": "z9EC",
+      "typename": "z9EC-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "sthyi",
+        "hfpue",
+        "hfpm",
+        "asnlxr",
+        "msa1",
+        "tods"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "zBC12",
+      "typename": "zBC12-s390x-cpu",
+      "unavailable-features": [
+        "pcc-xts-eaes-256",
+        "pcc-xts-eaes-128",
+        "pcc-xts-aes-256",
+        "pcc-xts-aes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-eaes-192",
+        "pcc-cmac-eaes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-aes-192",
+        "pcc-cmac-aes-128",
+        "pcc-cmac-etdea-192",
+        "pcc-cmac-etdea-128",
+        "pcc-cmac-edea",
+        "pcc-cmac-tdea-192",
+        "pcc-cmac-tdea-128",
+        "pcc-cmac-dea",
+        "kmo-eaes-256",
+        "kmo-eaes-192",
+        "kmo-eaes-128",
+        "kmo-aes-256",
+        "kmo-aes-192",
+        "kmo-aes-128",
+        "kmo-etdea-192",
+        "kmo-etdea-128",
+        "kmo-edea",
+        "kmo-tdea-192",
+        "kmo-tdea-128",
+        "kmo-dea",
+        "kmf-eaes-256",
+        "kmf-eaes-192",
+        "kmf-eaes-128",
+        "kmf-aes-256",
+        "kmf-aes-192",
+        "kmf-aes-128",
+        "kmf-etdea-192",
+        "kmf-etdea-128",
+        "kmf-edea",
+        "kmf-tdea-192",
+        "kmf-tdea-128",
+        "kmf-dea",
+        "kmctr-eaes-256",
+        "kmctr-eaes-192",
+        "kmctr-eaes-128",
+        "kmctr-aes-256",
+        "kmctr-aes-192",
+        "kmctr-aes-128",
+        "kmctr-etdea-192",
+        "kmctr-etdea-128",
+        "kmctr-edea",
+        "kmctr-tdea-192",
+        "kmctr-tdea-128",
+        "kmctr-dea",
+        "pckmo-aes-256",
+        "pckmo-aes-192",
+        "pckmo-aes-128",
+        "pckmo-etdea-192",
+        "pckmo-etdea-128",
+        "pckmo-edea",
+        "klmd-sha-1",
+        "kimd-ghash",
+        "kimd-sha-1",
+        "km-xts-eaes-256",
+        "km-xts-eaes-128",
+        "km-xts-aes-256",
+        "km-xts-aes-128",
+        "km-eaes-256",
+        "km-eaes-192",
+        "km-eaes-128",
+        "km-etdea-192",
+        "km-etdea-128",
+        "km-edea",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-eaes-256",
+        "kmc-eaes-192",
+        "kmc-eaes-128",
+        "kmc-etdea-192",
+        "kmc-etdea-128",
+        "kmc-edea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-eaes-256",
+        "kmac-eaes-192",
+        "kmac-eaes-128",
+        "kmac-aes-256",
+        "kmac-aes-192",
+        "kmac-aes-128",
+        "kmac-etdea-192",
+        "kmac-etdea-128",
+        "kmac-edea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "esop",
+        "sea_esop2",
+        "edat2",
+        "aefsi",
+        "sthyi",
+        "te",
+        "ri",
+        "cte",
+        "dfpzc",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "ipter",
+        "csske",
+        "edat",
+        "asnlxr",
+        "msa2",
+        "msa1",
+        "tods"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z9EC.3",
+      "typename": "z9EC.3-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "sthyi",
+        "hfpue",
+        "hfpm",
+        "asnlxr",
+        "msa1",
+        "tods"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z196.2-base",
+      "typename": "z196.2-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "csske",
+        "asnlxr",
+        "tods"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "qemu",
+      "typename": "qemu-s390x-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "zEC12.2-base",
+      "typename": "zEC12.2-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "dfpzc",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "csske",
+        "asnlxr",
+        "tods"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z800-base",
+      "typename": "z800-base-s390x-cpu",
+      "unavailable-features": [
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z9EC.2",
+      "typename": "z9EC.2-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "sthyi",
+        "hfpue",
+        "hfpm",
+        "asnlxr",
+        "msa1",
+        "tods"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z900.2-base",
+      "typename": "z900.2-base-s390x-cpu",
+      "unavailable-features": [
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z900.3",
+      "typename": "z900.3-s390x-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z890-base",
+      "typename": "z890-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "hfpm"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z890",
+      "typename": "z890-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "hfpm"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z990.4-base",
+      "typename": "z990.4-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "hfpm"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z10BC.2-base",
+      "typename": "z10BC.2-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "csske",
+        "asnlxr",
+        "tods"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z900.2",
+      "typename": "z900.2-s390x-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z9BC.2-base",
+      "typename": "z9BC.2-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "hfpue",
+        "hfpm",
+        "asnlxr",
+        "tods"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z800",
+      "typename": "z800-s390x-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z114",
+      "typename": "z114-s390x-cpu",
+      "unavailable-features": [
+        "pcc-xts-eaes-256",
+        "pcc-xts-eaes-128",
+        "pcc-xts-aes-256",
+        "pcc-xts-aes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-eaes-192",
+        "pcc-cmac-eaes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-aes-192",
+        "pcc-cmac-aes-128",
+        "pcc-cmac-etdea-192",
+        "pcc-cmac-etdea-128",
+        "pcc-cmac-edea",
+        "pcc-cmac-tdea-192",
+        "pcc-cmac-tdea-128",
+        "pcc-cmac-dea",
+        "kmo-eaes-256",
+        "kmo-eaes-192",
+        "kmo-eaes-128",
+        "kmo-aes-256",
+        "kmo-aes-192",
+        "kmo-aes-128",
+        "kmo-etdea-192",
+        "kmo-etdea-128",
+        "kmo-edea",
+        "kmo-tdea-192",
+        "kmo-tdea-128",
+        "kmo-dea",
+        "kmf-eaes-256",
+        "kmf-eaes-192",
+        "kmf-eaes-128",
+        "kmf-aes-256",
+        "kmf-aes-192",
+        "kmf-aes-128",
+        "kmf-etdea-192",
+        "kmf-etdea-128",
+        "kmf-edea",
+        "kmf-tdea-192",
+        "kmf-tdea-128",
+        "kmf-dea",
+        "kmctr-eaes-256",
+        "kmctr-eaes-192",
+        "kmctr-eaes-128",
+        "kmctr-aes-256",
+        "kmctr-aes-192",
+        "kmctr-aes-128",
+        "kmctr-etdea-192",
+        "kmctr-etdea-128",
+        "kmctr-edea",
+        "kmctr-tdea-192",
+        "kmctr-tdea-128",
+        "kmctr-dea",
+        "pckmo-aes-256",
+        "pckmo-aes-192",
+        "pckmo-aes-128",
+        "pckmo-etdea-192",
+        "pckmo-etdea-128",
+        "pckmo-edea",
+        "klmd-sha-1",
+        "kimd-ghash",
+        "kimd-sha-1",
+        "km-xts-eaes-256",
+        "km-xts-eaes-128",
+        "km-xts-aes-256",
+        "km-xts-aes-128",
+        "km-eaes-256",
+        "km-eaes-192",
+        "km-eaes-128",
+        "km-etdea-192",
+        "km-etdea-128",
+        "km-edea",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-eaes-256",
+        "kmc-eaes-192",
+        "kmc-eaes-128",
+        "kmc-etdea-192",
+        "kmc-etdea-128",
+        "kmc-edea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-eaes-256",
+        "kmac-eaes-192",
+        "kmac-eaes-128",
+        "kmac-aes-256",
+        "kmac-aes-192",
+        "kmac-aes-128",
+        "kmac-etdea-192",
+        "kmac-etdea-128",
+        "kmac-edea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "aefsi",
+        "sthyi",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "ipter",
+        "csske",
+        "edat",
+        "asnlxr",
+        "msa2",
+        "msa1",
+        "tods"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z13",
+      "typename": "z13-s390x-cpu",
+      "unavailable-features": [
+        "ppno-sha-512-drng",
+        "pcc-xts-eaes-256",
+        "pcc-xts-eaes-128",
+        "pcc-xts-aes-256",
+        "pcc-xts-aes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-eaes-192",
+        "pcc-cmac-eaes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-aes-192",
+        "pcc-cmac-aes-128",
+        "pcc-cmac-etdea-192",
+        "pcc-cmac-etdea-128",
+        "pcc-cmac-edea",
+        "pcc-cmac-tdea-192",
+        "pcc-cmac-tdea-128",
+        "pcc-cmac-dea",
+        "kmo-eaes-256",
+        "kmo-eaes-192",
+        "kmo-eaes-128",
+        "kmo-aes-256",
+        "kmo-aes-192",
+        "kmo-aes-128",
+        "kmo-etdea-192",
+        "kmo-etdea-128",
+        "kmo-edea",
+        "kmo-tdea-192",
+        "kmo-tdea-128",
+        "kmo-dea",
+        "kmf-eaes-256",
+        "kmf-eaes-192",
+        "kmf-eaes-128",
+        "kmf-aes-256",
+        "kmf-aes-192",
+        "kmf-aes-128",
+        "kmf-etdea-192",
+        "kmf-etdea-128",
+        "kmf-edea",
+        "kmf-tdea-192",
+        "kmf-tdea-128",
+        "kmf-dea",
+        "kmctr-eaes-256",
+        "kmctr-eaes-192",
+        "kmctr-eaes-128",
+        "kmctr-aes-256",
+        "kmctr-aes-192",
+        "kmctr-aes-128",
+        "kmctr-etdea-192",
+        "kmctr-etdea-128",
+        "kmctr-edea",
+        "kmctr-tdea-192",
+        "kmctr-tdea-128",
+        "kmctr-dea",
+        "pckmo-aes-256",
+        "pckmo-aes-192",
+        "pckmo-aes-128",
+        "pckmo-etdea-192",
+        "pckmo-etdea-128",
+        "pckmo-edea",
+        "klmd-sha-1",
+        "kimd-ghash",
+        "kimd-sha-1",
+        "km-xts-eaes-256",
+        "km-xts-eaes-128",
+        "km-xts-aes-256",
+        "km-xts-aes-128",
+        "km-eaes-256",
+        "km-eaes-192",
+        "km-eaes-128",
+        "km-etdea-192",
+        "km-etdea-128",
+        "km-edea",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-eaes-256",
+        "kmc-eaes-192",
+        "kmc-eaes-128",
+        "kmc-etdea-192",
+        "kmc-etdea-128",
+        "kmc-edea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-eaes-256",
+        "kmac-eaes-192",
+        "kmac-eaes-128",
+        "kmac-aes-256",
+        "kmac-aes-192",
+        "kmac-aes-128",
+        "kmac-etdea-192",
+        "kmac-etdea-128",
+        "kmac-edea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "esop",
+        "sea_esop2",
+        "vx",
+        "dfppc",
+        "edat2",
+        "aefsi",
+        "sthyi",
+        "te",
+        "ri",
+        "cte",
+        "dfpzc",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "ipter",
+        "csske",
+        "edat",
+        "asnlxr",
+        "msa2",
+        "msa1",
+        "gen13ptff",
+        "tods",
+        "type"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z13s-base",
+      "typename": "z13s-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "dfppc",
+        "dfpzc",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "csske",
+        "asnlxr",
+        "gen13ptff",
+        "tods",
+        "type"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z990",
+      "typename": "z990-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "hfpm"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z990.2",
+      "typename": "z990.2-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "hfpm"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z14-base",
+      "typename": "z14-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "dfppc",
+        "tsi",
+        "sema",
+        "minste2",
+        "eec",
+        "dfpzc",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "opc",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "csske",
+        "asnlxr",
+        "gen13ptff",
+        "tods",
+        "type"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z890.2-base",
+      "typename": "z890.2-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "hfpm"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z196",
+      "typename": "z196-s390x-cpu",
+      "unavailable-features": [
+        "pcc-xts-eaes-256",
+        "pcc-xts-eaes-128",
+        "pcc-xts-aes-256",
+        "pcc-xts-aes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-eaes-192",
+        "pcc-cmac-eaes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-aes-192",
+        "pcc-cmac-aes-128",
+        "pcc-cmac-etdea-192",
+        "pcc-cmac-etdea-128",
+        "pcc-cmac-edea",
+        "pcc-cmac-tdea-192",
+        "pcc-cmac-tdea-128",
+        "pcc-cmac-dea",
+        "kmo-eaes-256",
+        "kmo-eaes-192",
+        "kmo-eaes-128",
+        "kmo-aes-256",
+        "kmo-aes-192",
+        "kmo-aes-128",
+        "kmo-etdea-192",
+        "kmo-etdea-128",
+        "kmo-edea",
+        "kmo-tdea-192",
+        "kmo-tdea-128",
+        "kmo-dea",
+        "kmf-eaes-256",
+        "kmf-eaes-192",
+        "kmf-eaes-128",
+        "kmf-aes-256",
+        "kmf-aes-192",
+        "kmf-aes-128",
+        "kmf-etdea-192",
+        "kmf-etdea-128",
+        "kmf-edea",
+        "kmf-tdea-192",
+        "kmf-tdea-128",
+        "kmf-dea",
+        "kmctr-eaes-256",
+        "kmctr-eaes-192",
+        "kmctr-eaes-128",
+        "kmctr-aes-256",
+        "kmctr-aes-192",
+        "kmctr-aes-128",
+        "kmctr-etdea-192",
+        "kmctr-etdea-128",
+        "kmctr-edea",
+        "kmctr-tdea-192",
+        "kmctr-tdea-128",
+        "kmctr-dea",
+        "pckmo-aes-256",
+        "pckmo-aes-192",
+        "pckmo-aes-128",
+        "pckmo-etdea-192",
+        "pckmo-etdea-128",
+        "pckmo-edea",
+        "klmd-sha-1",
+        "kimd-ghash",
+        "kimd-sha-1",
+        "km-xts-eaes-256",
+        "km-xts-eaes-128",
+        "km-xts-aes-256",
+        "km-xts-aes-128",
+        "km-eaes-256",
+        "km-eaes-192",
+        "km-eaes-128",
+        "km-etdea-192",
+        "km-etdea-128",
+        "km-edea",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-eaes-256",
+        "kmc-eaes-192",
+        "kmc-eaes-128",
+        "kmc-etdea-192",
+        "kmc-etdea-128",
+        "kmc-edea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-eaes-256",
+        "kmac-eaes-192",
+        "kmac-eaes-128",
+        "kmac-aes-256",
+        "kmac-aes-192",
+        "kmac-aes-128",
+        "kmac-etdea-192",
+        "kmac-etdea-128",
+        "kmac-edea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "aefsi",
+        "sthyi",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "ipter",
+        "csske",
+        "edat",
+        "asnlxr",
+        "msa2",
+        "msa1",
+        "tods"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z10EC",
+      "typename": "z10EC-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "sthyi",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "csske",
+        "edat",
+        "asnlxr",
+        "msa2",
+        "msa1",
+        "tods"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z13s",
+      "typename": "z13s-s390x-cpu",
+      "unavailable-features": [
+        "ppno-sha-512-drng",
+        "pcc-xts-eaes-256",
+        "pcc-xts-eaes-128",
+        "pcc-xts-aes-256",
+        "pcc-xts-aes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-eaes-192",
+        "pcc-cmac-eaes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-aes-192",
+        "pcc-cmac-aes-128",
+        "pcc-cmac-etdea-192",
+        "pcc-cmac-etdea-128",
+        "pcc-cmac-edea",
+        "pcc-cmac-tdea-192",
+        "pcc-cmac-tdea-128",
+        "pcc-cmac-dea",
+        "kmo-eaes-256",
+        "kmo-eaes-192",
+        "kmo-eaes-128",
+        "kmo-aes-256",
+        "kmo-aes-192",
+        "kmo-aes-128",
+        "kmo-etdea-192",
+        "kmo-etdea-128",
+        "kmo-edea",
+        "kmo-tdea-192",
+        "kmo-tdea-128",
+        "kmo-dea",
+        "kmf-eaes-256",
+        "kmf-eaes-192",
+        "kmf-eaes-128",
+        "kmf-aes-256",
+        "kmf-aes-192",
+        "kmf-aes-128",
+        "kmf-etdea-192",
+        "kmf-etdea-128",
+        "kmf-edea",
+        "kmf-tdea-192",
+        "kmf-tdea-128",
+        "kmf-dea",
+        "kmctr-eaes-256",
+        "kmctr-eaes-192",
+        "kmctr-eaes-128",
+        "kmctr-aes-256",
+        "kmctr-aes-192",
+        "kmctr-aes-128",
+        "kmctr-etdea-192",
+        "kmctr-etdea-128",
+        "kmctr-edea",
+        "kmctr-tdea-192",
+        "kmctr-tdea-128",
+        "kmctr-dea",
+        "pckmo-aes-256",
+        "pckmo-aes-192",
+        "pckmo-aes-128",
+        "pckmo-etdea-192",
+        "pckmo-etdea-128",
+        "pckmo-edea",
+        "klmd-sha-1",
+        "kimd-ghash",
+        "kimd-sha-1",
+        "km-xts-eaes-256",
+        "km-xts-eaes-128",
+        "km-xts-aes-256",
+        "km-xts-aes-128",
+        "km-eaes-256",
+        "km-eaes-192",
+        "km-eaes-128",
+        "km-etdea-192",
+        "km-etdea-128",
+        "km-edea",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-eaes-256",
+        "kmc-eaes-192",
+        "kmc-eaes-128",
+        "kmc-etdea-192",
+        "kmc-etdea-128",
+        "kmc-edea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-eaes-256",
+        "kmac-eaes-192",
+        "kmac-eaes-128",
+        "kmac-aes-256",
+        "kmac-aes-192",
+        "kmac-aes-128",
+        "kmac-etdea-192",
+        "kmac-etdea-128",
+        "kmac-edea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "esop",
+        "sea_esop2",
+        "vx",
+        "dfppc",
+        "edat2",
+        "aefsi",
+        "sthyi",
+        "te",
+        "ri",
+        "cte",
+        "dfpzc",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "ipter",
+        "csske",
+        "edat",
+        "asnlxr",
+        "msa2",
+        "msa1",
+        "gen13ptff",
+        "tods",
+        "type"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z900",
+      "typename": "z900-s390x-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z10EC.3",
+      "typename": "z10EC.3-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "sthyi",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "csske",
+        "edat",
+        "asnlxr",
+        "msa2",
+        "msa1",
+        "tods"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z10EC.2-base",
+      "typename": "z10EC.2-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "csske",
+        "asnlxr",
+        "tods"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z114-base",
+      "typename": "z114-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "csske",
+        "asnlxr",
+        "tods"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z990.2-base",
+      "typename": "z990.2-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "hfpm"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z9EC.2-base",
+      "typename": "z9EC.2-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "hfpue",
+        "hfpm",
+        "asnlxr",
+        "tods"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z890.3",
+      "typename": "z890.3-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "hfpm"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z900.3-base",
+      "typename": "z900.3-base-s390x-cpu",
+      "unavailable-features": [
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z9BC.2",
+      "typename": "z9BC.2-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "sthyi",
+        "hfpue",
+        "hfpm",
+        "asnlxr",
+        "msa1",
+        "tods"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z10BC",
+      "typename": "z10BC-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "sthyi",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "csske",
+        "edat",
+        "asnlxr",
+        "msa2",
+        "msa1",
+        "tods"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z990.5",
+      "typename": "z990.5-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "hfpm"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "zEC12.2",
+      "typename": "zEC12.2-s390x-cpu",
+      "unavailable-features": [
+        "pcc-xts-eaes-256",
+        "pcc-xts-eaes-128",
+        "pcc-xts-aes-256",
+        "pcc-xts-aes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-eaes-192",
+        "pcc-cmac-eaes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-aes-192",
+        "pcc-cmac-aes-128",
+        "pcc-cmac-etdea-192",
+        "pcc-cmac-etdea-128",
+        "pcc-cmac-edea",
+        "pcc-cmac-tdea-192",
+        "pcc-cmac-tdea-128",
+        "pcc-cmac-dea",
+        "kmo-eaes-256",
+        "kmo-eaes-192",
+        "kmo-eaes-128",
+        "kmo-aes-256",
+        "kmo-aes-192",
+        "kmo-aes-128",
+        "kmo-etdea-192",
+        "kmo-etdea-128",
+        "kmo-edea",
+        "kmo-tdea-192",
+        "kmo-tdea-128",
+        "kmo-dea",
+        "kmf-eaes-256",
+        "kmf-eaes-192",
+        "kmf-eaes-128",
+        "kmf-aes-256",
+        "kmf-aes-192",
+        "kmf-aes-128",
+        "kmf-etdea-192",
+        "kmf-etdea-128",
+        "kmf-edea",
+        "kmf-tdea-192",
+        "kmf-tdea-128",
+        "kmf-dea",
+        "kmctr-eaes-256",
+        "kmctr-eaes-192",
+        "kmctr-eaes-128",
+        "kmctr-aes-256",
+        "kmctr-aes-192",
+        "kmctr-aes-128",
+        "kmctr-etdea-192",
+        "kmctr-etdea-128",
+        "kmctr-edea",
+        "kmctr-tdea-192",
+        "kmctr-tdea-128",
+        "kmctr-dea",
+        "pckmo-aes-256",
+        "pckmo-aes-192",
+        "pckmo-aes-128",
+        "pckmo-etdea-192",
+        "pckmo-etdea-128",
+        "pckmo-edea",
+        "klmd-sha-1",
+        "kimd-ghash",
+        "kimd-sha-1",
+        "km-xts-eaes-256",
+        "km-xts-eaes-128",
+        "km-xts-aes-256",
+        "km-xts-aes-128",
+        "km-eaes-256",
+        "km-eaes-192",
+        "km-eaes-128",
+        "km-etdea-192",
+        "km-etdea-128",
+        "km-edea",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-eaes-256",
+        "kmc-eaes-192",
+        "kmc-eaes-128",
+        "kmc-etdea-192",
+        "kmc-etdea-128",
+        "kmc-edea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-eaes-256",
+        "kmac-eaes-192",
+        "kmac-eaes-128",
+        "kmac-aes-256",
+        "kmac-aes-192",
+        "kmac-aes-128",
+        "kmac-etdea-192",
+        "kmac-etdea-128",
+        "kmac-edea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "esop",
+        "sea_esop2",
+        "edat2",
+        "aefsi",
+        "sthyi",
+        "te",
+        "ri",
+        "cte",
+        "dfpzc",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "ipter",
+        "csske",
+        "edat",
+        "asnlxr",
+        "msa2",
+        "msa1",
+        "tods"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z10EC-base",
+      "typename": "z10EC-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "csske",
+        "asnlxr",
+        "tods"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z9EC-base",
+      "typename": "z9EC-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "hfpue",
+        "hfpm",
+        "asnlxr",
+        "tods"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z9EC.3-base",
+      "typename": "z9EC.3-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "hfpue",
+        "hfpm",
+        "asnlxr",
+        "tods"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "zEC12",
+      "typename": "zEC12-s390x-cpu",
+      "unavailable-features": [
+        "pcc-xts-eaes-256",
+        "pcc-xts-eaes-128",
+        "pcc-xts-aes-256",
+        "pcc-xts-aes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-eaes-192",
+        "pcc-cmac-eaes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-aes-192",
+        "pcc-cmac-aes-128",
+        "pcc-cmac-etdea-192",
+        "pcc-cmac-etdea-128",
+        "pcc-cmac-edea",
+        "pcc-cmac-tdea-192",
+        "pcc-cmac-tdea-128",
+        "pcc-cmac-dea",
+        "kmo-eaes-256",
+        "kmo-eaes-192",
+        "kmo-eaes-128",
+        "kmo-aes-256",
+        "kmo-aes-192",
+        "kmo-aes-128",
+        "kmo-etdea-192",
+        "kmo-etdea-128",
+        "kmo-edea",
+        "kmo-tdea-192",
+        "kmo-tdea-128",
+        "kmo-dea",
+        "kmf-eaes-256",
+        "kmf-eaes-192",
+        "kmf-eaes-128",
+        "kmf-aes-256",
+        "kmf-aes-192",
+        "kmf-aes-128",
+        "kmf-etdea-192",
+        "kmf-etdea-128",
+        "kmf-edea",
+        "kmf-tdea-192",
+        "kmf-tdea-128",
+        "kmf-dea",
+        "kmctr-eaes-256",
+        "kmctr-eaes-192",
+        "kmctr-eaes-128",
+        "kmctr-aes-256",
+        "kmctr-aes-192",
+        "kmctr-aes-128",
+        "kmctr-etdea-192",
+        "kmctr-etdea-128",
+        "kmctr-edea",
+        "kmctr-tdea-192",
+        "kmctr-tdea-128",
+        "kmctr-dea",
+        "pckmo-aes-256",
+        "pckmo-aes-192",
+        "pckmo-aes-128",
+        "pckmo-etdea-192",
+        "pckmo-etdea-128",
+        "pckmo-edea",
+        "klmd-sha-1",
+        "kimd-ghash",
+        "kimd-sha-1",
+        "km-xts-eaes-256",
+        "km-xts-eaes-128",
+        "km-xts-aes-256",
+        "km-xts-aes-128",
+        "km-eaes-256",
+        "km-eaes-192",
+        "km-eaes-128",
+        "km-etdea-192",
+        "km-etdea-128",
+        "km-edea",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-eaes-256",
+        "kmc-eaes-192",
+        "kmc-eaes-128",
+        "kmc-etdea-192",
+        "kmc-etdea-128",
+        "kmc-edea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-eaes-256",
+        "kmac-eaes-192",
+        "kmac-eaes-128",
+        "kmac-aes-256",
+        "kmac-aes-192",
+        "kmac-aes-128",
+        "kmac-etdea-192",
+        "kmac-etdea-128",
+        "kmac-edea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "esop",
+        "sea_esop2",
+        "edat2",
+        "aefsi",
+        "sthyi",
+        "te",
+        "ri",
+        "cte",
+        "dfpzc",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "ipter",
+        "csske",
+        "edat",
+        "asnlxr",
+        "msa2",
+        "msa1",
+        "tods"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z990.5-base",
+      "typename": "z990.5-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "hfpm"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z10BC-base",
+      "typename": "z10BC-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "csske",
+        "asnlxr",
+        "tods"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z900-base",
+      "typename": "z900-base-s390x-cpu",
+      "unavailable-features": [
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z13.2",
+      "typename": "z13.2-s390x-cpu",
+      "unavailable-features": [
+        "ppno-sha-512-drng",
+        "pcc-xts-eaes-256",
+        "pcc-xts-eaes-128",
+        "pcc-xts-aes-256",
+        "pcc-xts-aes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-eaes-192",
+        "pcc-cmac-eaes-128",
+        "pcc-cmac-eaes-256",
+        "pcc-cmac-aes-192",
+        "pcc-cmac-aes-128",
+        "pcc-cmac-etdea-192",
+        "pcc-cmac-etdea-128",
+        "pcc-cmac-edea",
+        "pcc-cmac-tdea-192",
+        "pcc-cmac-tdea-128",
+        "pcc-cmac-dea",
+        "kmo-eaes-256",
+        "kmo-eaes-192",
+        "kmo-eaes-128",
+        "kmo-aes-256",
+        "kmo-aes-192",
+        "kmo-aes-128",
+        "kmo-etdea-192",
+        "kmo-etdea-128",
+        "kmo-edea",
+        "kmo-tdea-192",
+        "kmo-tdea-128",
+        "kmo-dea",
+        "kmf-eaes-256",
+        "kmf-eaes-192",
+        "kmf-eaes-128",
+        "kmf-aes-256",
+        "kmf-aes-192",
+        "kmf-aes-128",
+        "kmf-etdea-192",
+        "kmf-etdea-128",
+        "kmf-edea",
+        "kmf-tdea-192",
+        "kmf-tdea-128",
+        "kmf-dea",
+        "kmctr-eaes-256",
+        "kmctr-eaes-192",
+        "kmctr-eaes-128",
+        "kmctr-aes-256",
+        "kmctr-aes-192",
+        "kmctr-aes-128",
+        "kmctr-etdea-192",
+        "kmctr-etdea-128",
+        "kmctr-edea",
+        "kmctr-tdea-192",
+        "kmctr-tdea-128",
+        "kmctr-dea",
+        "pckmo-aes-256",
+        "pckmo-aes-192",
+        "pckmo-aes-128",
+        "pckmo-etdea-192",
+        "pckmo-etdea-128",
+        "pckmo-edea",
+        "klmd-sha-1",
+        "kimd-ghash",
+        "kimd-sha-1",
+        "km-xts-eaes-256",
+        "km-xts-eaes-128",
+        "km-xts-aes-256",
+        "km-xts-aes-128",
+        "km-eaes-256",
+        "km-eaes-192",
+        "km-eaes-128",
+        "km-etdea-192",
+        "km-etdea-128",
+        "km-edea",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-eaes-256",
+        "kmc-eaes-192",
+        "kmc-eaes-128",
+        "kmc-etdea-192",
+        "kmc-etdea-128",
+        "kmc-edea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-eaes-256",
+        "kmac-eaes-192",
+        "kmac-eaes-128",
+        "kmac-aes-256",
+        "kmac-aes-192",
+        "kmac-aes-128",
+        "kmac-etdea-192",
+        "kmac-etdea-128",
+        "kmac-edea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "esop",
+        "sea_esop2",
+        "vx",
+        "dfppc",
+        "edat2",
+        "aefsi",
+        "sthyi",
+        "te",
+        "ri",
+        "cte",
+        "dfpzc",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "ipter",
+        "csske",
+        "edat",
+        "asnlxr",
+        "msa2",
+        "msa1",
+        "gen13ptff",
+        "tods",
+        "type"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z890.3-base",
+      "typename": "z890.3-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "hfpm"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "zBC12-base",
+      "typename": "zBC12-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "dfpzc",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "csske",
+        "asnlxr",
+        "tods"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z13.2-base",
+      "typename": "z13.2-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "dfppc",
+        "dfpzc",
+        "cmpsceh",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "fpe",
+        "emon",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "nonqks",
+        "csske",
+        "asnlxr",
+        "gen13ptff",
+        "tods",
+        "type"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z990-base",
+      "typename": "z990-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "hfpm"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z10EC.2",
+      "typename": "z10EC.2-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "sthyi",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "csske",
+        "edat",
+        "asnlxr",
+        "msa2",
+        "msa1",
+        "tods"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z9BC",
+      "typename": "z9BC-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "cmm",
+        "dateh2",
+        "sthyi",
+        "hfpue",
+        "hfpm",
+        "asnlxr",
+        "msa1",
+        "tods"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "z10EC.3-base",
+      "typename": "z10EC.3-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "dateh2",
+        "pfpo",
+        "dfphp",
+        "dfp",
+        "parseh",
+        "hfpue",
+        "hfpm",
+        "csske",
+        "asnlxr",
+        "tods"
+      ],
+      "static": true,
+      "migration-safe": true
+    },
+    {
+      "name": "z990.3-base",
+      "typename": "z990.3-base-s390x-cpu",
+      "unavailable-features": [
+        "klmd-sha-1",
+        "kimd-sha-1",
+        "km-tdea-192",
+        "km-tdea-128",
+        "km-dea",
+        "kmc-tdea-192",
+        "kmc-tdea-128",
+        "kmc-dea",
+        "kmac-tdea-192",
+        "kmac-tdea-128",
+        "kmac-dea",
+        "hfpm"
+      ],
+      "static": true,
+      "migration-safe": true
+    }
+  ],
+  "id": "libvirt-2"
+}
+
+{
+  "id": "libvirt-3",
   "error": {
     "class": "GenericError",
     "desc": "The CPU definition 'max' is unknown."
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 607274ebb7..c486340c7d 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -3,7 +3,7 @@
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
   <usedQMP/>
-  <flag name='enable-kvm'/>
+  <flag name='kvm'/>
   <flag name='boot-index'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
@@ -126,11 +126,108 @@
   <flag name='virtual-css-bridge'/>
   <flag name='virtual-css-bridge.cssid-unrestricted'/>
   <flag name='vfio-ccw'/>
-  <version>2011090</version>
+  <version>2012000</version>
   <kvmVersion>0</kvmVersion>
-  <microcodeVersion>0</microcodeVersion>
-  <package>v2.12.0-rc0</package>
+  <microcodeVersion>371055</microcodeVersion>
+  <package></package>
   <arch>s390x</arch>
+  <hostCPU type='kvm' model='z14-base' migratability='no'>
+    <property name='aen' type='boolean' value='true'/>
+    <property name='aefsi' 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'/>
+    <property name='msa2' type='boolean' value='true'/>
+    <property name='msa1' type='boolean' value='true'/>
+    <property name='sthyi' type='boolean' value='true'/>
+    <property name='edat' type='boolean' value='true'/>
+    <property name='ri' type='boolean' value='true'/>
+    <property name='edat2' type='boolean' value='true'/>
+    <property name='vx' type='boolean' value='true'/>
+    <property name='ipter' 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='iep' type='boolean' value='true'/>
+    <property name='cte' 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'/>
+    <property name='te' type='boolean' value='true'/>
+    <property name='cmm' type='boolean' value='true'/>
+  </hostCPU>
+  <cpu type='kvm' name='z890.2' usable='yes'/>
+  <cpu type='kvm' name='z990.4' usable='yes'/>
+  <cpu type='kvm' name='z10BC.2' usable='yes'/>
+  <cpu type='kvm' name='z196.2' usable='yes'/>
+  <cpu type='kvm' name='z14' usable='yes'/>
+  <cpu type='kvm' name='z9BC-base' usable='yes'/>
+  <cpu type='kvm' name='zEC12-base' usable='yes'/>
+  <cpu type='kvm' name='z196-base' usable='yes'/>
+  <cpu type='kvm' name='z13-base' usable='yes'/>
+  <cpu type='kvm' name='z990.3' usable='yes'/>
+  <cpu type='kvm' name='host' usable='yes'/>
+  <cpu type='kvm' name='z9EC' usable='yes'/>
+  <cpu type='kvm' name='zBC12' usable='yes'/>
+  <cpu type='kvm' name='z9EC.3' usable='yes'/>
+  <cpu type='kvm' name='z196.2-base' usable='yes'/>
+  <cpu type='kvm' name='qemu' usable='no'>
+    <blocker name='ais'/>
+  </cpu>
+  <cpu type='kvm' name='zEC12.2-base' usable='yes'/>
+  <cpu type='kvm' name='z800-base' usable='yes'/>
+  <cpu type='kvm' name='z9EC.2' usable='yes'/>
+  <cpu type='kvm' name='z900.2-base' usable='yes'/>
+  <cpu type='kvm' name='z900.3' usable='yes'/>
+  <cpu type='kvm' name='z890-base' usable='yes'/>
+  <cpu type='kvm' name='z890' usable='yes'/>
+  <cpu type='kvm' name='z990.4-base' usable='yes'/>
+  <cpu type='kvm' name='z10BC.2-base' usable='yes'/>
+  <cpu type='kvm' name='z900.2' usable='yes'/>
+  <cpu type='kvm' name='z9BC.2-base' usable='yes'/>
+  <cpu type='kvm' name='z800' usable='yes'/>
+  <cpu type='kvm' name='z114' usable='yes'/>
+  <cpu type='kvm' name='z13' usable='yes'/>
+  <cpu type='kvm' name='z13s-base' usable='yes'/>
+  <cpu type='kvm' name='z990' usable='yes'/>
+  <cpu type='kvm' name='z990.2' usable='yes'/>
+  <cpu type='kvm' name='z14-base' usable='yes'/>
+  <cpu type='kvm' name='z890.2-base' usable='yes'/>
+  <cpu type='kvm' name='z196' usable='yes'/>
+  <cpu type='kvm' name='z10EC' usable='yes'/>
+  <cpu type='kvm' name='z13s' usable='yes'/>
+  <cpu type='kvm' name='z900' usable='yes'/>
+  <cpu type='kvm' name='z10EC.3' usable='yes'/>
+  <cpu type='kvm' name='z10EC.2-base' usable='yes'/>
+  <cpu type='kvm' name='z114-base' usable='yes'/>
+  <cpu type='kvm' name='z990.2-base' usable='yes'/>
+  <cpu type='kvm' name='z9EC.2-base' usable='yes'/>
+  <cpu type='kvm' name='z890.3' usable='yes'/>
+  <cpu type='kvm' name='z900.3-base' usable='yes'/>
+  <cpu type='kvm' name='z9BC.2' usable='yes'/>
+  <cpu type='kvm' name='z10BC' usable='yes'/>
+  <cpu type='kvm' name='z990.5' usable='yes'/>
+  <cpu type='kvm' name='zEC12.2' usable='yes'/>
+  <cpu type='kvm' name='z10EC-base' usable='yes'/>
+  <cpu type='kvm' name='z9EC-base' usable='yes'/>
+  <cpu type='kvm' name='z9EC.3-base' usable='yes'/>
+  <cpu type='kvm' name='zEC12' usable='yes'/>
+  <cpu type='kvm' name='z990.5-base' usable='yes'/>
+  <cpu type='kvm' name='z10BC-base' usable='yes'/>
+  <cpu type='kvm' name='z900-base' usable='yes'/>
+  <cpu type='kvm' name='z13.2' usable='yes'/>
+  <cpu type='kvm' name='z890.3-base' usable='yes'/>
+  <cpu type='kvm' name='zBC12-base' usable='yes'/>
+  <cpu type='kvm' name='z13.2-base' usable='yes'/>
+  <cpu type='kvm' name='z990-base' usable='yes'/>
+  <cpu type='kvm' name='z10EC.2' usable='yes'/>
+  <cpu type='kvm' name='z9BC' usable='yes'/>
+  <cpu type='kvm' name='z10EC.3-base' usable='yes'/>
+  <cpu type='kvm' name='z990.3-base' usable='yes'/>
   <cpu type='tcg' name='z890.2' usable='no'>
     <blocker name='klmd-sha-1'/>
     <blocker name='kimd-sha-1'/>
@@ -306,12 +403,6 @@
     <blocker name='tods'/>
   </cpu>
   <cpu type='tcg' name='z14' usable='no'>
-    <blocker name='kma-gcm-eaes-256'/>
-    <blocker name='kma-gcm-eaes-192'/>
-    <blocker name='kma-gcm-eaes-128'/>
-    <blocker name='kma-gcm-aes-256'/>
-    <blocker name='kma-gcm-aes-192'/>
-    <blocker name='kma-gcm-aes-128'/>
     <blocker name='ppno-sha-512-drng'/>
     <blocker name='pcc-xts-eaes-256'/>
     <blocker name='pcc-xts-eaes-128'/>
@@ -411,7 +502,6 @@
     <blocker name='cmm'/>
     <blocker name='dateh2'/>
     <blocker name='esop'/>
-    <blocker name='msa8-base'/>
     <blocker name='vxeh'/>
     <blocker name='vxpd'/>
     <blocker name='gs'/>
@@ -445,6 +535,7 @@
     <blocker name='csske'/>
     <blocker name='edat'/>
     <blocker name='asnlxr'/>
+    <blocker name='msa8'/>
     <blocker name='msa7'/>
     <blocker name='msa6'/>
     <blocker name='msa2'/>
-- 
2.14.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] tests: Update caps for QEMU 2.12.0 on s390x
Posted by John Ferlan, 1 week ago

On 05/15/2018 07:46 AM, Shalini Chellathurai Saroja wrote:
> Let us update the existing xml and replies files for QEMU 2.12.0 on
> s390x.
> 
> Signed-off-by: Shalini Chellathurai Saroja <shalini@linux.vnet.ibm.com>
> ---
>  tests/domaincapsschemadata/qemu_2.12.0.s390x.xml   |   99 +-
>  .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 5001 +++++++++++---------
>  tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   |  113 +-
>  3 files changed, 2974 insertions(+), 2239 deletions(-)
> 

Curious about your process for creating the files due to the differences
seen. I assume you use real hardware...

For x86_64, I will build a QEMU using the v2.12 tag, then in my libvirt
tree run:

    tests/qemucapsprobe /home/qemu/x86_64-softmmu/qemu-system-x86_64 > \
        tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies

    VIR_TEST_REGENERATE_OUTPUT=1 tests/qemucapabilitiestest
    VIR_TEST_REGENERATE_OUTPUT=1 tests/domaincapstest


My purpose for asking is to know if real hardware was used and then to
be able to have a "history" of how the previous version built the files
so that the next time someone comes along they can use the same process.

If I run the same sequence above on my x86_64 box, but use the s390x
emulator - I get different results - not unexpected for some things...
One difference that causes me to wonder is I have spice flag being set,
but this reply doesn't. It's strange and I'm not quite sure what's
happening at this point!

> diff --git a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
> index 4bacb879fe..1475451e68 100644
> --- a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
> +++ b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
> @@ -22,8 +22,103 @@
>    </os>
>    <cpu>
>      <mode name='host-passthrough' supported='yes'/>
> -    <mode name='host-model' supported='no'/>
> -    <mode name='custom' supported='no'/>

Based on these, I have a feeling the current files may have been built
in an emulated environment, but that's just my gut feel.  Nothing
necessarily wrong with what you did.

> +    <mode name='host-model' supported='yes'>
> +      <model fallback='forbid'>z14-base</model>
> +      <feature policy='require' name='aen'/>
> +      <feature policy='require' name='aefsi'/>
> +      <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='ri'/>
> +      <feature policy='require' name='edat2'/>
> +      <feature policy='require' name='vx'/>
> +      <feature policy='require' name='ipter'/>
> +      <feature policy='require' name='vxeh'/>
> +      <feature policy='require' name='vxpd'/>
> +      <feature policy='require' name='esop'/>
> +      <feature policy='require' name='iep'/>
> +      <feature policy='require' name='cte'/>
> +      <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'/>
> +      <feature policy='require' name='cmm'/>
> +    </mode>
> +    <mode name='custom' supported='yes'>
> +      <model usable='yes'>z890.2</model>
> +      <model usable='yes'>z990.4</model>
> +      <model usable='yes'>z10BC.2</model>
> +      <model usable='yes'>z196.2</model>
> +      <model usable='yes'>z14</model>
> +      <model usable='yes'>z9BC-base</model>
> +      <model usable='yes'>zEC12-base</model>
> +      <model usable='yes'>z196-base</model>
> +      <model usable='yes'>z13-base</model>
> +      <model usable='yes'>z990.3</model>
> +      <model usable='yes'>z9EC</model>
> +      <model usable='yes'>zBC12</model>
> +      <model usable='yes'>z9EC.3</model>
> +      <model usable='yes'>z196.2-base</model>
> +      <model usable='no'>qemu</model>
> +      <model usable='yes'>zEC12.2-base</model>
> +      <model usable='yes'>z800-base</model>
> +      <model usable='yes'>z9EC.2</model>
> +      <model usable='yes'>z900.2-base</model>
> +      <model usable='yes'>z900.3</model>
> +      <model usable='yes'>z890-base</model>
> +      <model usable='yes'>z890</model>
> +      <model usable='yes'>z990.4-base</model>
> +      <model usable='yes'>z10BC.2-base</model>
> +      <model usable='yes'>z900.2</model>
> +      <model usable='yes'>z9BC.2-base</model>
> +      <model usable='yes'>z800</model>
> +      <model usable='yes'>z114</model>
> +      <model usable='yes'>z13</model>
> +      <model usable='yes'>z13s-base</model>
> +      <model usable='yes'>z990</model>
> +      <model usable='yes'>z990.2</model>
> +      <model usable='yes'>z14-base</model>
> +      <model usable='yes'>z890.2-base</model>
> +      <model usable='yes'>z196</model>
> +      <model usable='yes'>z10EC</model>
> +      <model usable='yes'>z13s</model>
> +      <model usable='yes'>z900</model>
> +      <model usable='yes'>z10EC.3</model>
> +      <model usable='yes'>z10EC.2-base</model>
> +      <model usable='yes'>z114-base</model>
> +      <model usable='yes'>z990.2-base</model>
> +      <model usable='yes'>z9EC.2-base</model>
> +      <model usable='yes'>z890.3</model>
> +      <model usable='yes'>z900.3-base</model>
> +      <model usable='yes'>z9BC.2</model>
> +      <model usable='yes'>z10BC</model>
> +      <model usable='yes'>z990.5</model>
> +      <model usable='yes'>zEC12.2</model>
> +      <model usable='yes'>z10EC-base</model>
> +      <model usable='yes'>z9EC-base</model>
> +      <model usable='yes'>z9EC.3-base</model>
> +      <model usable='yes'>zEC12</model>
> +      <model usable='yes'>z990.5-base</model>
> +      <model usable='yes'>z10BC-base</model>
> +      <model usable='yes'>z900-base</model>
> +      <model usable='yes'>z13.2</model>
> +      <model usable='yes'>z890.3-base</model>
> +      <model usable='yes'>zBC12-base</model>
> +      <model usable='yes'>z13.2-base</model>
> +      <model usable='yes'>z990-base</model>
> +      <model usable='yes'>z10EC.2</model>
> +      <model usable='yes'>z9BC</model>
> +      <model usable='yes'>z10EC.3-base</model>
> +      <model usable='yes'>z990.3-base</model>
> +    </mode>
>    </cpu>
>    <devices>
>      <disk supported='yes'>
> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
> index a93e5984c6..29c3403550 100644
> --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
> +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
> @@ -2,14 +2,13 @@
>    "QMP": {
>      "version": {
>        "qemu": {
> -        "micro": 90,
> -        "minor": 11,
> +        "micro": 0,
> +        "minor": 12,
>          "major": 2
>        },
> -      "package": "v2.12.0-rc0"
> +      "package": ""

This in particular concerns me as, I think it should be :

         "package": "v2.12.0"

>      },
>      "capabilities": [
> -      "oob"
>      ]
>    }
>  }
> @@ -23,11 +22,11 @@
>  {
>    "return": {
>      "qemu": {
> -      "micro": 90,
> -      "minor": 11,
> +      "micro": 0,
> +      "minor": 12,
>        "major": 2
>      },
> -    "package": "v2.12.0-rc0"
> +    "package": ""

Likewise...

>    },
>    "id": "libvirt-2"
>  }
> @@ -530,7 +529,7 @@
>  
>  {
>    "return": {
> -    "fd": 17,
> +    "fd": 18,
>      "fdset-id": 0
>    },
>    "id": "libvirt-5"
> @@ -546,7 +545,7 @@
>  
>  {
>    "return": {
> -    "enabled": false,
> +    "enabled": true,
>      "present": true
>    },

BTW: This is why I think you used real hardware and the previous one was
built using just the emulator. I believe this is the response from the
qemuMonitorJSONGetKVMState call in virQEMUCapsProbeQMPKVMState.

Which if I'm reading things correctly perhaps explains differences later
on here for unavailable cpu features in the existing replies file [I've
cut that out of this reply, but can be seen in the original diff...

>    "id": "libvirt-7"
> @@ -1241,10 +1240,6 @@
>        "name": "fw_cfg_io",
>        "parent": "fw_cfg"
>      },

[...]

> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
> index 607274ebb7..c486340c7d 100644
> --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
> +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
> @@ -3,7 +3,7 @@
>    <selfctime>0</selfctime>
>    <selfvers>0</selfvers>
>    <usedQMP/>
> -  <flag name='enable-kvm'/>
> +  <flag name='kvm'/>
>    <flag name='boot-index'/>
>    <flag name='virtio-tx-alg'/>
>    <flag name='virtio-blk-pci.ioeventfd'/>
> @@ -126,11 +126,108 @@
>    <flag name='virtual-css-bridge'/>
>    <flag name='virtual-css-bridge.cssid-unrestricted'/>
>    <flag name='vfio-ccw'/>
> -  <version>2011090</version>
> +  <version>2012000</version>
>    <kvmVersion>0</kvmVersion>
> -  <microcodeVersion>0</microcodeVersion>
> -  <package>v2.12.0-rc0</package>
> +  <microcodeVersion>371055</microcodeVersion>
> +  <package></package>

This would be filled in from the replies, but I don't believe it should
be empty

>    <arch>s390x</arch>

[...]

John



--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] tests: Update caps for QEMU 2.12.0 on s390x
Posted by Boris Fiuczynski, 6 days ago
On 05/15/2018 10:37 PM, John Ferlan wrote:
> 
> 
> On 05/15/2018 07:46 AM, Shalini Chellathurai Saroja wrote:
>> Let us update the existing xml and replies files for QEMU 2.12.0 on
>> s390x.
>>
>> Signed-off-by: Shalini Chellathurai Saroja <shalini@linux.vnet.ibm.com>
>> ---
>>   tests/domaincapsschemadata/qemu_2.12.0.s390x.xml   |   99 +-
>>   .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 5001 +++++++++++---------
>>   tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   |  113 +-
>>   3 files changed, 2974 insertions(+), 2239 deletions(-)
>>
> 
> Curious about your process for creating the files due to the differences
> seen. I assume you use real hardware...
> 
> For x86_64, I will build a QEMU using the v2.12 tag, then in my libvirt
> tree run:
> 
>      tests/qemucapsprobe /home/qemu/x86_64-softmmu/qemu-system-x86_64 > \
>          tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
> 
>      VIR_TEST_REGENERATE_OUTPUT=1 tests/qemucapabilitiestest
>      VIR_TEST_REGENERATE_OUTPUT=1 tests/domaincapstest
> 
> 
> My purpose for asking is to know if real hardware was used and then to
> be able to have a "history" of how the previous version built the files
> so that the next time someone comes along they can use the same process.
Shalini used the process you outlined above on a z14. She also used a 
2.12 GA qemu build on s390.
My expectation of the qemucapabilitiestest has been so far that these 
tests are trying to be a reality check against an architecture which 
obviously should use replies files generated on real hardware of the 
architecture.

> 
> If I run the same sequence above on my x86_64 box, but use the s390x
> emulator - I get different results - not unexpected for some things...
> One difference that causes me to wonder is I have spice flag being set,
> but this reply doesn't. It's strange and I'm not quite sure what's
> happening at this point!
> 
>> diff --git a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
>> index 4bacb879fe..1475451e68 100644
>> --- a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
>> +++ b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
>> @@ -22,8 +22,103 @@
>>     </os>
>>     <cpu>
>>       <mode name='host-passthrough' supported='yes'/>
>> -    <mode name='host-model' supported='no'/>
>> -    <mode name='custom' supported='no'/>
> 
> Based on these, I have a feeling the current files may have been built
> in an emulated environment, but that's just my gut feel.  Nothing
> necessarily wrong with what you did.
We have not produced the previous set of 2.12. Andrea Bolognani did 
create them and I agree that it must have been on an emulated environment.

> 
>> +    <mode name='host-model' supported='yes'>
>> +      <model fallback='forbid'>z14-base</model>
>> +      <feature policy='require' name='aen'/>
>> +      <feature policy='require' name='aefsi'/>
>> +      <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='ri'/>
>> +      <feature policy='require' name='edat2'/>
>> +      <feature policy='require' name='vx'/>
>> +      <feature policy='require' name='ipter'/>
>> +      <feature policy='require' name='vxeh'/>
>> +      <feature policy='require' name='vxpd'/>
>> +      <feature policy='require' name='esop'/>
>> +      <feature policy='require' name='iep'/>
>> +      <feature policy='require' name='cte'/>
>> +      <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'/>
>> +      <feature policy='require' name='cmm'/>
>> +    </mode>
>> +    <mode name='custom' supported='yes'>
>> +      <model usable='yes'>z890.2</model>
>> +      <model usable='yes'>z990.4</model>
>> +      <model usable='yes'>z10BC.2</model>
>> +      <model usable='yes'>z196.2</model>
>> +      <model usable='yes'>z14</model>
>> +      <model usable='yes'>z9BC-base</model>
>> +      <model usable='yes'>zEC12-base</model>
>> +      <model usable='yes'>z196-base</model>
>> +      <model usable='yes'>z13-base</model>
>> +      <model usable='yes'>z990.3</model>
>> +      <model usable='yes'>z9EC</model>
>> +      <model usable='yes'>zBC12</model>
>> +      <model usable='yes'>z9EC.3</model>
>> +      <model usable='yes'>z196.2-base</model>
>> +      <model usable='no'>qemu</model>
>> +      <model usable='yes'>zEC12.2-base</model>
>> +      <model usable='yes'>z800-base</model>
>> +      <model usable='yes'>z9EC.2</model>
>> +      <model usable='yes'>z900.2-base</model>
>> +      <model usable='yes'>z900.3</model>
>> +      <model usable='yes'>z890-base</model>
>> +      <model usable='yes'>z890</model>
>> +      <model usable='yes'>z990.4-base</model>
>> +      <model usable='yes'>z10BC.2-base</model>
>> +      <model usable='yes'>z900.2</model>
>> +      <model usable='yes'>z9BC.2-base</model>
>> +      <model usable='yes'>z800</model>
>> +      <model usable='yes'>z114</model>
>> +      <model usable='yes'>z13</model>
>> +      <model usable='yes'>z13s-base</model>
>> +      <model usable='yes'>z990</model>
>> +      <model usable='yes'>z990.2</model>
>> +      <model usable='yes'>z14-base</model>
>> +      <model usable='yes'>z890.2-base</model>
>> +      <model usable='yes'>z196</model>
>> +      <model usable='yes'>z10EC</model>
>> +      <model usable='yes'>z13s</model>
>> +      <model usable='yes'>z900</model>
>> +      <model usable='yes'>z10EC.3</model>
>> +      <model usable='yes'>z10EC.2-base</model>
>> +      <model usable='yes'>z114-base</model>
>> +      <model usable='yes'>z990.2-base</model>
>> +      <model usable='yes'>z9EC.2-base</model>
>> +      <model usable='yes'>z890.3</model>
>> +      <model usable='yes'>z900.3-base</model>
>> +      <model usable='yes'>z9BC.2</model>
>> +      <model usable='yes'>z10BC</model>
>> +      <model usable='yes'>z990.5</model>
>> +      <model usable='yes'>zEC12.2</model>
>> +      <model usable='yes'>z10EC-base</model>
>> +      <model usable='yes'>z9EC-base</model>
>> +      <model usable='yes'>z9EC.3-base</model>
>> +      <model usable='yes'>zEC12</model>
>> +      <model usable='yes'>z990.5-base</model>
>> +      <model usable='yes'>z10BC-base</model>
>> +      <model usable='yes'>z900-base</model>
>> +      <model usable='yes'>z13.2</model>
>> +      <model usable='yes'>z890.3-base</model>
>> +      <model usable='yes'>zBC12-base</model>
>> +      <model usable='yes'>z13.2-base</model>
>> +      <model usable='yes'>z990-base</model>
>> +      <model usable='yes'>z10EC.2</model>
>> +      <model usable='yes'>z9BC</model>
>> +      <model usable='yes'>z10EC.3-base</model>
>> +      <model usable='yes'>z990.3-base</model>
>> +    </mode>
>>     </cpu>
>>     <devices>
>>       <disk supported='yes'>
>> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
>> index a93e5984c6..29c3403550 100644
>> --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
>> +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
>> @@ -2,14 +2,13 @@
>>     "QMP": {
>>       "version": {
>>         "qemu": {
>> -        "micro": 90,
>> -        "minor": 11,
>> +        "micro": 0,
>> +        "minor": 12,
>>           "major": 2
>>         },
>> -      "package": "v2.12.0-rc0"
>> +      "package": ""
> 
> This in particular concerns me as, I think it should be :
> 
>           "package": "v2.12.0"
> 
See two below.

>>       },
>>       "capabilities": [
>> -      "oob"
>>       ]
>>     }
>>   }
>> @@ -23,11 +22,11 @@
>>   {
>>     "return": {
>>       "qemu": {
>> -      "micro": 90,
>> -      "minor": 11,
>> +      "micro": 0,
>> +      "minor": 12,
>>         "major": 2
>>       },
>> -    "package": "v2.12.0-rc0"
>> +    "package": ""
> 
> Likewise...
> 
>>     },
>>     "id": "libvirt-2"
>>   }
>> @@ -530,7 +529,7 @@
>>   
>>   {
>>     "return": {
>> -    "fd": 17,
>> +    "fd": 18,
>>       "fdset-id": 0
>>     },
>>     "id": "libvirt-5"
>> @@ -546,7 +545,7 @@
>>   
>>   {
>>     "return": {
>> -    "enabled": false,
>> +    "enabled": true,
>>       "present": true
>>     },
> 
> BTW: This is why I think you used real hardware and the previous one was
> built using just the emulator. I believe this is the response from the
> qemuMonitorJSONGetKVMState call in virQEMUCapsProbeQMPKVMState.
> 
> Which if I'm reading things correctly perhaps explains differences later
> on here for unavailable cpu features in the existing replies file [I've
> cut that out of this reply, but can be seen in the original diff...
Correct.

> 
>>     "id": "libvirt-7"
>> @@ -1241,10 +1240,6 @@
>>         "name": "fw_cfg_io",
>>         "parent": "fw_cfg"
>>       },
> 
> [...]
> 
>> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
>> index 607274ebb7..c486340c7d 100644
>> --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
>> +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
>> @@ -3,7 +3,7 @@
>>     <selfctime>0</selfctime>
>>     <selfvers>0</selfvers>
>>     <usedQMP/>
>> -  <flag name='enable-kvm'/>
>> +  <flag name='kvm'/>
>>     <flag name='boot-index'/>
>>     <flag name='virtio-tx-alg'/>
>>     <flag name='virtio-blk-pci.ioeventfd'/>
>> @@ -126,11 +126,108 @@
>>     <flag name='virtual-css-bridge'/>
>>     <flag name='virtual-css-bridge.cssid-unrestricted'/>
>>     <flag name='vfio-ccw'/>
>> -  <version>2011090</version>
>> +  <version>2012000</version>
>>     <kvmVersion>0</kvmVersion>
>> -  <microcodeVersion>0</microcodeVersion>
>> -  <package>v2.12.0-rc0</package>
>> +  <microcodeVersion>371055</microcodeVersion>
>> +  <package></package>
> 
> This would be filled in from the replies, but I don't believe it should
> be empty
Looking in the replies file it is empty and it also has been empty in 
the past.
Running  qemu-system-s390x --version
QEMU emulator version 2.12.0
Copyright (c) 2003-2017 Fabrice Bellard and the QEMU Project developers


> 
>>     <arch>s390x</arch>
> 
> [...]
> 
> John
> 
> 
> 
> --
> libvir-list mailing list
> libvir-list@redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
> 


-- 
Mit freundlichen Grüßen/Kind regards
    Boris Fiuczynski

IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Martina Köderitz
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] tests: Update caps for QEMU 2.12.0 on s390x
Posted by John Ferlan, 6 days ago

On 05/16/2018 04:40 AM, Boris Fiuczynski wrote:
> On 05/15/2018 10:37 PM, John Ferlan wrote:
>>
>>
>> On 05/15/2018 07:46 AM, Shalini Chellathurai Saroja wrote:
>>> Let us update the existing xml and replies files for QEMU 2.12.0 on
>>> s390x.
>>>
>>> Signed-off-by: Shalini Chellathurai Saroja <shalini@linux.vnet.ibm.com>
>>> ---
>>>   tests/domaincapsschemadata/qemu_2.12.0.s390x.xml   |   99 +-
>>>   .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 5001
>>> +++++++++++---------
>>>   tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   |  113 +-
>>>   3 files changed, 2974 insertions(+), 2239 deletions(-)
>>>
>>
>> Curious about your process for creating the files due to the differences
>> seen. I assume you use real hardware...
>>
>> For x86_64, I will build a QEMU using the v2.12 tag, then in my libvirt
>> tree run:
>>
>>      tests/qemucapsprobe /home/qemu/x86_64-softmmu/qemu-system-x86_64 > \
>>          tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
>>
>>      VIR_TEST_REGENERATE_OUTPUT=1 tests/qemucapabilitiestest
>>      VIR_TEST_REGENERATE_OUTPUT=1 tests/domaincapstest
>>
>>
>> My purpose for asking is to know if real hardware was used and then to
>> be able to have a "history" of how the previous version built the files
>> so that the next time someone comes along they can use the same process.
> Shalini used the process you outlined above on a z14. She also used a
> 2.12 GA qemu build on s390.
> My expectation of the qemucapabilitiestest has been so far that these
> tests are trying to be a reality check against an architecture which
> obviously should use replies files generated on real hardware of the
> architecture.
> 

I'll add the following to the commit message:

Used a z14 using a QEMU 2.12 GA build and the following sequence:

  tests/qemucapsprobe /path/to/s390x-softmmu/qemu-system-s390x > \
         tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies

  VIR_TEST_REGENERATE_OUTPUT=1 tests/qemucapabilitiestest
  VIR_TEST_REGENERATE_OUTPUT=1 tests/domaincapstest


I also checked the 2.11 set that Shalini produced (commit id ab9e2041c)
and saw that package was empty there as well (should have thought of
that yesterday ;-))

So consider this

Reviewed-by: John Ferlan <jferlan@redhat.com>

and I've merged in the adjustment from yesterday for "<flag name='sdl-gl'/>"

I will push the changes later...

Tks -

John

>>
>> If I run the same sequence above on my x86_64 box, but use the s390x
>> emulator - I get different results - not unexpected for some things...
>> One difference that causes me to wonder is I have spice flag being set,
>> but this reply doesn't. It's strange and I'm not quite sure what's
>> happening at this point!
>>
>>> diff --git a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
>>> b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
>>> index 4bacb879fe..1475451e68 100644
>>> --- a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
>>> +++ b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
>>> @@ -22,8 +22,103 @@
>>>     </os>
>>>     <cpu>
>>>       <mode name='host-passthrough' supported='yes'/>
>>> -    <mode name='host-model' supported='no'/>
>>> -    <mode name='custom' supported='no'/>
>>
>> Based on these, I have a feeling the current files may have been built
>> in an emulated environment, but that's just my gut feel.  Nothing
>> necessarily wrong with what you did.
> We have not produced the previous set of 2.12. Andrea Bolognani did
> create them and I agree that it must have been on an emulated environment.
> 
>>
>>> +    <mode name='host-model' supported='yes'>
>>> +      <model fallback='forbid'>z14-base</model>
>>> +      <feature policy='require' name='aen'/>
>>> +      <feature policy='require' name='aefsi'/>
>>> +      <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='ri'/>
>>> +      <feature policy='require' name='edat2'/>
>>> +      <feature policy='require' name='vx'/>
>>> +      <feature policy='require' name='ipter'/>
>>> +      <feature policy='require' name='vxeh'/>
>>> +      <feature policy='require' name='vxpd'/>
>>> +      <feature policy='require' name='esop'/>
>>> +      <feature policy='require' name='iep'/>
>>> +      <feature policy='require' name='cte'/>
>>> +      <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'/>
>>> +      <feature policy='require' name='cmm'/>
>>> +    </mode>
>>> +    <mode name='custom' supported='yes'>
>>> +      <model usable='yes'>z890.2</model>
>>> +      <model usable='yes'>z990.4</model>
>>> +      <model usable='yes'>z10BC.2</model>
>>> +      <model usable='yes'>z196.2</model>
>>> +      <model usable='yes'>z14</model>
>>> +      <model usable='yes'>z9BC-base</model>
>>> +      <model usable='yes'>zEC12-base</model>
>>> +      <model usable='yes'>z196-base</model>
>>> +      <model usable='yes'>z13-base</model>
>>> +      <model usable='yes'>z990.3</model>
>>> +      <model usable='yes'>z9EC</model>
>>> +      <model usable='yes'>zBC12</model>
>>> +      <model usable='yes'>z9EC.3</model>
>>> +      <model usable='yes'>z196.2-base</model>
>>> +      <model usable='no'>qemu</model>
>>> +      <model usable='yes'>zEC12.2-base</model>
>>> +      <model usable='yes'>z800-base</model>
>>> +      <model usable='yes'>z9EC.2</model>
>>> +      <model usable='yes'>z900.2-base</model>
>>> +      <model usable='yes'>z900.3</model>
>>> +      <model usable='yes'>z890-base</model>
>>> +      <model usable='yes'>z890</model>
>>> +      <model usable='yes'>z990.4-base</model>
>>> +      <model usable='yes'>z10BC.2-base</model>
>>> +      <model usable='yes'>z900.2</model>
>>> +      <model usable='yes'>z9BC.2-base</model>
>>> +      <model usable='yes'>z800</model>
>>> +      <model usable='yes'>z114</model>
>>> +      <model usable='yes'>z13</model>
>>> +      <model usable='yes'>z13s-base</model>
>>> +      <model usable='yes'>z990</model>
>>> +      <model usable='yes'>z990.2</model>
>>> +      <model usable='yes'>z14-base</model>
>>> +      <model usable='yes'>z890.2-base</model>
>>> +      <model usable='yes'>z196</model>
>>> +      <model usable='yes'>z10EC</model>
>>> +      <model usable='yes'>z13s</model>
>>> +      <model usable='yes'>z900</model>
>>> +      <model usable='yes'>z10EC.3</model>
>>> +      <model usable='yes'>z10EC.2-base</model>
>>> +      <model usable='yes'>z114-base</model>
>>> +      <model usable='yes'>z990.2-base</model>
>>> +      <model usable='yes'>z9EC.2-base</model>
>>> +      <model usable='yes'>z890.3</model>
>>> +      <model usable='yes'>z900.3-base</model>
>>> +      <model usable='yes'>z9BC.2</model>
>>> +      <model usable='yes'>z10BC</model>
>>> +      <model usable='yes'>z990.5</model>
>>> +      <model usable='yes'>zEC12.2</model>
>>> +      <model usable='yes'>z10EC-base</model>
>>> +      <model usable='yes'>z9EC-base</model>
>>> +      <model usable='yes'>z9EC.3-base</model>
>>> +      <model usable='yes'>zEC12</model>
>>> +      <model usable='yes'>z990.5-base</model>
>>> +      <model usable='yes'>z10BC-base</model>
>>> +      <model usable='yes'>z900-base</model>
>>> +      <model usable='yes'>z13.2</model>
>>> +      <model usable='yes'>z890.3-base</model>
>>> +      <model usable='yes'>zBC12-base</model>
>>> +      <model usable='yes'>z13.2-base</model>
>>> +      <model usable='yes'>z990-base</model>
>>> +      <model usable='yes'>z10EC.2</model>
>>> +      <model usable='yes'>z9BC</model>
>>> +      <model usable='yes'>z10EC.3-base</model>
>>> +      <model usable='yes'>z990.3-base</model>
>>> +    </mode>
>>>     </cpu>
>>>     <devices>
>>>       <disk supported='yes'>
>>> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
>>> b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
>>> index a93e5984c6..29c3403550 100644
>>> --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
>>> +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
>>> @@ -2,14 +2,13 @@
>>>     "QMP": {
>>>       "version": {
>>>         "qemu": {
>>> -        "micro": 90,
>>> -        "minor": 11,
>>> +        "micro": 0,
>>> +        "minor": 12,
>>>           "major": 2
>>>         },
>>> -      "package": "v2.12.0-rc0"
>>> +      "package": ""
>>
>> This in particular concerns me as, I think it should be :
>>
>>           "package": "v2.12.0"
>>
> See two below.
> 
>>>       },
>>>       "capabilities": [
>>> -      "oob"
>>>       ]
>>>     }
>>>   }
>>> @@ -23,11 +22,11 @@
>>>   {
>>>     "return": {
>>>       "qemu": {
>>> -      "micro": 90,
>>> -      "minor": 11,
>>> +      "micro": 0,
>>> +      "minor": 12,
>>>         "major": 2
>>>       },
>>> -    "package": "v2.12.0-rc0"
>>> +    "package": ""
>>
>> Likewise...
>>
>>>     },
>>>     "id": "libvirt-2"
>>>   }
>>> @@ -530,7 +529,7 @@
>>>     {
>>>     "return": {
>>> -    "fd": 17,
>>> +    "fd": 18,
>>>       "fdset-id": 0
>>>     },
>>>     "id": "libvirt-5"
>>> @@ -546,7 +545,7 @@
>>>     {
>>>     "return": {
>>> -    "enabled": false,
>>> +    "enabled": true,
>>>       "present": true
>>>     },
>>
>> BTW: This is why I think you used real hardware and the previous one was
>> built using just the emulator. I believe this is the response from the
>> qemuMonitorJSONGetKVMState call in virQEMUCapsProbeQMPKVMState.
>>
>> Which if I'm reading things correctly perhaps explains differences later
>> on here for unavailable cpu features in the existing replies file [I've
>> cut that out of this reply, but can be seen in the original diff...
> Correct.
> 
>>
>>>     "id": "libvirt-7"
>>> @@ -1241,10 +1240,6 @@
>>>         "name": "fw_cfg_io",
>>>         "parent": "fw_cfg"
>>>       },
>>
>> [...]
>>
>>> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
>>> b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
>>> index 607274ebb7..c486340c7d 100644
>>> --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
>>> +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
>>> @@ -3,7 +3,7 @@
>>>     <selfctime>0</selfctime>
>>>     <selfvers>0</selfvers>
>>>     <usedQMP/>
>>> -  <flag name='enable-kvm'/>
>>> +  <flag name='kvm'/>
>>>     <flag name='boot-index'/>
>>>     <flag name='virtio-tx-alg'/>
>>>     <flag name='virtio-blk-pci.ioeventfd'/>
>>> @@ -126,11 +126,108 @@
>>>     <flag name='virtual-css-bridge'/>
>>>     <flag name='virtual-css-bridge.cssid-unrestricted'/>
>>>     <flag name='vfio-ccw'/>
>>> -  <version>2011090</version>
>>> +  <version>2012000</version>
>>>     <kvmVersion>0</kvmVersion>
>>> -  <microcodeVersion>0</microcodeVersion>
>>> -  <package>v2.12.0-rc0</package>
>>> +  <microcodeVersion>371055</microcodeVersion>
>>> +  <package></package>
>>
>> This would be filled in from the replies, but I don't believe it should
>> be empty
> Looking in the replies file it is empty and it also has been empty in
> the past.
> Running  qemu-system-s390x --version
> QEMU emulator version 2.12.0
> Copyright (c) 2003-2017 Fabrice Bellard and the QEMU Project developers
> 
> 
>>
>>>     <arch>s390x</arch>
>>
>> [...]
>>
>> John
>>
>>
>>
>> -- 
>> libvir-list mailing list
>> libvir-list@redhat.com
>> https://www.redhat.com/mailman/listinfo/libvir-list
>>
> 
> 

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] tests: Update caps for QEMU 2.12.0 on s390x
Posted by Boris Fiuczynski, 6 days ago
On 05/16/2018 04:41 PM, John Ferlan wrote:
> I'll add the following to the commit message:
> 
> Used a z14 using a QEMU 2.12 GA build and the following sequence:
> 
>    tests/qemucapsprobe /path/to/s390x-softmmu/qemu-system-s390x > \
>           tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
Hi John,
before you push you should adjust the commit message a bit
We used the command
tests/qemucapsprobe /usr/bin/qemu-system-s390x

> 
>    VIR_TEST_REGENERATE_OUTPUT=1 tests/qemucapabilitiestest
>    VIR_TEST_REGENERATE_OUTPUT=1 tests/domaincapstest
> 
> 
> I also checked the 2.11 set that Shalini produced (commit id ab9e2041c)
> and saw that package was empty there as well (should have thought of
> that yesterday ;-))
> 
> So consider this
> 
> Reviewed-by: John Ferlan<jferlan@redhat.com>
> 
> and I've merged in the adjustment from yesterday for "<flag name='sdl-gl'/>"
> 
> I will push the changes later...
> 
> Tks -
> 
> John
> 


-- 
Mit freundlichen Grüßen/Kind regards
    Boris Fiuczynski

IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Martina Köderitz
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] tests: Update caps for QEMU 2.12.0 on s390x
Posted by Shalini Chellathurai Saroja, 6 days ago

On 05/16/2018 04:41 PM, John Ferlan wrote:
>
> On 05/16/2018 04:40 AM, Boris Fiuczynski wrote:
>> On 05/15/2018 10:37 PM, John Ferlan wrote:
>>>
>>> On 05/15/2018 07:46 AM, Shalini Chellathurai Saroja wrote:
>>>> Let us update the existing xml and replies files for QEMU 2.12.0 on
>>>> s390x.
>>>>
>>>> Signed-off-by: Shalini Chellathurai Saroja <shalini@linux.vnet.ibm.com>
>>>> ---
>>>>    tests/domaincapsschemadata/qemu_2.12.0.s390x.xml   |   99 +-
>>>>    .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 5001
>>>> +++++++++++---------
>>>>    tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   |  113 +-
>>>>    3 files changed, 2974 insertions(+), 2239 deletions(-)
>>>>
>>> Curious about your process for creating the files due to the differences
>>> seen. I assume you use real hardware...
>>>
>>> For x86_64, I will build a QEMU using the v2.12 tag, then in my libvirt
>>> tree run:
>>>
>>>       tests/qemucapsprobe /home/qemu/x86_64-softmmu/qemu-system-x86_64 > \
>>>           tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
>>>
>>>       VIR_TEST_REGENERATE_OUTPUT=1 tests/qemucapabilitiestest
>>>       VIR_TEST_REGENERATE_OUTPUT=1 tests/domaincapstest
>>>
>>>
>>> My purpose for asking is to know if real hardware was used and then to
>>> be able to have a "history" of how the previous version built the files
>>> so that the next time someone comes along they can use the same process.
>> Shalini used the process you outlined above on a z14. She also used a
>> 2.12 GA qemu build on s390.
>> My expectation of the qemucapabilitiestest has been so far that these
>> tests are trying to be a reality check against an architecture which
>> obviously should use replies files generated on real hardware of the
>> architecture.
>>
> I'll add the following to the commit message:
>
> Used a z14 using a QEMU 2.12 GA build and the following sequence:
>
>    tests/qemucapsprobe /path/to/s390x-softmmu/qemu-system-s390x > \
>           tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
>
>    VIR_TEST_REGENERATE_OUTPUT=1 tests/qemucapabilitiestest
>    VIR_TEST_REGENERATE_OUTPUT=1 tests/domaincapstest
>
>
> I also checked the 2.11 set that Shalini produced (commit id ab9e2041c)
> and saw that package was empty there as well (should have thought of
> that yesterday ;-))
>
> So consider this
>
> Reviewed-by: John Ferlan <jferlan@redhat.com>
>
> and I've merged in the adjustment from yesterday for "<flag name='sdl-gl'/>"
>
> I will push the changes later...

Thank you :-).

>
> Tks -
>
> John
>
>>> If I run the same sequence above on my x86_64 box, but use the s390x
>>> emulator - I get different results - not unexpected for some things...
>>> One difference that causes me to wonder is I have spice flag being set,
>>> but this reply doesn't. It's strange and I'm not quite sure what's
>>> happening at this point!
>>>
>>>> diff --git a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
>>>> b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
>>>> index 4bacb879fe..1475451e68 100644
>>>> --- a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
>>>> +++ b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml
>>>> @@ -22,8 +22,103 @@
>>>>      </os>
>>>>      <cpu>
>>>>        <mode name='host-passthrough' supported='yes'/>
>>>> -    <mode name='host-model' supported='no'/>
>>>> -    <mode name='custom' supported='no'/>
>>> Based on these, I have a feeling the current files may have been built
>>> in an emulated environment, but that's just my gut feel.  Nothing
>>> necessarily wrong with what you did.
>> We have not produced the previous set of 2.12. Andrea Bolognani did
>> create them and I agree that it must have been on an emulated environment.
>>
>>>> +    <mode name='host-model' supported='yes'>
>>>> +      <model fallback='forbid'>z14-base</model>
>>>> +      <feature policy='require' name='aen'/>
>>>> +      <feature policy='require' name='aefsi'/>
>>>> +      <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='ri'/>
>>>> +      <feature policy='require' name='edat2'/>
>>>> +      <feature policy='require' name='vx'/>
>>>> +      <feature policy='require' name='ipter'/>
>>>> +      <feature policy='require' name='vxeh'/>
>>>> +      <feature policy='require' name='vxpd'/>
>>>> +      <feature policy='require' name='esop'/>
>>>> +      <feature policy='require' name='iep'/>
>>>> +      <feature policy='require' name='cte'/>
>>>> +      <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'/>
>>>> +      <feature policy='require' name='cmm'/>
>>>> +    </mode>
>>>> +    <mode name='custom' supported='yes'>
>>>> +      <model usable='yes'>z890.2</model>
>>>> +      <model usable='yes'>z990.4</model>
>>>> +      <model usable='yes'>z10BC.2</model>
>>>> +      <model usable='yes'>z196.2</model>
>>>> +      <model usable='yes'>z14</model>
>>>> +      <model usable='yes'>z9BC-base</model>
>>>> +      <model usable='yes'>zEC12-base</model>
>>>> +      <model usable='yes'>z196-base</model>
>>>> +      <model usable='yes'>z13-base</model>
>>>> +      <model usable='yes'>z990.3</model>
>>>> +      <model usable='yes'>z9EC</model>
>>>> +      <model usable='yes'>zBC12</model>
>>>> +      <model usable='yes'>z9EC.3</model>
>>>> +      <model usable='yes'>z196.2-base</model>
>>>> +      <model usable='no'>qemu</model>
>>>> +      <model usable='yes'>zEC12.2-base</model>
>>>> +      <model usable='yes'>z800-base</model>
>>>> +      <model usable='yes'>z9EC.2</model>
>>>> +      <model usable='yes'>z900.2-base</model>
>>>> +      <model usable='yes'>z900.3</model>
>>>> +      <model usable='yes'>z890-base</model>
>>>> +      <model usable='yes'>z890</model>
>>>> +      <model usable='yes'>z990.4-base</model>
>>>> +      <model usable='yes'>z10BC.2-base</model>
>>>> +      <model usable='yes'>z900.2</model>
>>>> +      <model usable='yes'>z9BC.2-base</model>
>>>> +      <model usable='yes'>z800</model>
>>>> +      <model usable='yes'>z114</model>
>>>> +      <model usable='yes'>z13</model>
>>>> +      <model usable='yes'>z13s-base</model>
>>>> +      <model usable='yes'>z990</model>
>>>> +      <model usable='yes'>z990.2</model>
>>>> +      <model usable='yes'>z14-base</model>
>>>> +      <model usable='yes'>z890.2-base</model>
>>>> +      <model usable='yes'>z196</model>
>>>> +      <model usable='yes'>z10EC</model>
>>>> +      <model usable='yes'>z13s</model>
>>>> +      <model usable='yes'>z900</model>
>>>> +      <model usable='yes'>z10EC.3</model>
>>>> +      <model usable='yes'>z10EC.2-base</model>
>>>> +      <model usable='yes'>z114-base</model>
>>>> +      <model usable='yes'>z990.2-base</model>
>>>> +      <model usable='yes'>z9EC.2-base</model>
>>>> +      <model usable='yes'>z890.3</model>
>>>> +      <model usable='yes'>z900.3-base</model>
>>>> +      <model usable='yes'>z9BC.2</model>
>>>> +      <model usable='yes'>z10BC</model>
>>>> +      <model usable='yes'>z990.5</model>
>>>> +      <model usable='yes'>zEC12.2</model>
>>>> +      <model usable='yes'>z10EC-base</model>
>>>> +      <model usable='yes'>z9EC-base</model>
>>>> +      <model usable='yes'>z9EC.3-base</model>
>>>> +      <model usable='yes'>zEC12</model>
>>>> +      <model usable='yes'>z990.5-base</model>
>>>> +      <model usable='yes'>z10BC-base</model>
>>>> +      <model usable='yes'>z900-base</model>
>>>> +      <model usable='yes'>z13.2</model>
>>>> +      <model usable='yes'>z890.3-base</model>
>>>> +      <model usable='yes'>zBC12-base</model>
>>>> +      <model usable='yes'>z13.2-base</model>
>>>> +      <model usable='yes'>z990-base</model>
>>>> +      <model usable='yes'>z10EC.2</model>
>>>> +      <model usable='yes'>z9BC</model>
>>>> +      <model usable='yes'>z10EC.3-base</model>
>>>> +      <model usable='yes'>z990.3-base</model>
>>>> +    </mode>
>>>>      </cpu>
>>>>      <devices>
>>>>        <disk supported='yes'>
>>>> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
>>>> b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
>>>> index a93e5984c6..29c3403550 100644
>>>> --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
>>>> +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
>>>> @@ -2,14 +2,13 @@
>>>>      "QMP": {
>>>>        "version": {
>>>>          "qemu": {
>>>> -        "micro": 90,
>>>> -        "minor": 11,
>>>> +        "micro": 0,
>>>> +        "minor": 12,
>>>>            "major": 2
>>>>          },
>>>> -      "package": "v2.12.0-rc0"
>>>> +      "package": ""
>>> This in particular concerns me as, I think it should be :
>>>
>>>            "package": "v2.12.0"
>>>
>> See two below.
>>
>>>>        },
>>>>        "capabilities": [
>>>> -      "oob"
>>>>        ]
>>>>      }
>>>>    }
>>>> @@ -23,11 +22,11 @@
>>>>    {
>>>>      "return": {
>>>>        "qemu": {
>>>> -      "micro": 90,
>>>> -      "minor": 11,
>>>> +      "micro": 0,
>>>> +      "minor": 12,
>>>>          "major": 2
>>>>        },
>>>> -    "package": "v2.12.0-rc0"
>>>> +    "package": ""
>>> Likewise...
>>>
>>>>      },
>>>>      "id": "libvirt-2"
>>>>    }
>>>> @@ -530,7 +529,7 @@
>>>>      {
>>>>      "return": {
>>>> -    "fd": 17,
>>>> +    "fd": 18,
>>>>        "fdset-id": 0
>>>>      },
>>>>      "id": "libvirt-5"
>>>> @@ -546,7 +545,7 @@
>>>>      {
>>>>      "return": {
>>>> -    "enabled": false,
>>>> +    "enabled": true,
>>>>        "present": true
>>>>      },
>>> BTW: This is why I think you used real hardware and the previous one was
>>> built using just the emulator. I believe this is the response from the
>>> qemuMonitorJSONGetKVMState call in virQEMUCapsProbeQMPKVMState.
>>>
>>> Which if I'm reading things correctly perhaps explains differences later
>>> on here for unavailable cpu features in the existing replies file [I've
>>> cut that out of this reply, but can be seen in the original diff...
>> Correct.
>>
>>>>      "id": "libvirt-7"
>>>> @@ -1241,10 +1240,6 @@
>>>>          "name": "fw_cfg_io",
>>>>          "parent": "fw_cfg"
>>>>        },
>>> [...]
>>>
>>>> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
>>>> b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
>>>> index 607274ebb7..c486340c7d 100644
>>>> --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
>>>> +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
>>>> @@ -3,7 +3,7 @@
>>>>      <selfctime>0</selfctime>
>>>>      <selfvers>0</selfvers>
>>>>      <usedQMP/>
>>>> -  <flag name='enable-kvm'/>
>>>> +  <flag name='kvm'/>
>>>>      <flag name='boot-index'/>
>>>>      <flag name='virtio-tx-alg'/>
>>>>      <flag name='virtio-blk-pci.ioeventfd'/>
>>>> @@ -126,11 +126,108 @@
>>>>      <flag name='virtual-css-bridge'/>
>>>>      <flag name='virtual-css-bridge.cssid-unrestricted'/>
>>>>      <flag name='vfio-ccw'/>
>>>> -  <version>2011090</version>
>>>> +  <version>2012000</version>
>>>>      <kvmVersion>0</kvmVersion>
>>>> -  <microcodeVersion>0</microcodeVersion>
>>>> -  <package>v2.12.0-rc0</package>
>>>> +  <microcodeVersion>371055</microcodeVersion>
>>>> +  <package></package>
>>> This would be filled in from the replies, but I don't believe it should
>>> be empty
>> Looking in the replies file it is empty and it also has been empty in
>> the past.
>> Running  qemu-system-s390x --version
>> QEMU emulator version 2.12.0
>> Copyright (c) 2003-2017 Fabrice Bellard and the QEMU Project developers
>>
>>
>>>>      <arch>s390x</arch>
>>> [...]
>>>
>>> John
>>>
>>>
>>>
>>> -- 
>>> libvir-list mailing list
>>> libvir-list@redhat.com
>>> https://www.redhat.com/mailman/listinfo/libvir-list
>>>
>>
> --
> libvir-list mailing list
> libvir-list@redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list