From fd10c72f1cd68ad2dbde680194a2cc7e14da875c Mon Sep 17 00:00:00 2001
From: Andrea Bolognani <abologna@redhat.com>
Date: Tue, 29 Mar 2022 15:13:02 +0200
Subject: [PATCH] tests: Update capabilities for QEMU 7.0.0 on x86_64

The QEMU binary is built from the v7.0.0-rc2 tag.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  |    1 +
 tests/domaincapsdata/qemu_7.0.0.x86_64.xml    |    1 +
 .../caps_7.0.0.x86_64.replies                 | 2635 +++++++++--------
 .../caps_7.0.0.x86_64.xml                     |   90 +-
 .../cpu-host-model.x86_64-latest.args         |    2 +-
 5 files changed, 1517 insertions(+), 1212 deletions(-)

diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
index 6a660a02b7..1f56616587 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -56,6 +56,7 @@
       <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
       <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='tsc-scale'/>
       <feature policy='require' name='svme-addr-chk'/>
       <feature policy='require' name='rdctl-no'/>
       <feature policy='require' name='skip-l1dfl-vmentry'/>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 2a325e3e32..71532ad0ed 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -55,6 +55,7 @@
       <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
       <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='tsc-scale'/>
       <feature policy='require' name='svme-addr-chk'/>
       <feature policy='require' name='rdctl-no'/>
       <feature policy='require' name='skip-l1dfl-vmentry'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
index 82ccbab6eb..f8973143dd 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
@@ -17,11 +17,11 @@
 {
   "return": {
     "qemu": {
-      "micro": 50,
+      "micro": 92,
       "minor": 2,
       "major": 6
     },
-    "package": "v6.2.0-2347-gd9ccf33f94"
+    "package": "v7.0.0-rc2"
   },
   "id": "libvirt-2"
 }
@@ -5120,15 +5120,15 @@
       "tag": "type",
       "variants": [
         {
-          "case": "curses",
-          "type": "359"
+          "case": "gtk",
+          "type": "358"
         },
         {
-          "case": "egl-headless",
+          "case": "curses",
           "type": "360"
         },
         {
-          "case": "dbus",
+          "case": "egl-headless",
           "type": "361"
         },
         {
@@ -5182,13 +5182,13 @@
       "variants": [
         {
           "case": "vnc",
-          "type": "363"
+          "type": "364"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "362"
+          "type": "363"
         }
       ],
       "meta-type": "object"
@@ -5199,27 +5199,27 @@
         {
           "name": "status",
           "default": null,
-          "type": "364"
+          "type": "365"
         },
         {
           "name": "ram",
           "default": null,
-          "type": "365"
+          "type": "366"
         },
         {
           "name": "disk",
           "default": null,
-          "type": "365"
+          "type": "366"
         },
         {
           "name": "vfio",
           "default": null,
-          "type": "366"
+          "type": "367"
         },
         {
           "name": "xbzrle-cache",
           "default": null,
-          "type": "367"
+          "type": "368"
         },
         {
           "name": "total-time",
@@ -5269,12 +5269,12 @@
         {
           "name": "compression",
           "default": null,
-          "type": "368"
+          "type": "369"
         },
         {
           "name": "socket-address",
           "default": null,
-          "type": "[369]"
+          "type": "[370]"
         }
       ],
       "meta-type": "object"
@@ -5299,7 +5299,7 @@
       "members": [
         {
           "name": "capability",
-          "type": "370"
+          "type": "371"
         },
         {
           "name": "state",
@@ -5432,7 +5432,7 @@
         {
           "name": "multifd-compression",
           "default": null,
-          "type": "371"
+          "type": "372"
         },
         {
           "name": "multifd-zlib-level",
@@ -5447,7 +5447,7 @@
         {
           "name": "block-bitmap-mapping",
           "default": null,
-          "type": "[372]"
+          "type": "[373]"
         }
       ],
       "meta-type": "object"
@@ -5576,7 +5576,7 @@
         {
           "name": "multifd-compression",
           "default": null,
-          "type": "371"
+          "type": "372"
         },
         {
           "name": "multifd-zlib-level",
@@ -5591,7 +5591,7 @@
         {
           "name": "block-bitmap-mapping",
           "default": null,
-          "type": "[372]"
+          "type": "[373]"
         }
       ],
       "meta-type": "object"
@@ -5630,7 +5630,7 @@
       "members": [
         {
           "name": "status",
-          "type": "364"
+          "type": "365"
         }
       ],
       "meta-type": "object"
@@ -5650,11 +5650,11 @@
       "members": [
         {
           "name": "mode",
-          "type": "373"
+          "type": "374"
         },
         {
           "name": "reason",
-          "type": "374"
+          "type": "375"
         }
       ],
       "meta-type": "object"
@@ -5664,7 +5664,7 @@
       "members": [
         {
           "name": "state",
-          "type": "364"
+          "type": "365"
         }
       ],
       "meta-type": "object"
@@ -5783,15 +5783,15 @@
       "members": [
         {
           "name": "mode",
-          "type": "373"
+          "type": "374"
         },
         {
           "name": "last-mode",
-          "type": "373"
+          "type": "374"
         },
         {
           "name": "reason",
-          "type": "374"
+          "type": "375"
         }
       ],
       "meta-type": "object"
@@ -5831,7 +5831,7 @@
         {
           "name": "mode",
           "default": null,
-          "type": "375"
+          "type": "376"
         }
       ],
       "meta-type": "object"
@@ -5846,7 +5846,7 @@
         },
         {
           "name": "status",
-          "type": "376"
+          "type": "377"
         },
         {
           "name": "start-time",
@@ -5862,12 +5862,12 @@
         },
         {
           "name": "mode",
-          "type": "375"
+          "type": "376"
         },
         {
           "name": "vcpu-dirty-rate",
           "default": null,
-          "type": "[377]"
+          "type": "[378]"
         }
       ],
       "meta-type": "object"
@@ -5939,12 +5939,12 @@
       "members": [
         {
           "name": "actions",
-          "type": "[378]"
+          "type": "[379]"
         },
         {
           "name": "properties",
           "default": null,
-          "type": "379"
+          "type": "380"
         }
       ],
       "meta-type": "object"
@@ -5978,7 +5978,7 @@
         },
         {
           "name": "state",
-          "type": "380"
+          "type": "381"
         },
         {
           "name": "vcpu",
@@ -6017,7 +6017,7 @@
         {
           "name": "enable",
           "default": null,
-          "type": "[381]"
+          "type": "[382]"
         }
       ],
       "meta-type": "object"
@@ -6027,7 +6027,7 @@
       "members": [
         {
           "name": "qemu",
-          "type": "382"
+          "type": "383"
         },
         {
           "name": "package",
@@ -6062,31 +6062,31 @@
       "variants": [
         {
           "case": "builtin",
-          "type": "384"
-        },
-        {
-          "case": "enum",
           "type": "385"
         },
         {
-          "case": "array",
+          "case": "enum",
           "type": "386"
         },
         {
-          "case": "object",
+          "case": "array",
           "type": "387"
         },
         {
-          "case": "alternate",
+          "case": "object",
           "type": "388"
         },
         {
-          "case": "command",
+          "case": "alternate",
           "type": "389"
         },
         {
-          "case": "event",
+          "case": "command",
           "type": "390"
+        },
+        {
+          "case": "event",
+          "type": "391"
         }
       ],
       "members": [
@@ -6096,7 +6096,7 @@
         },
         {
           "name": "meta-type",
-          "type": "383"
+          "type": "384"
         },
         {
           "name": "features",
@@ -6239,152 +6239,152 @@
       "variants": [
         {
           "case": "authz-list",
-          "type": "392"
-        },
-        {
-          "case": "authz-listfile",
           "type": "393"
         },
         {
-          "case": "authz-pam",
+          "case": "authz-listfile",
           "type": "394"
         },
         {
-          "case": "authz-simple",
+          "case": "authz-pam",
           "type": "395"
         },
         {
-          "case": "can-host-socketcan",
+          "case": "authz-simple",
           "type": "396"
         },
         {
-          "case": "colo-compare",
+          "case": "can-host-socketcan",
           "type": "397"
         },
+        {
+          "case": "colo-compare",
+          "type": "398"
+        },
         {
           "case": "cryptodev-backend",
-          "type": "398"
-        },
-        {
-          "case": "cryptodev-backend-builtin",
-          "type": "398"
-        },
-        {
-          "case": "cryptodev-vhost-user",
           "type": "399"
         },
         {
-          "case": "dbus-vmstate",
+          "case": "cryptodev-backend-builtin",
+          "type": "399"
+        },
+        {
+          "case": "cryptodev-vhost-user",
           "type": "400"
         },
         {
-          "case": "filter-buffer",
+          "case": "dbus-vmstate",
           "type": "401"
         },
         {
-          "case": "filter-dump",
+          "case": "filter-buffer",
           "type": "402"
         },
         {
-          "case": "filter-mirror",
+          "case": "filter-dump",
           "type": "403"
         },
         {
-          "case": "filter-redirector",
+          "case": "filter-mirror",
           "type": "404"
         },
         {
-          "case": "filter-replay",
+          "case": "filter-redirector",
           "type": "405"
         },
         {
-          "case": "filter-rewriter",
+          "case": "filter-replay",
           "type": "406"
         },
         {
-          "case": "input-barrier",
+          "case": "filter-rewriter",
           "type": "407"
         },
         {
-          "case": "input-linux",
+          "case": "input-barrier",
           "type": "408"
         },
         {
-          "case": "iothread",
+          "case": "input-linux",
           "type": "409"
         },
         {
-          "case": "memory-backend-epc",
+          "case": "iothread",
           "type": "410"
         },
         {
-          "case": "memory-backend-file",
+          "case": "memory-backend-epc",
           "type": "411"
         },
         {
-          "case": "memory-backend-memfd",
+          "case": "memory-backend-file",
           "type": "412"
         },
         {
-          "case": "memory-backend-ram",
+          "case": "memory-backend-memfd",
           "type": "413"
         },
         {
-          "case": "pr-manager-helper",
+          "case": "memory-backend-ram",
           "type": "414"
         },
         {
-          "case": "qtest",
+          "case": "pr-manager-helper",
           "type": "415"
         },
         {
-          "case": "rng-builtin",
+          "case": "qtest",
           "type": "416"
         },
         {
-          "case": "rng-egd",
+          "case": "rng-builtin",
           "type": "417"
         },
         {
-          "case": "rng-random",
+          "case": "rng-egd",
           "type": "418"
         },
         {
-          "case": "secret",
+          "case": "rng-random",
           "type": "419"
         },
         {
-          "case": "secret_keyring",
+          "case": "secret",
           "type": "420"
         },
         {
-          "case": "sev-guest",
+          "case": "secret_keyring",
           "type": "421"
         },
         {
-          "case": "throttle-group",
+          "case": "sev-guest",
           "type": "422"
         },
         {
-          "case": "tls-creds-anon",
+          "case": "throttle-group",
           "type": "423"
         },
         {
-          "case": "tls-creds-psk",
+          "case": "tls-creds-anon",
           "type": "424"
         },
         {
-          "case": "tls-creds-x509",
+          "case": "tls-creds-psk",
           "type": "425"
         },
         {
-          "case": "tls-cipher-suites",
+          "case": "tls-creds-x509",
           "type": "426"
         },
         {
-          "case": "x-remote-object",
+          "case": "tls-cipher-suites",
           "type": "427"
         },
+        {
+          "case": "x-remote-object",
+          "type": "428"
+        },
         {
           "case": "can-bus",
           "type": "0"
@@ -6401,7 +6401,7 @@
       "members": [
         {
           "name": "qom-type",
-          "type": "391"
+          "type": "392"
         },
         {
           "name": "id",
@@ -6501,7 +6501,7 @@
       "variants": [
         {
           "case": "s390x",
-          "type": "430"
+          "type": "431"
         },
         {
           "case": "aarch64",
@@ -6636,11 +6636,11 @@
         {
           "name": "props",
           "default": null,
-          "type": "428"
+          "type": "429"
         },
         {
           "name": "target",
-          "type": "429"
+          "type": "430"
         }
       ],
       "meta-type": "object"
@@ -6711,7 +6711,7 @@
       "members": [
         {
           "name": "arch",
-          "type": "429"
+          "type": "430"
         }
       ],
       "meta-type": "object"
@@ -6835,7 +6835,7 @@
         },
         {
           "name": "policy",
-          "type": "431"
+          "type": "432"
         }
       ],
       "meta-type": "object"
@@ -6858,7 +6858,7 @@
         },
         {
           "name": "props",
-          "type": "428"
+          "type": "429"
         },
         {
           "name": "qom-path",
@@ -6874,29 +6874,29 @@
       "variants": [
         {
           "case": "node",
-          "type": "433"
-        },
-        {
-          "case": "dist",
           "type": "434"
         },
         {
-          "case": "cpu",
+          "case": "dist",
           "type": "435"
         },
         {
-          "case": "hmat-lb",
+          "case": "cpu",
           "type": "436"
         },
         {
-          "case": "hmat-cache",
+          "case": "hmat-lb",
           "type": "437"
+        },
+        {
+          "case": "hmat-cache",
+          "type": "438"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "432"
+          "type": "433"
         }
       ],
       "meta-type": "object"
@@ -6957,29 +6957,29 @@
       "variants": [
         {
           "case": "dimm",
-          "type": "439"
-        },
-        {
-          "case": "nvdimm",
-          "type": "439"
-        },
-        {
-          "case": "virtio-pmem",
           "type": "440"
         },
         {
-          "case": "virtio-mem",
+          "case": "nvdimm",
+          "type": "440"
+        },
+        {
+          "case": "virtio-pmem",
           "type": "441"
         },
         {
-          "case": "sgx-epc",
+          "case": "virtio-mem",
           "type": "442"
+        },
+        {
+          "case": "sgx-epc",
+          "type": "443"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "438"
+          "type": "439"
         }
       ],
       "meta-type": "object"
@@ -7032,11 +7032,11 @@
       "members": [
         {
           "name": "type",
-          "type": "445"
+          "type": "446"
         },
         {
           "name": "model",
-          "type": "443"
+          "type": "444"
         }
       ],
       "meta-type": "object"
@@ -7046,7 +7046,7 @@
       "members": [
         {
           "name": "model",
-          "type": "443"
+          "type": "444"
         }
       ],
       "meta-type": "object"
@@ -7098,7 +7098,7 @@
       "members": [
         {
           "name": "mode",
-          "type": "446"
+          "type": "447"
         },
         {
           "name": "filename",
@@ -7153,11 +7153,11 @@
       "variants": [
         {
           "case": "block-node",
-          "type": "448"
+          "type": "449"
         },
         {
           "case": "chardev",
-          "type": "449"
+          "type": "450"
         },
         {
           "case": "migration",
@@ -7167,7 +7167,7 @@
       "members": [
         {
           "name": "type",
-          "type": "447"
+          "type": "448"
         }
       ],
       "meta-type": "object"
@@ -7336,7 +7336,7 @@
         },
         {
           "name": "fds",
-          "type": "[450]"
+          "type": "[451]"
         }
       ],
       "meta-type": "object"
@@ -7366,7 +7366,7 @@
         },
         {
           "name": "parameters",
-          "type": "[451]"
+          "type": "[452]"
         }
       ],
       "meta-type": "object"
@@ -7410,7 +7410,7 @@
         },
         {
           "name": "state",
-          "type": "452"
+          "type": "453"
         },
         {
           "name": "handle",
@@ -7518,7 +7518,7 @@
         },
         {
           "name": "sections",
-          "type": "[453]"
+          "type": "[454]"
         }
       ],
       "meta-type": "object"
@@ -7542,7 +7542,7 @@
         },
         {
           "name": "slot-type",
-          "type": "454"
+          "type": "455"
         },
         {
           "name": "source",
@@ -7579,7 +7579,7 @@
         },
         {
           "name": "devices",
-          "type": "[455]"
+          "type": "[456]"
         }
       ],
       "meta-type": "object"
@@ -7823,17 +7823,17 @@
       "variants": [
         {
           "case": "hyper-v",
-          "type": "457"
+          "type": "458"
         },
         {
           "case": "s390",
-          "type": "458"
+          "type": "459"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "456"
+          "type": "457"
         }
       ],
       "meta-type": "object"
@@ -8052,22 +8052,22 @@
         },
         {
           "name": "timed_stats",
-          "type": "[459]"
+          "type": "[460]"
         },
         {
           "name": "rd_latency_histogram",
           "default": null,
-          "type": "460"
+          "type": "461"
         },
         {
           "name": "wr_latency_histogram",
           "default": null,
-          "type": "460"
+          "type": "461"
         },
         {
           "name": "flush_latency_histogram",
           "default": null,
-          "type": "460"
+          "type": "461"
         }
       ],
       "meta-type": "object"
@@ -8078,15 +8078,15 @@
       "variants": [
         {
           "case": "file",
-          "type": "461"
+          "type": "462"
         },
         {
           "case": "host_device",
-          "type": "461"
+          "type": "462"
         },
         {
           "case": "nvme",
-          "type": "462"
+          "type": "463"
         },
         {
           "case": "blkdebug",
@@ -8506,7 +8506,7 @@
         {
           "name": "format-specific",
           "default": null,
-          "type": "463"
+          "type": "464"
         }
       ],
       "meta-type": "object"
@@ -8584,7 +8584,7 @@
         },
         {
           "name": "type",
-          "type": "464"
+          "type": "465"
         },
         {
           "name": "name",
@@ -8615,11 +8615,11 @@
         },
         {
           "name": "perm",
-          "type": "[465]"
+          "type": "[466]"
         },
         {
           "name": "shared-perm",
-          "type": "[465]"
+          "type": "[466]"
         }
       ],
       "meta-type": "object"
@@ -8870,7 +8870,7 @@
       "members": [
         {
           "name": "image",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "config",
@@ -8910,22 +8910,22 @@
         {
           "name": "inject-error",
           "default": null,
-          "type": "[467]"
+          "type": "[468]"
         },
         {
           "name": "set-state",
           "default": null,
-          "type": "[468]"
+          "type": "[469]"
         },
         {
           "name": "take-child-perms",
           "default": null,
-          "type": "[465]"
+          "type": "[466]"
         },
         {
           "name": "unshare-child-perms",
           "default": null,
-          "type": "[465]"
+          "type": "[466]"
         }
       ],
       "meta-type": "object"
@@ -8935,11 +8935,11 @@
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "log",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "log-sector-size",
@@ -8964,11 +8964,11 @@
       "members": [
         {
           "name": "test",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "raw",
-          "type": "466"
+          "type": "467"
         }
       ],
       "meta-type": "object"
@@ -8978,7 +8978,7 @@
       "members": [
         {
           "name": "image",
-          "type": "466"
+          "type": "467"
         }
       ],
       "meta-type": "object"
@@ -8988,7 +8988,7 @@
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         }
       ],
       "meta-type": "object"
@@ -8998,11 +8998,11 @@
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "target",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "bitmap",
@@ -9017,7 +9017,7 @@
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "bottom",
@@ -9042,12 +9042,12 @@
         {
           "name": "locking",
           "default": null,
-          "type": "469"
+          "type": "470"
         },
         {
           "name": "aio",
           "default": null,
-          "type": "470"
+          "type": "471"
         },
         {
           "name": "aio-max-batch",
@@ -9171,7 +9171,7 @@
         },
         {
           "name": "server",
-          "type": "[369]"
+          "type": "[370]"
         },
         {
           "name": "debug",
@@ -9296,7 +9296,7 @@
       "members": [
         {
           "name": "transport",
-          "type": "471"
+          "type": "472"
         },
         {
           "name": "portal",
@@ -9329,7 +9329,7 @@
         {
           "name": "header-digest",
           "default": null,
-          "type": "472"
+          "type": "473"
         },
         {
           "name": "timeout",
@@ -9344,7 +9344,7 @@
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "key-secret",
@@ -9359,7 +9359,7 @@
       "members": [
         {
           "name": "server",
-          "type": "369"
+          "type": "370"
         },
         {
           "name": "export",
@@ -9402,7 +9402,7 @@
       "members": [
         {
           "name": "server",
-          "type": "473"
+          "type": "474"
         },
         {
           "name": "path",
@@ -9481,7 +9481,7 @@
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "prealloc-align",
@@ -9501,12 +9501,12 @@
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "backing",
           "default": null,
-          "type": "474"
+          "type": "475"
         },
         {
           "name": "lazy-refcounts",
@@ -9531,7 +9531,7 @@
         {
           "name": "overlap-check",
           "default": null,
-          "type": "475"
+          "type": "476"
         },
         {
           "name": "cache-size",
@@ -9561,12 +9561,12 @@
         {
           "name": "encrypt",
           "default": null,
-          "type": "476"
+          "type": "477"
         },
         {
           "name": "data-file",
           "default": null,
-          "type": "466"
+          "type": "467"
         }
       ],
       "meta-type": "object"
@@ -9576,17 +9576,17 @@
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "backing",
           "default": null,
-          "type": "474"
+          "type": "475"
         },
         {
           "name": "encrypt",
           "default": null,
-          "type": "477"
+          "type": "478"
         }
       ],
       "meta-type": "object"
@@ -9596,12 +9596,12 @@
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "backing",
           "default": null,
-          "type": "474"
+          "type": "475"
         }
       ],
       "meta-type": "object"
@@ -9616,7 +9616,7 @@
         },
         {
           "name": "children",
-          "type": "[466]"
+          "type": "[467]"
         },
         {
           "name": "vote-threshold",
@@ -9630,7 +9630,7 @@
         {
           "name": "read-pattern",
           "default": null,
-          "type": "478"
+          "type": "479"
         }
       ],
       "meta-type": "object"
@@ -9640,7 +9640,7 @@
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "offset",
@@ -9684,7 +9684,7 @@
         {
           "name": "encrypt",
           "default": null,
-          "type": "479"
+          "type": "480"
         },
         {
           "name": "user",
@@ -9694,7 +9694,7 @@
         {
           "name": "auth-client-required",
           "default": null,
-          "type": "[480]"
+          "type": "[481]"
         },
         {
           "name": "key-secret",
@@ -9704,7 +9704,7 @@
         {
           "name": "server",
           "default": null,
-          "type": "[481]"
+          "type": "[482]"
         }
       ],
       "meta-type": "object"
@@ -9714,11 +9714,11 @@
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "mode",
-          "type": "482"
+          "type": "483"
         },
         {
           "name": "top-id",
@@ -9733,7 +9733,7 @@
       "members": [
         {
           "name": "server",
-          "type": "483"
+          "type": "484"
         },
         {
           "name": "path",
@@ -9747,7 +9747,7 @@
         {
           "name": "host-key-check",
           "default": null,
-          "type": "484"
+          "type": "485"
         }
       ],
       "meta-type": "object"
@@ -9761,7 +9761,7 @@
         },
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         }
       ],
       "meta-type": "object"
@@ -9807,60 +9807,60 @@
       "variants": [
         {
           "case": "file",
-          "type": "485"
-        },
-        {
-          "case": "gluster",
           "type": "486"
         },
         {
-          "case": "luks",
+          "case": "gluster",
           "type": "487"
         },
         {
-          "case": "nfs",
+          "case": "luks",
           "type": "488"
         },
         {
-          "case": "parallels",
+          "case": "nfs",
           "type": "489"
         },
         {
-          "case": "qcow",
+          "case": "parallels",
           "type": "490"
         },
         {
-          "case": "qcow2",
+          "case": "qcow",
           "type": "491"
         },
         {
-          "case": "qed",
+          "case": "qcow2",
           "type": "492"
         },
         {
-          "case": "rbd",
+          "case": "qed",
           "type": "493"
         },
         {
-          "case": "ssh",
+          "case": "rbd",
           "type": "494"
         },
         {
-          "case": "vdi",
+          "case": "ssh",
           "type": "495"
         },
         {
-          "case": "vhdx",
+          "case": "vdi",
           "type": "496"
         },
         {
-          "case": "vmdk",
+          "case": "vhdx",
           "type": "497"
         },
         {
-          "case": "vpc",
+          "case": "vmdk",
           "type": "498"
         },
+        {
+          "case": "vpc",
+          "type": "499"
+        },
         {
           "case": "blkdebug",
           "type": "0"
@@ -9988,11 +9988,11 @@
       "variants": [
         {
           "case": "luks",
-          "type": "499"
+          "type": "500"
         },
         {
           "case": "qcow2",
-          "type": "500"
+          "type": "501"
         },
         {
           "case": "blkdebug",
@@ -10281,25 +10281,25 @@
       "variants": [
         {
           "case": "inet",
-          "type": "502"
-        },
-        {
-          "case": "unix",
           "type": "503"
         },
         {
-          "case": "vsock",
+          "case": "unix",
           "type": "504"
         },
         {
-          "case": "fd",
+          "case": "vsock",
           "type": "505"
+        },
+        {
+          "case": "fd",
+          "type": "506"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "501"
+          "type": "502"
         }
       ],
       "meta-type": "object"
@@ -10371,7 +10371,7 @@
       "members": [
         {
           "name": "addr",
-          "type": "369"
+          "type": "370"
         },
         {
           "name": "logical-block-size",
@@ -10401,7 +10401,7 @@
         {
           "name": "allow-other",
           "default": null,
-          "type": "506"
+          "type": "507"
         }
       ],
       "meta-type": "object"
@@ -10428,97 +10428,93 @@
       "variants": [
         {
           "case": "file",
-          "type": "508"
+          "type": "509"
         },
         {
           "case": "serial",
-          "type": "509"
-        },
-        {
-          "case": "parallel",
-          "type": "509"
-        },
-        {
-          "case": "pipe",
-          "type": "509"
-        },
-        {
-          "case": "socket",
           "type": "510"
         },
         {
-          "case": "udp",
+          "case": "parallel",
+          "type": "510"
+        },
+        {
+          "case": "pipe",
+          "type": "510"
+        },
+        {
+          "case": "socket",
           "type": "511"
         },
+        {
+          "case": "udp",
+          "type": "512"
+        },
         {
           "case": "pty",
-          "type": "512"
-        },
-        {
-          "case": "null",
-          "type": "512"
-        },
-        {
-          "case": "mux",
           "type": "513"
         },
         {
-          "case": "msmouse",
-          "type": "512"
+          "case": "null",
+          "type": "513"
         },
         {
-          "case": "wctablet",
-          "type": "512"
-        },
-        {
-          "case": "braille",
-          "type": "512"
-        },
-        {
-          "case": "testdev",
-          "type": "512"
-        },
-        {
-          "case": "stdio",
+          "case": "mux",
           "type": "514"
         },
         {
-          "case": "console",
-          "type": "512"
+          "case": "msmouse",
+          "type": "513"
         },
         {
-          "case": "spicevmc",
+          "case": "wctablet",
+          "type": "513"
+        },
+        {
+          "case": "braille",
+          "type": "513"
+        },
+        {
+          "case": "testdev",
+          "type": "513"
+        },
+        {
+          "case": "stdio",
           "type": "515"
         },
         {
-          "case": "spiceport",
+          "case": "console",
+          "type": "513"
+        },
+        {
+          "case": "spicevmc",
           "type": "516"
         },
         {
-          "case": "qemu-vdagent",
+          "case": "spiceport",
           "type": "517"
         },
         {
-          "case": "dbus",
+          "case": "qemu-vdagent",
           "type": "518"
         },
         {
           "case": "vc",
-          "type": "519"
+          "type": "520"
         },
         {
           "case": "ringbuf",
-          "type": "520"
+          "type": "521"
         },
         {
           "case": "memory",
-          "type": "520"
+          "type": "521"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "507"
+          "type": "508"
         }
       ],
       "meta-type": "object"
@@ -10728,7 +10724,7 @@
         {
           "name": "dnssearch",
           "default": null,
-          "type": "[521]"
+          "type": "[522]"
         },
         {
           "name": "domainname",
@@ -10768,12 +10764,12 @@
         {
           "name": "hostfwd",
           "default": null,
-          "type": "[521]"
+          "type": "[522]"
         },
         {
           "name": "guestfwd",
           "default": null,
-          "type": "[521]"
+          "type": "[522]"
         },
         {
           "name": "tftp-server-name",
@@ -11280,11 +11276,11 @@
       "variants": [
         {
           "case": "passthrough",
-          "type": "522"
+          "type": "523"
         },
         {
           "case": "emulator",
-          "type": "523"
+          "type": "524"
         }
       ],
       "members": [
@@ -11702,17 +11698,17 @@
       "variants": [
         {
           "case": "number",
-          "type": "525"
+          "type": "526"
         },
         {
           "case": "qcode",
-          "type": "526"
+          "type": "527"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "524"
+          "type": "525"
         }
       ],
       "meta-type": "object"
@@ -11728,25 +11724,25 @@
       "variants": [
         {
           "case": "key",
-          "type": "528"
-        },
-        {
-          "case": "btn",
           "type": "529"
         },
         {
-          "case": "rel",
+          "case": "btn",
           "type": "530"
         },
+        {
+          "case": "rel",
+          "type": "531"
+        },
         {
           "case": "abs",
-          "type": "530"
+          "type": "531"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "527"
+          "type": "528"
         }
       ],
       "meta-type": "object"
@@ -11760,6 +11756,9 @@
         {
           "name": "none"
         },
+        {
+          "name": "gtk"
+        },
         {
           "name": "sdl"
         },
@@ -11771,20 +11770,17 @@
         },
         {
           "name": "spice-app"
-        },
-        {
-          "name": "dbus"
         }
       ],
       "meta-type": "enum",
       "values": [
         "default",
         "none",
+        "gtk",
         "sdl",
         "egl-headless",
         "curses",
-        "spice-app",
-        "dbus"
+        "spice-app"
       ]
     },
     {
@@ -11829,6 +11825,27 @@
     },
     {
       "name": "359",
+      "members": [
+        {
+          "name": "left-command-key",
+          "default": null,
+          "type": "bool"
+        },
+        {
+          "name": "full-grab",
+          "default": null,
+          "type": "bool"
+        },
+        {
+          "name": "swap-opt-cmd",
+          "default": null,
+          "type": "bool"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "360",
       "members": [
         {
           "name": "charset",
@@ -11839,7 +11856,7 @@
       "meta-type": "object"
     },
     {
-      "name": "360",
+      "name": "361",
       "members": [
         {
           "name": "rendernode",
@@ -11850,7 +11867,7 @@
       "meta-type": "object"
     },
     {
-      "name": "361",
+      "name": "362",
       "members": [
         {
           "name": "rendernode",
@@ -11876,7 +11893,7 @@
       "meta-type": "object"
     },
     {
-      "name": "362",
+      "name": "363",
       "members": [
         {
           "name": "vnc"
@@ -11888,7 +11905,7 @@
       ]
     },
     {
-      "name": "363",
+      "name": "364",
       "members": [
         {
           "name": "tls-certs",
@@ -11899,7 +11916,7 @@
       "meta-type": "object"
     },
     {
-      "name": "364",
+      "name": "365",
       "members": [
         {
           "name": "none"
@@ -11963,7 +11980,7 @@
       ]
     },
     {
-      "name": "365",
+      "name": "366",
       "members": [
         {
           "name": "transferred",
@@ -12037,7 +12054,7 @@
       "meta-type": "object"
     },
     {
-      "name": "366",
+      "name": "367",
       "members": [
         {
           "name": "transferred",
@@ -12047,7 +12064,7 @@
       "meta-type": "object"
     },
     {
-      "name": "367",
+      "name": "368",
       "members": [
         {
           "name": "cache-size",
@@ -12081,7 +12098,7 @@
       "meta-type": "object"
     },
     {
-      "name": "368",
+      "name": "369",
       "members": [
         {
           "name": "pages",
@@ -12107,41 +12124,41 @@
       "meta-type": "object"
     },
     {
-      "name": "[369]",
-      "element-type": "369",
+      "name": "[370]",
+      "element-type": "370",
       "meta-type": "array"
     },
     {
-      "name": "369",
+      "name": "370",
       "tag": "type",
       "variants": [
         {
           "case": "inet",
-          "type": "483"
+          "type": "484"
         },
         {
           "case": "unix",
-          "type": "531"
-        },
-        {
-          "case": "vsock",
           "type": "532"
         },
+        {
+          "case": "vsock",
+          "type": "533"
+        },
         {
           "case": "fd",
-          "type": "521"
+          "type": "522"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "501"
+          "type": "502"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "370",
+      "name": "371",
       "members": [
         {
           "name": "xbzrle"
@@ -12231,7 +12248,7 @@
       ]
     },
     {
-      "name": "371",
+      "name": "372",
       "members": [
         {
           "name": "none"
@@ -12251,12 +12268,12 @@
       ]
     },
     {
-      "name": "[372]",
-      "element-type": "372",
+      "name": "[373]",
+      "element-type": "373",
       "meta-type": "array"
     },
     {
-      "name": "372",
+      "name": "373",
       "members": [
         {
           "name": "node-name",
@@ -12268,13 +12285,13 @@
         },
         {
           "name": "bitmaps",
-          "type": "[533]"
+          "type": "[534]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "373",
+      "name": "374",
       "members": [
         {
           "name": "none"
@@ -12294,7 +12311,7 @@
       ]
     },
     {
-      "name": "374",
+      "name": "375",
       "members": [
         {
           "name": "none"
@@ -12318,7 +12335,7 @@
       ]
     },
     {
-      "name": "375",
+      "name": "376",
       "members": [
         {
           "name": "page-sampling"
@@ -12338,7 +12355,7 @@
       ]
     },
     {
-      "name": "376",
+      "name": "377",
       "members": [
         {
           "name": "unstarted"
@@ -12358,12 +12375,12 @@
       ]
     },
     {
-      "name": "[377]",
-      "element-type": "377",
+      "name": "[378]",
+      "element-type": "378",
       "meta-type": "array"
     },
     {
-      "name": "377",
+      "name": "378",
       "members": [
         {
           "name": "id",
@@ -12377,84 +12394,84 @@
       "meta-type": "object"
     },
     {
-      "name": "[378]",
-      "element-type": "378",
+      "name": "[379]",
+      "element-type": "379",
       "meta-type": "array"
     },
     {
-      "name": "378",
+      "name": "379",
       "tag": "type",
       "variants": [
         {
           "case": "abort",
-          "type": "535"
-        },
-        {
-          "case": "block-dirty-bitmap-add",
           "type": "536"
         },
+        {
+          "case": "block-dirty-bitmap-add",
+          "type": "537"
+        },
         {
           "case": "block-dirty-bitmap-remove",
-          "type": "537"
-        },
-        {
-          "case": "block-dirty-bitmap-clear",
-          "type": "537"
-        },
-        {
-          "case": "block-dirty-bitmap-enable",
-          "type": "537"
-        },
-        {
-          "case": "block-dirty-bitmap-disable",
-          "type": "537"
-        },
-        {
-          "case": "block-dirty-bitmap-merge",
           "type": "538"
         },
         {
-          "case": "blockdev-backup",
+          "case": "block-dirty-bitmap-clear",
+          "type": "538"
+        },
+        {
+          "case": "block-dirty-bitmap-enable",
+          "type": "538"
+        },
+        {
+          "case": "block-dirty-bitmap-disable",
+          "type": "538"
+        },
+        {
+          "case": "block-dirty-bitmap-merge",
           "type": "539"
         },
         {
-          "case": "blockdev-snapshot",
+          "case": "blockdev-backup",
           "type": "540"
         },
         {
-          "case": "blockdev-snapshot-internal-sync",
+          "case": "blockdev-snapshot",
           "type": "541"
         },
         {
-          "case": "blockdev-snapshot-sync",
+          "case": "blockdev-snapshot-internal-sync",
           "type": "542"
         },
         {
-          "case": "drive-backup",
+          "case": "blockdev-snapshot-sync",
           "type": "543"
+        },
+        {
+          "case": "drive-backup",
+          "type": "544"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "534"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "379",
-      "members": [
-        {
-          "name": "completion-mode",
-          "default": null,
-          "type": "544"
+          "type": "535"
         }
       ],
       "meta-type": "object"
     },
     {
       "name": "380",
+      "members": [
+        {
+          "name": "completion-mode",
+          "default": null,
+          "type": "545"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "381",
       "members": [
         {
           "name": "unavailable"
@@ -12474,12 +12491,12 @@
       ]
     },
     {
-      "name": "[381]",
-      "element-type": "381",
+      "name": "[382]",
+      "element-type": "382",
       "meta-type": "array"
     },
     {
-      "name": "381",
+      "name": "382",
       "members": [
         {
           "name": "oob"
@@ -12491,7 +12508,7 @@
       ]
     },
     {
-      "name": "382",
+      "name": "383",
       "members": [
         {
           "name": "major",
@@ -12509,7 +12526,7 @@
       "meta-type": "object"
     },
     {
-      "name": "383",
+      "name": "384",
       "members": [
         {
           "name": "builtin"
@@ -12545,21 +12562,21 @@
       ]
     },
     {
-      "name": "384",
+      "name": "385",
       "members": [
         {
           "name": "json-type",
-          "type": "545"
+          "type": "546"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "385",
+      "name": "386",
       "members": [
         {
           "name": "members",
-          "type": "[546]"
+          "type": "[547]"
         },
         {
           "name": "values",
@@ -12572,7 +12589,7 @@
       "meta-type": "object"
     },
     {
-      "name": "386",
+      "name": "387",
       "members": [
         {
           "name": "element-type",
@@ -12582,11 +12599,11 @@
       "meta-type": "object"
     },
     {
-      "name": "387",
+      "name": "388",
       "members": [
         {
           "name": "members",
-          "type": "[547]"
+          "type": "[548]"
         },
         {
           "name": "tag",
@@ -12596,16 +12613,6 @@
         {
           "name": "variants",
           "default": null,
-          "type": "[548]"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "388",
-      "members": [
-        {
-          "name": "members",
           "type": "[549]"
         }
       ],
@@ -12613,6 +12620,16 @@
     },
     {
       "name": "389",
+      "members": [
+        {
+          "name": "members",
+          "type": "[550]"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "390",
       "members": [
         {
           "name": "arg-type",
@@ -12631,7 +12648,7 @@
       "meta-type": "object"
     },
     {
-      "name": "390",
+      "name": "391",
       "members": [
         {
           "name": "arg-type",
@@ -12641,7 +12658,7 @@
       "meta-type": "object"
     },
     {
-      "name": "391",
+      "name": "392",
       "members": [
         {
           "name": "authz-list"
@@ -12812,23 +12829,23 @@
       ]
     },
     {
-      "name": "392",
+      "name": "393",
       "members": [
         {
           "name": "policy",
           "default": null,
-          "type": "550"
+          "type": "551"
         },
         {
           "name": "rules",
           "default": null,
-          "type": "[551]"
+          "type": "[552]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "393",
+      "name": "394",
       "members": [
         {
           "name": "filename",
@@ -12843,7 +12860,7 @@
       "meta-type": "object"
     },
     {
-      "name": "394",
+      "name": "395",
       "members": [
         {
           "name": "service",
@@ -12853,7 +12870,7 @@
       "meta-type": "object"
     },
     {
-      "name": "395",
+      "name": "396",
       "members": [
         {
           "name": "identity",
@@ -12863,7 +12880,7 @@
       "meta-type": "object"
     },
     {
-      "name": "396",
+      "name": "397",
       "members": [
         {
           "name": "if",
@@ -12877,7 +12894,7 @@
       "meta-type": "object"
     },
     {
-      "name": "397",
+      "name": "398",
       "members": [
         {
           "name": "primary_in",
@@ -12924,7 +12941,7 @@
       "meta-type": "object"
     },
     {
-      "name": "398",
+      "name": "399",
       "members": [
         {
           "name": "queues",
@@ -12935,7 +12952,7 @@
       "meta-type": "object"
     },
     {
-      "name": "399",
+      "name": "400",
       "members": [
         {
           "name": "queues",
@@ -12950,7 +12967,7 @@
       "meta-type": "object"
     },
     {
-      "name": "400",
+      "name": "401",
       "members": [
         {
           "name": "addr",
@@ -12964,40 +12981,6 @@
       ],
       "meta-type": "object"
     },
-    {
-      "name": "401",
-      "members": [
-        {
-          "name": "netdev",
-          "type": "str"
-        },
-        {
-          "name": "queue",
-          "default": null,
-          "type": "552"
-        },
-        {
-          "name": "status",
-          "default": null,
-          "type": "str"
-        },
-        {
-          "name": "position",
-          "default": null,
-          "type": "str"
-        },
-        {
-          "name": "insert",
-          "default": null,
-          "type": "553"
-        },
-        {
-          "name": "interval",
-          "type": "int"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "402",
       "members": [
@@ -13008,7 +12991,7 @@
         {
           "name": "queue",
           "default": null,
-          "type": "552"
+          "type": "553"
         },
         {
           "name": "status",
@@ -13023,15 +13006,10 @@
         {
           "name": "insert",
           "default": null,
-          "type": "553"
+          "type": "554"
         },
         {
-          "name": "file",
-          "type": "str"
-        },
-        {
-          "name": "maxlen",
-          "default": null,
+          "name": "interval",
           "type": "int"
         }
       ],
@@ -13047,7 +13025,7 @@
         {
           "name": "queue",
           "default": null,
-          "type": "552"
+          "type": "553"
         },
         {
           "name": "status",
@@ -13062,16 +13040,16 @@
         {
           "name": "insert",
           "default": null,
-          "type": "553"
+          "type": "554"
         },
         {
-          "name": "outdev",
+          "name": "file",
           "type": "str"
         },
         {
-          "name": "vnet_hdr_support",
+          "name": "maxlen",
           "default": null,
-          "type": "bool"
+          "type": "int"
         }
       ],
       "meta-type": "object"
@@ -13086,7 +13064,7 @@
         {
           "name": "queue",
           "default": null,
-          "type": "552"
+          "type": "553"
         },
         {
           "name": "status",
@@ -13101,16 +13079,10 @@
         {
           "name": "insert",
           "default": null,
-          "type": "553"
-        },
-        {
-          "name": "indev",
-          "default": null,
-          "type": "str"
+          "type": "554"
         },
         {
           "name": "outdev",
-          "default": null,
           "type": "str"
         },
         {
@@ -13131,7 +13103,7 @@
         {
           "name": "queue",
           "default": null,
-          "type": "552"
+          "type": "553"
         },
         {
           "name": "status",
@@ -13146,7 +13118,22 @@
         {
           "name": "insert",
           "default": null,
-          "type": "553"
+          "type": "554"
+        },
+        {
+          "name": "indev",
+          "default": null,
+          "type": "str"
+        },
+        {
+          "name": "outdev",
+          "default": null,
+          "type": "str"
+        },
+        {
+          "name": "vnet_hdr_support",
+          "default": null,
+          "type": "bool"
         }
       ],
       "meta-type": "object"
@@ -13161,7 +13148,7 @@
         {
           "name": "queue",
           "default": null,
-          "type": "552"
+          "type": "553"
         },
         {
           "name": "status",
@@ -13176,8 +13163,38 @@
         {
           "name": "insert",
           "default": null,
+          "type": "554"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "407",
+      "members": [
+        {
+          "name": "netdev",
+          "type": "str"
+        },
+        {
+          "name": "queue",
+          "default": null,
           "type": "553"
         },
+        {
+          "name": "status",
+          "default": null,
+          "type": "str"
+        },
+        {
+          "name": "position",
+          "default": null,
+          "type": "str"
+        },
+        {
+          "name": "insert",
+          "default": null,
+          "type": "554"
+        },
         {
           "name": "vnet_hdr_support",
           "default": null,
@@ -13187,7 +13204,7 @@
       "meta-type": "object"
     },
     {
-      "name": "407",
+      "name": "408",
       "members": [
         {
           "name": "name",
@@ -13227,7 +13244,7 @@
       "meta-type": "object"
     },
     {
-      "name": "408",
+      "name": "409",
       "members": [
         {
           "name": "evdev",
@@ -13246,13 +13263,13 @@
         {
           "name": "grab-toggle",
           "default": null,
-          "type": "554"
+          "type": "555"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "409",
+      "name": "410",
       "members": [
         {
           "name": "poll-max-ns",
@@ -13278,7 +13295,7 @@
       "meta-type": "object"
     },
     {
-      "name": "410",
+      "name": "411",
       "members": [
         {
           "name": "dump",
@@ -13298,7 +13315,7 @@
         {
           "name": "policy",
           "default": null,
-          "type": "431"
+          "type": "432"
         },
         {
           "name": "prealloc",
@@ -13333,7 +13350,7 @@
       "meta-type": "object"
     },
     {
-      "name": "411",
+      "name": "412",
       "members": [
         {
           "name": "dump",
@@ -13353,7 +13370,7 @@
         {
           "name": "policy",
           "default": null,
-          "type": "431"
+          "type": "432"
         },
         {
           "name": "prealloc",
@@ -13412,7 +13429,7 @@
       "meta-type": "object"
     },
     {
-      "name": "412",
+      "name": "413",
       "members": [
         {
           "name": "dump",
@@ -13432,7 +13449,7 @@
         {
           "name": "policy",
           "default": null,
-          "type": "431"
+          "type": "432"
         },
         {
           "name": "prealloc",
@@ -13482,7 +13499,7 @@
       "meta-type": "object"
     },
     {
-      "name": "413",
+      "name": "414",
       "members": [
         {
           "name": "dump",
@@ -13502,7 +13519,7 @@
         {
           "name": "policy",
           "default": null,
-          "type": "431"
+          "type": "432"
         },
         {
           "name": "prealloc",
@@ -13537,7 +13554,7 @@
       "meta-type": "object"
     },
     {
-      "name": "414",
+      "name": "415",
       "members": [
         {
           "name": "path",
@@ -13547,7 +13564,7 @@
       "meta-type": "object"
     },
     {
-      "name": "415",
+      "name": "416",
       "members": [
         {
           "name": "chardev",
@@ -13562,7 +13579,7 @@
       "meta-type": "object"
     },
     {
-      "name": "416",
+      "name": "417",
       "members": [
         {
           "name": "opened",
@@ -13576,7 +13593,7 @@
       "meta-type": "object"
     },
     {
-      "name": "417",
+      "name": "418",
       "members": [
         {
           "name": "opened",
@@ -13594,7 +13611,7 @@
       "meta-type": "object"
     },
     {
-      "name": "418",
+      "name": "419",
       "members": [
         {
           "name": "opened",
@@ -13613,7 +13630,7 @@
       "meta-type": "object"
     },
     {
-      "name": "419",
+      "name": "420",
       "members": [
         {
           "name": "loaded",
@@ -13626,7 +13643,7 @@
         {
           "name": "format",
           "default": null,
-          "type": "555"
+          "type": "556"
         },
         {
           "name": "keyid",
@@ -13652,7 +13669,7 @@
       "meta-type": "object"
     },
     {
-      "name": "420",
+      "name": "421",
       "members": [
         {
           "name": "loaded",
@@ -13665,7 +13682,7 @@
         {
           "name": "format",
           "default": null,
-          "type": "555"
+          "type": "556"
         },
         {
           "name": "keyid",
@@ -13685,7 +13702,7 @@
       "meta-type": "object"
     },
     {
-      "name": "421",
+      "name": "422",
       "members": [
         {
           "name": "sev-device",
@@ -13730,12 +13747,12 @@
       "meta-type": "object"
     },
     {
-      "name": "422",
+      "name": "423",
       "members": [
         {
           "name": "limits",
           "default": null,
-          "type": "556"
+          "type": "557"
         },
         {
           "name": "x-iops-total",
@@ -13893,7 +13910,7 @@
       "meta-type": "object"
     },
     {
-      "name": "423",
+      "name": "424",
       "members": [
         {
           "name": "verify-peer",
@@ -13908,7 +13925,7 @@
         {
           "name": "endpoint",
           "default": null,
-          "type": "557"
+          "type": "558"
         },
         {
           "name": "priority",
@@ -13927,7 +13944,7 @@
       "meta-type": "object"
     },
     {
-      "name": "424",
+      "name": "425",
       "members": [
         {
           "name": "verify-peer",
@@ -13942,7 +13959,7 @@
         {
           "name": "endpoint",
           "default": null,
-          "type": "557"
+          "type": "558"
         },
         {
           "name": "priority",
@@ -13966,7 +13983,7 @@
       "meta-type": "object"
     },
     {
-      "name": "425",
+      "name": "426",
       "members": [
         {
           "name": "verify-peer",
@@ -13981,7 +13998,7 @@
         {
           "name": "endpoint",
           "default": null,
-          "type": "557"
+          "type": "558"
         },
         {
           "name": "priority",
@@ -14010,7 +14027,7 @@
       "meta-type": "object"
     },
     {
-      "name": "426",
+      "name": "427",
       "members": [
         {
           "name": "verify-peer",
@@ -14025,7 +14042,7 @@
         {
           "name": "endpoint",
           "default": null,
-          "type": "557"
+          "type": "558"
         },
         {
           "name": "priority",
@@ -14036,7 +14053,7 @@
       "meta-type": "object"
     },
     {
-      "name": "427",
+      "name": "428",
       "members": [
         {
           "name": "fd",
@@ -14050,7 +14067,7 @@
       "meta-type": "object"
     },
     {
-      "name": "428",
+      "name": "429",
       "members": [
         {
           "name": "node-id",
@@ -14081,7 +14098,7 @@
       "meta-type": "object"
     },
     {
-      "name": "429",
+      "name": "430",
       "members": [
         {
           "name": "aarch64"
@@ -14209,17 +14226,17 @@
       ]
     },
     {
-      "name": "430",
+      "name": "431",
       "members": [
         {
           "name": "cpu-state",
-          "type": "558"
+          "type": "559"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "431",
+      "name": "432",
       "members": [
         {
           "name": "default"
@@ -14243,7 +14260,7 @@
       ]
     },
     {
-      "name": "432",
+      "name": "433",
       "members": [
         {
           "name": "node"
@@ -14271,7 +14288,7 @@
       ]
     },
     {
-      "name": "433",
+      "name": "434",
       "members": [
         {
           "name": "nodeid",
@@ -14302,7 +14319,7 @@
       "meta-type": "object"
     },
     {
-      "name": "434",
+      "name": "435",
       "members": [
         {
           "name": "src",
@@ -14320,7 +14337,7 @@
       "meta-type": "object"
     },
     {
-      "name": "435",
+      "name": "436",
       "members": [
         {
           "name": "node-id",
@@ -14351,7 +14368,7 @@
       "meta-type": "object"
     },
     {
-      "name": "436",
+      "name": "437",
       "members": [
         {
           "name": "initiator",
@@ -14363,11 +14380,11 @@
         },
         {
           "name": "hierarchy",
-          "type": "559"
+          "type": "560"
         },
         {
           "name": "data-type",
-          "type": "560"
+          "type": "561"
         },
         {
           "name": "latency",
@@ -14383,7 +14400,7 @@
       "meta-type": "object"
     },
     {
-      "name": "437",
+      "name": "438",
       "members": [
         {
           "name": "node-id",
@@ -14399,11 +14416,11 @@
         },
         {
           "name": "associativity",
-          "type": "561"
+          "type": "562"
         },
         {
           "name": "policy",
-          "type": "562"
+          "type": "563"
         },
         {
           "name": "line",
@@ -14413,7 +14430,7 @@
       "meta-type": "object"
     },
     {
-      "name": "438",
+      "name": "439",
       "members": [
         {
           "name": "dimm"
@@ -14440,16 +14457,6 @@
         "sgx-epc"
       ]
     },
-    {
-      "name": "439",
-      "members": [
-        {
-          "name": "data",
-          "type": "563"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "440",
       "members": [
@@ -14482,6 +14489,16 @@
     },
     {
       "name": "443",
+      "members": [
+        {
+          "name": "data",
+          "type": "567"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "444",
       "members": [
         {
           "name": "name",
@@ -14496,7 +14513,7 @@
       "meta-type": "object"
     },
     {
-      "name": "444",
+      "name": "445",
       "members": [
         {
           "name": "incompatible"
@@ -14520,7 +14537,7 @@
       ]
     },
     {
-      "name": "445",
+      "name": "446",
       "members": [
         {
           "name": "static"
@@ -14536,7 +14553,7 @@
       ]
     },
     {
-      "name": "446",
+      "name": "447",
       "members": [
         {
           "name": "none"
@@ -14556,7 +14573,7 @@
       ]
     },
     {
-      "name": "447",
+      "name": "448",
       "members": [
         {
           "name": "block-node"
@@ -14576,7 +14593,7 @@
       ]
     },
     {
-      "name": "448",
+      "name": "449",
       "members": [
         {
           "name": "node-name",
@@ -14585,31 +14602,11 @@
       ],
       "meta-type": "object"
     },
-    {
-      "name": "449",
-      "members": [
-        {
-          "name": "id",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "[450]",
-      "element-type": "450",
-      "meta-type": "array"
-    },
     {
       "name": "450",
       "members": [
         {
-          "name": "fd",
-          "type": "int"
-        },
-        {
-          "name": "opaque",
-          "default": null,
+          "name": "id",
           "type": "str"
         }
       ],
@@ -14622,6 +14619,26 @@
     },
     {
       "name": "451",
+      "members": [
+        {
+          "name": "fd",
+          "type": "int"
+        },
+        {
+          "name": "opaque",
+          "default": null,
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "[452]",
+      "element-type": "452",
+      "meta-type": "array"
+    },
+    {
+      "name": "452",
       "members": [
         {
           "name": "name",
@@ -14629,7 +14646,7 @@
         },
         {
           "name": "type",
-          "type": "567"
+          "type": "568"
         },
         {
           "name": "help",
@@ -14645,7 +14662,7 @@
       "meta-type": "object"
     },
     {
-      "name": "452",
+      "name": "453",
       "members": [
         {
           "name": "uninit"
@@ -14677,12 +14694,12 @@
       ]
     },
     {
-      "name": "[453]",
-      "element-type": "453",
+      "name": "[454]",
+      "element-type": "454",
       "meta-type": "array"
     },
     {
-      "name": "453",
+      "name": "454",
       "members": [
         {
           "name": "node",
@@ -14696,7 +14713,7 @@
       "meta-type": "object"
     },
     {
-      "name": "454",
+      "name": "455",
       "members": [
         {
           "name": "DIMM"
@@ -14712,12 +14729,12 @@
       ]
     },
     {
-      "name": "[455]",
-      "element-type": "455",
+      "name": "[456]",
+      "element-type": "456",
       "meta-type": "array"
     },
     {
-      "name": "455",
+      "name": "456",
       "members": [
         {
           "name": "bus",
@@ -14733,11 +14750,11 @@
         },
         {
           "name": "class_info",
-          "type": "568"
+          "type": "569"
         },
         {
           "name": "id",
-          "type": "569"
+          "type": "570"
         },
         {
           "name": "irq",
@@ -14755,17 +14772,17 @@
         {
           "name": "pci_bridge",
           "default": null,
-          "type": "570"
+          "type": "571"
         },
         {
           "name": "regions",
-          "type": "[571]"
+          "type": "[572]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "456",
+      "name": "457",
       "members": [
         {
           "name": "hyper-v"
@@ -14781,7 +14798,7 @@
       ]
     },
     {
-      "name": "457",
+      "name": "458",
       "members": [
         {
           "name": "arg1",
@@ -14807,7 +14824,7 @@
       "meta-type": "object"
     },
     {
-      "name": "458",
+      "name": "459",
       "members": [
         {
           "name": "core",
@@ -14823,18 +14840,18 @@
         },
         {
           "name": "reason",
-          "type": "572"
+          "type": "573"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[459]",
-      "element-type": "459",
+      "name": "[460]",
+      "element-type": "460",
       "meta-type": "array"
     },
     {
-      "name": "459",
+      "name": "460",
       "members": [
         {
           "name": "interval_length",
@@ -14888,7 +14905,7 @@
       "meta-type": "object"
     },
     {
-      "name": "460",
+      "name": "461",
       "members": [
         {
           "name": "boundaries",
@@ -14902,7 +14919,7 @@
       "meta-type": "object"
     },
     {
-      "name": "461",
+      "name": "462",
       "members": [
         {
           "name": "discard-nb-ok",
@@ -14920,7 +14937,7 @@
       "meta-type": "object"
     },
     {
-      "name": "462",
+      "name": "463",
       "members": [
         {
           "name": "completion-errors",
@@ -14943,36 +14960,36 @@
       "meta-type": "array"
     },
     {
-      "name": "463",
+      "name": "464",
       "tag": "type",
       "variants": [
         {
           "case": "qcow2",
-          "type": "574"
-        },
-        {
-          "case": "vmdk",
           "type": "575"
         },
         {
-          "case": "luks",
+          "case": "vmdk",
           "type": "576"
         },
         {
-          "case": "rbd",
+          "case": "luks",
           "type": "577"
+        },
+        {
+          "case": "rbd",
+          "type": "578"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "573"
+          "type": "574"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "464",
+      "name": "465",
       "members": [
         {
           "name": "block-backend"
@@ -14992,12 +15009,12 @@
       ]
     },
     {
-      "name": "[465]",
-      "element-type": "465",
+      "name": "[466]",
+      "element-type": "466",
       "meta-type": "array"
     },
     {
-      "name": "465",
+      "name": "466",
       "members": [
         {
           "name": "consistent-read"
@@ -15021,7 +15038,7 @@
       ]
     },
     {
-      "name": "466",
+      "name": "467",
       "members": [
         {
           "type": "49"
@@ -15033,16 +15050,16 @@
       "meta-type": "alternate"
     },
     {
-      "name": "[467]",
-      "element-type": "467",
+      "name": "[468]",
+      "element-type": "468",
       "meta-type": "array"
     },
     {
-      "name": "467",
+      "name": "468",
       "members": [
         {
           "name": "event",
-          "type": "578"
+          "type": "579"
         },
         {
           "name": "state",
@@ -15052,7 +15069,7 @@
         {
           "name": "iotype",
           "default": null,
-          "type": "579"
+          "type": "580"
         },
         {
           "name": "errno",
@@ -15078,16 +15095,16 @@
       "meta-type": "object"
     },
     {
-      "name": "[468]",
-      "element-type": "468",
+      "name": "[469]",
+      "element-type": "469",
       "meta-type": "array"
     },
     {
-      "name": "468",
+      "name": "469",
       "members": [
         {
           "name": "event",
-          "type": "578"
+          "type": "579"
         },
         {
           "name": "state",
@@ -15102,7 +15119,7 @@
       "meta-type": "object"
     },
     {
-      "name": "469",
+      "name": "470",
       "members": [
         {
           "name": "auto"
@@ -15122,7 +15139,7 @@
       ]
     },
     {
-      "name": "470",
+      "name": "471",
       "members": [
         {
           "name": "threads"
@@ -15142,7 +15159,7 @@
       ]
     },
     {
-      "name": "471",
+      "name": "472",
       "members": [
         {
           "name": "tcp"
@@ -15158,7 +15175,7 @@
       ]
     },
     {
-      "name": "472",
+      "name": "473",
       "members": [
         {
           "name": "crc32c"
@@ -15182,11 +15199,11 @@
       ]
     },
     {
-      "name": "473",
+      "name": "474",
       "members": [
         {
           "name": "type",
-          "type": "580"
+          "type": "581"
         },
         {
           "name": "host",
@@ -15196,7 +15213,7 @@
       "meta-type": "object"
     },
     {
-      "name": "474",
+      "name": "475",
       "members": [
         {
           "type": "49"
@@ -15211,37 +15228,16 @@
       "meta-type": "alternate"
     },
     {
-      "name": "475",
+      "name": "476",
       "members": [
-        {
-          "type": "581"
-        },
         {
           "type": "582"
-        }
-      ],
-      "meta-type": "alternate"
-    },
-    {
-      "name": "476",
-      "tag": "format",
-      "variants": [
-        {
-          "case": "aes",
-          "type": "584"
         },
         {
-          "case": "luks",
-          "type": "585"
-        }
-      ],
-      "members": [
-        {
-          "name": "format",
           "type": "583"
         }
       ],
-      "meta-type": "object"
+      "meta-type": "alternate"
     },
     {
       "name": "477",
@@ -15249,24 +15245,45 @@
       "variants": [
         {
           "case": "aes",
-          "type": "584"
+          "type": "585"
+        },
+        {
+          "case": "luks",
+          "type": "586"
         }
       ],
       "members": [
         {
           "name": "format",
-          "type": "586"
+          "type": "584"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[466]",
-      "element-type": "466",
+      "name": "478",
+      "tag": "format",
+      "variants": [
+        {
+          "case": "aes",
+          "type": "585"
+        }
+      ],
+      "members": [
+        {
+          "name": "format",
+          "type": "587"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "[467]",
+      "element-type": "467",
       "meta-type": "array"
     },
     {
-      "name": "478",
+      "name": "479",
       "members": [
         {
           "name": "quorum"
@@ -15282,33 +15299,33 @@
       ]
     },
     {
-      "name": "479",
+      "name": "480",
       "tag": "format",
       "variants": [
         {
           "case": "luks",
-          "type": "588"
+          "type": "589"
         },
         {
           "case": "luks2",
-          "type": "589"
+          "type": "590"
         }
       ],
       "members": [
         {
           "name": "format",
-          "type": "587"
+          "type": "588"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[480]",
-      "element-type": "480",
+      "name": "[481]",
+      "element-type": "481",
       "meta-type": "array"
     },
     {
-      "name": "480",
+      "name": "481",
       "members": [
         {
           "name": "cephx"
@@ -15324,12 +15341,12 @@
       ]
     },
     {
-      "name": "[481]",
-      "element-type": "481",
+      "name": "[482]",
+      "element-type": "482",
       "meta-type": "array"
     },
     {
-      "name": "481",
+      "name": "482",
       "members": [
         {
           "name": "host",
@@ -15343,7 +15360,7 @@
       "meta-type": "object"
     },
     {
-      "name": "482",
+      "name": "483",
       "members": [
         {
           "name": "primary"
@@ -15359,7 +15376,7 @@
       ]
     },
     {
-      "name": "483",
+      "name": "484",
       "members": [
         {
           "name": "host",
@@ -15403,12 +15420,12 @@
       "meta-type": "object"
     },
     {
-      "name": "484",
+      "name": "485",
       "tag": "mode",
       "variants": [
         {
           "case": "hash",
-          "type": "591"
+          "type": "592"
         },
         {
           "case": "none",
@@ -15422,13 +15439,13 @@
       "members": [
         {
           "name": "mode",
-          "type": "590"
+          "type": "591"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "485",
+      "name": "486",
       "members": [
         {
           "name": "filename",
@@ -15441,7 +15458,7 @@
         {
           "name": "preallocation",
           "default": null,
-          "type": "592"
+          "type": "593"
         },
         {
           "name": "nocow",
@@ -15457,7 +15474,7 @@
       "meta-type": "object"
     },
     {
-      "name": "486",
+      "name": "487",
       "members": [
         {
           "name": "location",
@@ -15470,13 +15487,13 @@
         {
           "name": "preallocation",
           "default": null,
-          "type": "592"
+          "type": "593"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "487",
+      "name": "488",
       "members": [
         {
           "name": "key-secret",
@@ -15486,27 +15503,27 @@
         {
           "name": "cipher-alg",
           "default": null,
-          "type": "593"
+          "type": "594"
         },
         {
           "name": "cipher-mode",
           "default": null,
-          "type": "594"
+          "type": "595"
         },
         {
           "name": "ivgen-alg",
           "default": null,
-          "type": "595"
+          "type": "596"
         },
         {
           "name": "ivgen-hash-alg",
           "default": null,
-          "type": "596"
+          "type": "597"
         },
         {
           "name": "hash-alg",
           "default": null,
-          "type": "596"
+          "type": "597"
         },
         {
           "name": "iter-time",
@@ -15515,7 +15532,7 @@
         },
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "size",
@@ -15524,13 +15541,13 @@
         {
           "name": "preallocation",
           "default": null,
-          "type": "592"
+          "type": "593"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "488",
+      "name": "489",
       "members": [
         {
           "name": "location",
@@ -15544,11 +15561,11 @@
       "meta-type": "object"
     },
     {
-      "name": "489",
+      "name": "490",
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "size",
@@ -15563,11 +15580,11 @@
       "meta-type": "object"
     },
     {
-      "name": "490",
+      "name": "491",
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "size",
@@ -15581,22 +15598,22 @@
         {
           "name": "encrypt",
           "default": null,
-          "type": "597"
+          "type": "598"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "491",
+      "name": "492",
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "data-file",
           "default": null,
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "data-file-raw",
@@ -15615,7 +15632,7 @@
         {
           "name": "version",
           "default": null,
-          "type": "598"
+          "type": "599"
         },
         {
           "name": "backing-file",
@@ -15630,7 +15647,7 @@
         {
           "name": "encrypt",
           "default": null,
-          "type": "597"
+          "type": "598"
         },
         {
           "name": "cluster-size",
@@ -15640,7 +15657,7 @@
         {
           "name": "preallocation",
           "default": null,
-          "type": "592"
+          "type": "593"
         },
         {
           "name": "lazy-refcounts",
@@ -15655,17 +15672,17 @@
         {
           "name": "compression-type",
           "default": null,
-          "type": "599"
+          "type": "600"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "492",
+      "name": "493",
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "size",
@@ -15695,7 +15712,7 @@
       "meta-type": "object"
     },
     {
-      "name": "493",
+      "name": "494",
       "members": [
         {
           "name": "location",
@@ -15713,13 +15730,13 @@
         {
           "name": "encrypt",
           "default": null,
-          "type": "600"
+          "type": "601"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "494",
+      "name": "495",
       "members": [
         {
           "name": "location",
@@ -15733,11 +15750,11 @@
       "meta-type": "object"
     },
     {
-      "name": "495",
+      "name": "496",
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "size",
@@ -15746,17 +15763,17 @@
         {
           "name": "preallocation",
           "default": null,
-          "type": "592"
+          "type": "593"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "496",
+      "name": "497",
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "size",
@@ -15775,7 +15792,7 @@
         {
           "name": "subformat",
           "default": null,
-          "type": "601"
+          "type": "602"
         },
         {
           "name": "block-state-zero",
@@ -15786,11 +15803,11 @@
       "meta-type": "object"
     },
     {
-      "name": "497",
+      "name": "498",
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "size",
@@ -15799,12 +15816,12 @@
         {
           "name": "extents",
           "default": null,
-          "type": "[466]"
+          "type": "[467]"
         },
         {
           "name": "subformat",
           "default": null,
-          "type": "602"
+          "type": "603"
         },
         {
           "name": "backing-file",
@@ -15814,7 +15831,7 @@
         {
           "name": "adapter-type",
           "default": null,
-          "type": "603"
+          "type": "604"
         },
         {
           "name": "hwversion",
@@ -15835,11 +15852,11 @@
       "meta-type": "object"
     },
     {
-      "name": "498",
+      "name": "499",
       "members": [
         {
           "name": "file",
-          "type": "466"
+          "type": "467"
         },
         {
           "name": "size",
@@ -15848,7 +15865,7 @@
         {
           "name": "subformat",
           "default": null,
-          "type": "604"
+          "type": "605"
         },
         {
           "name": "force-size",
@@ -15859,11 +15876,11 @@
       "meta-type": "object"
     },
     {
-      "name": "499",
+      "name": "500",
       "members": [
         {
           "name": "state",
-          "type": "605"
+          "type": "606"
         },
         {
           "name": "new-secret",
@@ -15894,12 +15911,12 @@
       "meta-type": "object"
     },
     {
-      "name": "500",
+      "name": "501",
       "members": [
         {
           "name": "encrypt",
           "default": null,
-          "type": "606"
+          "type": "607"
         }
       ],
       "meta-type": "object"
@@ -15910,7 +15927,7 @@
       "meta-type": "builtin"
     },
     {
-      "name": "501",
+      "name": "502",
       "members": [
         {
           "name": "inet"
@@ -15933,22 +15950,12 @@
         "fd"
       ]
     },
-    {
-      "name": "502",
-      "members": [
-        {
-          "name": "data",
-          "type": "483"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "503",
       "members": [
         {
           "name": "data",
-          "type": "531"
+          "type": "484"
         }
       ],
       "meta-type": "object"
@@ -15968,13 +15975,23 @@
       "members": [
         {
           "name": "data",
-          "type": "521"
+          "type": "533"
         }
       ],
       "meta-type": "object"
     },
     {
       "name": "506",
+      "members": [
+        {
+          "name": "data",
+          "type": "522"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "507",
       "members": [
         {
           "name": "off"
@@ -15994,7 +16011,7 @@
       ]
     },
     {
-      "name": "507",
+      "name": "508",
       "members": [
         {
           "name": "file"
@@ -16050,9 +16067,6 @@
         {
           "name": "qemu-vdagent"
         },
-        {
-          "name": "dbus"
-        },
         {
           "name": "vc"
         },
@@ -16083,22 +16097,11 @@
         "spicevmc",
         "spiceport",
         "qemu-vdagent",
-        "dbus",
         "vc",
         "ringbuf",
         "memory"
       ]
     },
-    {
-      "name": "508",
-      "members": [
-        {
-          "name": "data",
-          "type": "607"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "509",
       "members": [
@@ -16199,16 +16202,6 @@
       ],
       "meta-type": "object"
     },
-    {
-      "name": "519",
-      "members": [
-        {
-          "name": "data",
-          "type": "618"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "520",
       "members": [
@@ -16219,27 +16212,27 @@
       ],
       "meta-type": "object"
     },
-    {
-      "name": "[521]",
-      "element-type": "521",
-      "meta-type": "array"
-    },
     {
       "name": "521",
       "members": [
         {
-          "name": "str",
-          "type": "str"
+          "name": "data",
+          "type": "620"
         }
       ],
       "meta-type": "object"
     },
+    {
+      "name": "[522]",
+      "element-type": "522",
+      "meta-type": "array"
+    },
     {
       "name": "522",
       "members": [
         {
-          "name": "data",
-          "type": "620"
+          "name": "str",
+          "type": "str"
         }
       ],
       "meta-type": "object"
@@ -16256,6 +16249,16 @@
     },
     {
       "name": "524",
+      "members": [
+        {
+          "name": "data",
+          "type": "622"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "525",
       "members": [
         {
           "name": "number"
@@ -16271,7 +16274,7 @@
       ]
     },
     {
-      "name": "525",
+      "name": "526",
       "members": [
         {
           "name": "data",
@@ -16281,17 +16284,17 @@
       "meta-type": "object"
     },
     {
-      "name": "526",
+      "name": "527",
       "members": [
         {
           "name": "data",
-          "type": "622"
+          "type": "623"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "527",
+      "name": "528",
       "members": [
         {
           "name": "key"
@@ -16314,16 +16317,6 @@
         "abs"
       ]
     },
-    {
-      "name": "528",
-      "members": [
-        {
-          "name": "data",
-          "type": "623"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "529",
       "members": [
@@ -16344,13 +16337,23 @@
       ],
       "meta-type": "object"
     },
+    {
+      "name": "531",
+      "members": [
+        {
+          "name": "data",
+          "type": "626"
+        }
+      ],
+      "meta-type": "object"
+    },
     {
       "name": "number",
       "json-type": "number",
       "meta-type": "builtin"
     },
     {
-      "name": "531",
+      "name": "532",
       "members": [
         {
           "name": "path",
@@ -16370,7 +16373,7 @@
       "meta-type": "object"
     },
     {
-      "name": "532",
+      "name": "533",
       "members": [
         {
           "name": "cid",
@@ -16384,12 +16387,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[533]",
-      "element-type": "533",
+      "name": "[534]",
+      "element-type": "534",
       "meta-type": "array"
     },
     {
-      "name": "533",
+      "name": "534",
       "members": [
         {
           "name": "name",
@@ -16402,13 +16405,13 @@
         {
           "name": "transform",
           "default": null,
-          "type": "626"
+          "type": "627"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "534",
+      "name": "535",
       "members": [
         {
           "name": "abort"
@@ -16466,22 +16469,12 @@
         "drive-backup"
       ]
     },
-    {
-      "name": "535",
-      "members": [
-        {
-          "name": "data",
-          "type": "627"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "536",
       "members": [
         {
           "name": "data",
-          "type": "36"
+          "type": "628"
         }
       ],
       "meta-type": "object"
@@ -16491,7 +16484,7 @@
       "members": [
         {
           "name": "data",
-          "type": "37"
+          "type": "36"
         }
       ],
       "meta-type": "object"
@@ -16501,7 +16494,7 @@
       "members": [
         {
           "name": "data",
-          "type": "38"
+          "type": "37"
         }
       ],
       "meta-type": "object"
@@ -16511,7 +16504,7 @@
       "members": [
         {
           "name": "data",
-          "type": "31"
+          "type": "38"
         }
       ],
       "meta-type": "object"
@@ -16521,7 +16514,7 @@
       "members": [
         {
           "name": "data",
-          "type": "27"
+          "type": "31"
         }
       ],
       "meta-type": "object"
@@ -16531,7 +16524,7 @@
       "members": [
         {
           "name": "data",
-          "type": "67"
+          "type": "27"
         }
       ],
       "meta-type": "object"
@@ -16541,7 +16534,7 @@
       "members": [
         {
           "name": "data",
-          "type": "26"
+          "type": "67"
         }
       ],
       "meta-type": "object"
@@ -16551,13 +16544,23 @@
       "members": [
         {
           "name": "data",
-          "type": "30"
+          "type": "26"
         }
       ],
       "meta-type": "object"
     },
     {
       "name": "544",
+      "members": [
+        {
+          "name": "data",
+          "type": "30"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "545",
       "members": [
         {
           "name": "individual"
@@ -16573,7 +16576,7 @@
       ]
     },
     {
-      "name": "545",
+      "name": "546",
       "members": [
         {
           "name": "string"
@@ -16613,12 +16616,12 @@
       ]
     },
     {
-      "name": "[546]",
-      "element-type": "546",
+      "name": "[547]",
+      "element-type": "547",
       "meta-type": "array"
     },
     {
-      "name": "546",
+      "name": "547",
       "members": [
         {
           "name": "name",
@@ -16633,12 +16636,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[547]",
-      "element-type": "547",
+      "name": "[548]",
+      "element-type": "548",
       "meta-type": "array"
     },
     {
-      "name": "547",
+      "name": "548",
       "members": [
         {
           "name": "name",
@@ -16662,12 +16665,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[548]",
-      "element-type": "548",
+      "name": "[549]",
+      "element-type": "549",
       "meta-type": "array"
     },
     {
-      "name": "548",
+      "name": "549",
       "members": [
         {
           "name": "case",
@@ -16681,12 +16684,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[549]",
-      "element-type": "549",
+      "name": "[550]",
+      "element-type": "550",
       "meta-type": "array"
     },
     {
-      "name": "549",
+      "name": "550",
       "members": [
         {
           "name": "type",
@@ -16696,7 +16699,7 @@
       "meta-type": "object"
     },
     {
-      "name": "550",
+      "name": "551",
       "members": [
         {
           "name": "deny"
@@ -16712,12 +16715,12 @@
       ]
     },
     {
-      "name": "[551]",
-      "element-type": "551",
+      "name": "[552]",
+      "element-type": "552",
       "meta-type": "array"
     },
     {
-      "name": "551",
+      "name": "552",
       "members": [
         {
           "name": "match",
@@ -16725,18 +16728,18 @@
         },
         {
           "name": "policy",
-          "type": "550"
+          "type": "551"
         },
         {
           "name": "format",
           "default": null,
-          "type": "628"
+          "type": "629"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "552",
+      "name": "553",
       "members": [
         {
           "name": "all"
@@ -16756,7 +16759,7 @@
       ]
     },
     {
-      "name": "553",
+      "name": "554",
       "members": [
         {
           "name": "before"
@@ -16772,7 +16775,7 @@
       ]
     },
     {
-      "name": "554",
+      "name": "555",
       "members": [
         {
           "name": "ctrl-ctrl"
@@ -16804,7 +16807,7 @@
       ]
     },
     {
-      "name": "555",
+      "name": "556",
       "members": [
         {
           "name": "raw"
@@ -16820,7 +16823,7 @@
       ]
     },
     {
-      "name": "556",
+      "name": "557",
       "members": [
         {
           "name": "iops-total",
@@ -16921,7 +16924,7 @@
       "meta-type": "object"
     },
     {
-      "name": "557",
+      "name": "558",
       "members": [
         {
           "name": "client"
@@ -16937,7 +16940,7 @@
       ]
     },
     {
-      "name": "558",
+      "name": "559",
       "members": [
         {
           "name": "uninitialized"
@@ -16965,7 +16968,7 @@
       ]
     },
     {
-      "name": "559",
+      "name": "560",
       "members": [
         {
           "name": "memory"
@@ -16989,7 +16992,7 @@
       ]
     },
     {
-      "name": "560",
+      "name": "561",
       "members": [
         {
           "name": "access-latency"
@@ -17021,7 +17024,7 @@
       ]
     },
     {
-      "name": "561",
+      "name": "562",
       "members": [
         {
           "name": "none"
@@ -17041,7 +17044,7 @@
       ]
     },
     {
-      "name": "562",
+      "name": "563",
       "members": [
         {
           "name": "none"
@@ -17061,7 +17064,7 @@
       ]
     },
     {
-      "name": "563",
+      "name": "564",
       "members": [
         {
           "name": "id",
@@ -17100,7 +17103,7 @@
       "meta-type": "object"
     },
     {
-      "name": "564",
+      "name": "565",
       "members": [
         {
           "name": "id",
@@ -17123,7 +17126,7 @@
       "meta-type": "object"
     },
     {
-      "name": "565",
+      "name": "566",
       "members": [
         {
           "name": "id",
@@ -17162,7 +17165,7 @@
       "meta-type": "object"
     },
     {
-      "name": "566",
+      "name": "567",
       "members": [
         {
           "name": "id",
@@ -17189,7 +17192,7 @@
       "meta-type": "object"
     },
     {
-      "name": "567",
+      "name": "568",
       "members": [
         {
           "name": "string"
@@ -17213,7 +17216,7 @@
       ]
     },
     {
-      "name": "568",
+      "name": "569",
       "members": [
         {
           "name": "desc",
@@ -17228,7 +17231,7 @@
       "meta-type": "object"
     },
     {
-      "name": "569",
+      "name": "570",
       "members": [
         {
           "name": "device",
@@ -17252,27 +17255,27 @@
       "meta-type": "object"
     },
     {
-      "name": "570",
+      "name": "571",
       "members": [
         {
           "name": "bus",
-          "type": "629"
+          "type": "630"
         },
         {
           "name": "devices",
           "default": null,
-          "type": "[455]"
+          "type": "[456]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[571]",
-      "element-type": "571",
+      "name": "[572]",
+      "element-type": "572",
       "meta-type": "array"
     },
     {
-      "name": "571",
+      "name": "572",
       "members": [
         {
           "name": "bar",
@@ -17304,7 +17307,7 @@
       "meta-type": "object"
     },
     {
-      "name": "572",
+      "name": "573",
       "members": [
         {
           "name": "unknown"
@@ -17332,7 +17335,7 @@
       ]
     },
     {
-      "name": "573",
+      "name": "574",
       "members": [
         {
           "name": "qcow2"
@@ -17355,16 +17358,6 @@
         "rbd"
       ]
     },
-    {
-      "name": "574",
-      "members": [
-        {
-          "name": "data",
-          "type": "630"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "575",
       "members": [
@@ -17397,6 +17390,16 @@
     },
     {
       "name": "578",
+      "members": [
+        {
+          "name": "data",
+          "type": "634"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "579",
       "members": [
         {
           "name": "l1_update"
@@ -17596,7 +17599,7 @@
       ]
     },
     {
-      "name": "579",
+      "name": "580",
       "members": [
         {
           "name": "read"
@@ -17628,7 +17631,7 @@
       ]
     },
     {
-      "name": "580",
+      "name": "581",
       "members": [
         {
           "name": "inet"
@@ -17640,12 +17643,12 @@
       ]
     },
     {
-      "name": "581",
+      "name": "582",
       "members": [
         {
           "name": "template",
           "default": null,
-          "type": "582"
+          "type": "583"
         },
         {
           "name": "main-header",
@@ -17696,7 +17699,7 @@
       "meta-type": "object"
     },
     {
-      "name": "582",
+      "name": "583",
       "members": [
         {
           "name": "none"
@@ -17720,7 +17723,7 @@
       ]
     },
     {
-      "name": "583",
+      "name": "584",
       "members": [
         {
           "name": "aes"
@@ -17735,17 +17738,6 @@
         "luks"
       ]
     },
-    {
-      "name": "584",
-      "members": [
-        {
-          "name": "key-secret",
-          "default": null,
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "585",
       "members": [
@@ -17759,6 +17751,17 @@
     },
     {
       "name": "586",
+      "members": [
+        {
+          "name": "key-secret",
+          "default": null,
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "587",
       "members": [
         {
           "name": "aes"
@@ -17770,7 +17773,7 @@
       ]
     },
     {
-      "name": "587",
+      "name": "588",
       "members": [
         {
           "name": "luks"
@@ -17785,16 +17788,6 @@
         "luks2"
       ]
     },
-    {
-      "name": "588",
-      "members": [
-        {
-          "name": "key-secret",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "589",
       "members": [
@@ -17807,6 +17800,16 @@
     },
     {
       "name": "590",
+      "members": [
+        {
+          "name": "key-secret",
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "591",
       "members": [
         {
           "name": "none"
@@ -17826,11 +17829,11 @@
       ]
     },
     {
-      "name": "591",
+      "name": "592",
       "members": [
         {
           "name": "type",
-          "type": "634"
+          "type": "635"
         },
         {
           "name": "hash",
@@ -17840,7 +17843,7 @@
       "meta-type": "object"
     },
     {
-      "name": "592",
+      "name": "593",
       "members": [
         {
           "name": "off"
@@ -17864,7 +17867,7 @@
       ]
     },
     {
-      "name": "593",
+      "name": "594",
       "members": [
         {
           "name": "aes-128"
@@ -17920,7 +17923,7 @@
       ]
     },
     {
-      "name": "594",
+      "name": "595",
       "members": [
         {
           "name": "ecb"
@@ -17944,7 +17947,7 @@
       ]
     },
     {
-      "name": "595",
+      "name": "596",
       "members": [
         {
           "name": "plain"
@@ -17964,7 +17967,7 @@
       ]
     },
     {
-      "name": "596",
+      "name": "597",
       "members": [
         {
           "name": "md5"
@@ -18000,28 +18003,28 @@
       ]
     },
     {
-      "name": "597",
+      "name": "598",
       "tag": "format",
       "variants": [
         {
           "case": "qcow",
-          "type": "584"
+          "type": "585"
         },
         {
           "case": "luks",
-          "type": "636"
+          "type": "637"
         }
       ],
       "members": [
         {
           "name": "format",
-          "type": "635"
+          "type": "636"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "598",
+      "name": "599",
       "members": [
         {
           "name": "v2"
@@ -18037,7 +18040,7 @@
       ]
     },
     {
-      "name": "599",
+      "name": "600",
       "members": [
         {
           "name": "zlib"
@@ -18053,28 +18056,28 @@
       ]
     },
     {
-      "name": "600",
+      "name": "601",
       "tag": "format",
       "variants": [
         {
           "case": "luks",
-          "type": "637"
+          "type": "638"
         },
         {
           "case": "luks2",
-          "type": "638"
+          "type": "639"
         }
       ],
       "members": [
         {
           "name": "format",
-          "type": "587"
+          "type": "588"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "601",
+      "name": "602",
       "members": [
         {
           "name": "dynamic"
@@ -18090,7 +18093,7 @@
       ]
     },
     {
-      "name": "602",
+      "name": "603",
       "members": [
         {
           "name": "monolithicSparse"
@@ -18118,7 +18121,7 @@
       ]
     },
     {
-      "name": "603",
+      "name": "604",
       "members": [
         {
           "name": "ide"
@@ -18142,7 +18145,7 @@
       ]
     },
     {
-      "name": "604",
+      "name": "605",
       "members": [
         {
           "name": "dynamic"
@@ -18158,7 +18161,7 @@
       ]
     },
     {
-      "name": "605",
+      "name": "606",
       "members": [
         {
           "name": "active"
@@ -18174,12 +18177,12 @@
       ]
     },
     {
-      "name": "606",
+      "name": "607",
       "tag": "format",
       "variants": [
         {
           "case": "luks",
-          "type": "639"
+          "type": "640"
         },
         {
           "case": "qcow",
@@ -18189,13 +18192,13 @@
       "members": [
         {
           "name": "format",
-          "type": "635"
+          "type": "636"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "607",
+      "name": "608",
       "members": [
         {
           "name": "logfile",
@@ -18225,7 +18228,7 @@
       "meta-type": "object"
     },
     {
-      "name": "608",
+      "name": "609",
       "members": [
         {
           "name": "logfile",
@@ -18245,7 +18248,7 @@
       "meta-type": "object"
     },
     {
-      "name": "609",
+      "name": "610",
       "members": [
         {
           "name": "logfile",
@@ -18310,7 +18313,7 @@
       "meta-type": "object"
     },
     {
-      "name": "610",
+      "name": "611",
       "members": [
         {
           "name": "logfile",
@@ -18335,7 +18338,7 @@
       "meta-type": "object"
     },
     {
-      "name": "611",
+      "name": "612",
       "members": [
         {
           "name": "logfile",
@@ -18351,7 +18354,7 @@
       "meta-type": "object"
     },
     {
-      "name": "612",
+      "name": "613",
       "members": [
         {
           "name": "logfile",
@@ -18371,7 +18374,7 @@
       "meta-type": "object"
     },
     {
-      "name": "613",
+      "name": "614",
       "members": [
         {
           "name": "logfile",
@@ -18392,7 +18395,7 @@
       "meta-type": "object"
     },
     {
-      "name": "614",
+      "name": "615",
       "members": [
         {
           "name": "logfile",
@@ -18412,7 +18415,7 @@
       "meta-type": "object"
     },
     {
-      "name": "615",
+      "name": "616",
       "members": [
         {
           "name": "logfile",
@@ -18432,7 +18435,7 @@
       "meta-type": "object"
     },
     {
-      "name": "616",
+      "name": "617",
       "members": [
         {
           "name": "logfile",
@@ -18458,27 +18461,7 @@
       "meta-type": "object"
     },
     {
-      "name": "617",
-      "members": [
-        {
-          "name": "logfile",
-          "default": null,
-          "type": "str"
-        },
-        {
-          "name": "logappend",
-          "default": null,
-          "type": "bool"
-        },
-        {
-          "name": "name",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "618",
+      "name": "619",
       "members": [
         {
           "name": "logfile",
@@ -18514,7 +18497,7 @@
       "meta-type": "object"
     },
     {
-      "name": "619",
+      "name": "620",
       "members": [
         {
           "name": "logfile",
@@ -18535,7 +18518,7 @@
       "meta-type": "object"
     },
     {
-      "name": "620",
+      "name": "621",
       "members": [
         {
           "name": "path",
@@ -18551,7 +18534,7 @@
       "meta-type": "object"
     },
     {
-      "name": "621",
+      "name": "622",
       "members": [
         {
           "name": "chardev",
@@ -18561,7 +18544,7 @@
       "meta-type": "object"
     },
     {
-      "name": "622",
+      "name": "623",
       "members": [
         {
           "name": "unmapped"
@@ -19169,7 +19152,7 @@
       ]
     },
     {
-      "name": "623",
+      "name": "624",
       "members": [
         {
           "name": "key",
@@ -19183,11 +19166,11 @@
       "meta-type": "object"
     },
     {
-      "name": "624",
+      "name": "625",
       "members": [
         {
           "name": "button",
-          "type": "640"
+          "type": "641"
         },
         {
           "name": "down",
@@ -19197,11 +19180,11 @@
       "meta-type": "object"
     },
     {
-      "name": "625",
+      "name": "626",
       "members": [
         {
           "name": "axis",
-          "type": "641"
+          "type": "642"
         },
         {
           "name": "value",
@@ -19211,7 +19194,7 @@
       "meta-type": "object"
     },
     {
-      "name": "626",
+      "name": "627",
       "members": [
         {
           "name": "persistent",
@@ -19222,13 +19205,13 @@
       "meta-type": "object"
     },
     {
-      "name": "627",
+      "name": "628",
       "members": [
       ],
       "meta-type": "object"
     },
     {
-      "name": "628",
+      "name": "629",
       "members": [
         {
           "name": "exact"
@@ -19244,7 +19227,7 @@
       ]
     },
     {
-      "name": "629",
+      "name": "630",
       "members": [
         {
           "name": "number",
@@ -19260,21 +19243,21 @@
         },
         {
           "name": "io_range",
-          "type": "642"
+          "type": "643"
         },
         {
           "name": "memory_range",
-          "type": "642"
+          "type": "643"
         },
         {
           "name": "prefetchable_range",
-          "type": "642"
+          "type": "643"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "630",
+      "name": "631",
       "members": [
         {
           "name": "compat",
@@ -19312,22 +19295,22 @@
         {
           "name": "encrypt",
           "default": null,
-          "type": "643"
+          "type": "644"
         },
         {
           "name": "bitmaps",
           "default": null,
-          "type": "[644]"
+          "type": "[645]"
         },
         {
           "name": "compression-type",
-          "type": "599"
+          "type": "600"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "631",
+      "name": "632",
       "members": [
         {
           "name": "create-type",
@@ -19349,28 +19332,28 @@
       "meta-type": "object"
     },
     {
-      "name": "632",
+      "name": "633",
       "members": [
         {
           "name": "cipher-alg",
-          "type": "593"
-        },
-        {
-          "name": "cipher-mode",
           "type": "594"
         },
         {
-          "name": "ivgen-alg",
+          "name": "cipher-mode",
           "type": "595"
         },
+        {
+          "name": "ivgen-alg",
+          "type": "596"
+        },
         {
           "name": "ivgen-hash-alg",
           "default": null,
-          "type": "596"
+          "type": "597"
         },
         {
           "name": "hash-alg",
-          "type": "596"
+          "type": "597"
         },
         {
           "name": "payload-offset",
@@ -19386,24 +19369,24 @@
         },
         {
           "name": "slots",
-          "type": "[645]"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "633",
-      "members": [
-        {
-          "name": "encryption-format",
-          "default": null,
-          "type": "587"
+          "type": "[646]"
         }
       ],
       "meta-type": "object"
     },
     {
       "name": "634",
+      "members": [
+        {
+          "name": "encryption-format",
+          "default": null,
+          "type": "588"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "635",
       "members": [
         {
           "name": "md5"
@@ -19423,7 +19406,7 @@
       ]
     },
     {
-      "name": "635",
+      "name": "636",
       "members": [
         {
           "name": "qcow"
@@ -19439,7 +19422,7 @@
       ]
     },
     {
-      "name": "636",
+      "name": "637",
       "members": [
         {
           "name": "key-secret",
@@ -19449,27 +19432,27 @@
         {
           "name": "cipher-alg",
           "default": null,
-          "type": "593"
+          "type": "594"
         },
         {
           "name": "cipher-mode",
           "default": null,
-          "type": "594"
+          "type": "595"
         },
         {
           "name": "ivgen-alg",
           "default": null,
-          "type": "595"
+          "type": "596"
         },
         {
           "name": "ivgen-hash-alg",
           "default": null,
-          "type": "596"
+          "type": "597"
         },
         {
           "name": "hash-alg",
           "default": null,
-          "type": "596"
+          "type": "597"
         },
         {
           "name": "iter-time",
@@ -19479,21 +19462,6 @@
       ],
       "meta-type": "object"
     },
-    {
-      "name": "637",
-      "members": [
-        {
-          "name": "key-secret",
-          "type": "str"
-        },
-        {
-          "name": "cipher-alg",
-          "default": null,
-          "type": "593"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "638",
       "members": [
@@ -19504,17 +19472,32 @@
         {
           "name": "cipher-alg",
           "default": null,
-          "type": "593"
+          "type": "594"
         }
       ],
       "meta-type": "object"
     },
     {
       "name": "639",
+      "members": [
+        {
+          "name": "key-secret",
+          "type": "str"
+        },
+        {
+          "name": "cipher-alg",
+          "default": null,
+          "type": "594"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "640",
       "members": [
         {
           "name": "state",
-          "type": "605"
+          "type": "606"
         },
         {
           "name": "new-secret",
@@ -19545,7 +19528,7 @@
       "meta-type": "object"
     },
     {
-      "name": "640",
+      "name": "641",
       "members": [
         {
           "name": "left"
@@ -19589,7 +19572,7 @@
       ]
     },
     {
-      "name": "641",
+      "name": "642",
       "members": [
         {
           "name": "x"
@@ -19605,7 +19588,7 @@
       ]
     },
     {
-      "name": "642",
+      "name": "643",
       "members": [
         {
           "name": "base",
@@ -19619,12 +19602,12 @@
       "meta-type": "object"
     },
     {
-      "name": "643",
+      "name": "644",
       "tag": "format",
       "variants": [
         {
           "case": "luks",
-          "type": "632"
+          "type": "633"
         },
         {
           "case": "aes",
@@ -19634,18 +19617,18 @@
       "members": [
         {
           "name": "format",
-          "type": "583"
+          "type": "584"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[644]",
-      "element-type": "644",
+      "name": "[645]",
+      "element-type": "645",
       "meta-type": "array"
     },
     {
-      "name": "644",
+      "name": "645",
       "members": [
         {
           "name": "name",
@@ -19657,7 +19640,7 @@
         },
         {
           "name": "flags",
-          "type": "[646]"
+          "type": "[647]"
         }
       ],
       "meta-type": "object"
@@ -19668,12 +19651,12 @@
       "meta-type": "array"
     },
     {
-      "name": "[645]",
-      "element-type": "645",
+      "name": "[646]",
+      "element-type": "646",
       "meta-type": "array"
     },
     {
-      "name": "645",
+      "name": "646",
       "members": [
         {
           "name": "active",
@@ -19697,12 +19680,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[646]",
-      "element-type": "646",
+      "name": "[647]",
+      "element-type": "647",
       "meta-type": "array"
     },
     {
-      "name": "646",
+      "name": "647",
       "members": [
         {
           "name": "in-use"
@@ -20380,6 +20363,10 @@
       "name": "acpi-erst",
       "parent": "pci-device"
     },
+    {
+      "name": "virtio-crypto-device",
+      "parent": "virtio-device"
+    },
     {
       "name": "isa-applesmc",
       "parent": "isa-device"
@@ -20392,53 +20379,49 @@
       "name": "vhost-user-input-pci",
       "parent": "vhost-user-input-pci-base-type"
     },
-    {
-      "name": "usb-redir",
-      "parent": "usb-device"
-    },
     {
       "name": "floppy-bus",
       "parent": "bus"
     },
-    {
-      "name": "virtio-crypto-device",
-      "parent": "virtio-device"
-    },
-    {
-      "name": "chardev-testdev",
-      "parent": "chardev"
-    },
     {
       "name": "Denverton-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
     {
-      "name": "pci-ipmi-bt",
-      "parent": "pci-device"
-    },
-    {
-      "name": "chardev-stdio",
-      "parent": "chardev-fd"
+      "name": "chardev-testdev",
+      "parent": "chardev"
     },
     {
       "name": "usb-wacom-tablet",
       "parent": "usb-device"
     },
+    {
+      "name": "Icelake-Server-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
+    {
+      "name": "chardev-stdio",
+      "parent": "chardev-fd"
+    },
+    {
+      "name": "pci-ipmi-bt",
+      "parent": "pci-device"
+    },
     {
       "name": "filter-buffer",
       "parent": "netfilter"
     },
     {
-      "name": "Icelake-Server-v1-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "secondary-vga",
+      "parent": "pci-vga"
     },
     {
       "name": "ich9-usb-uhci6",
       "parent": "pci-uhci-usb"
     },
     {
-      "name": "secondary-vga",
-      "parent": "pci-vga"
+      "name": "usb-redir",
+      "parent": "usb-device"
     },
     {
       "name": "kvm-pit",
@@ -20468,14 +20451,14 @@
       "name": "sev-guest",
       "parent": "confidential-guest-support"
     },
-    {
-      "name": "ich9-usb-uhci5",
-      "parent": "pci-uhci-usb"
-    },
     {
       "name": "core2duo-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "ich9-usb-uhci5",
+      "parent": "pci-uhci-usb"
+    },
     {
       "name": "pcm3680_pci",
       "parent": "pci-device"
@@ -20636,6 +20619,10 @@
       "name": "pxb-host",
       "parent": "pci-host-bridge"
     },
+    {
+      "name": "virtio-scsi-pci",
+      "parent": "virtio-scsi-pci-base"
+    },
     {
       "name": "virtio-input-host-pci",
       "parent": "virtio-input-host-pci-base-type"
@@ -20757,8 +20744,8 @@
       "parent": "virtio-device"
     },
     {
-      "name": "virtio-scsi-pci",
-      "parent": "virtio-scsi-pci-base"
+      "name": "xenfv-4.2-machine",
+      "parent": "generic-pc-machine"
     },
     {
       "name": "ipmi-bmc-extern",
@@ -20868,6 +20855,10 @@
       "name": "pr-manager-helper",
       "parent": "pr-manager"
     },
+    {
+      "name": "virtio-scsi-device",
+      "parent": "virtio-scsi-common"
+    },
     {
       "name": "pc-i440fx-2.10-machine",
       "parent": "generic-pc-machine"
@@ -20881,16 +20872,20 @@
       "parent": "pci-device"
     },
     {
-      "name": "virtio-scsi-device",
-      "parent": "virtio-scsi-common"
+      "name": "xen-pci-passthrough",
+      "parent": "pci-device"
+    },
+    {
+      "name": "Haswell-IBRS-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "pxb-pcie",
       "parent": "pci-device"
     },
     {
-      "name": "Haswell-IBRS-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "cpu-cluster",
+      "parent": "device"
     },
     {
       "name": "vhost-user-i2c-pci",
@@ -20901,7 +20896,7 @@
       "parent": "object"
     },
     {
-      "name": "cpu-cluster",
+      "name": "xen-backend",
       "parent": "device"
     },
     {
@@ -20909,16 +20904,16 @@
       "parent": "sys-bus-device"
     },
     {
-      "name": "i82557a",
-      "parent": "pci-device"
+      "name": "Haswell-v3-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "vhost-user-scsi-pci-non-transitional",
       "parent": "vhost-user-scsi-pci-base"
     },
     {
-      "name": "vmmouse",
-      "parent": "isa-device"
+      "name": "i82557a",
+      "parent": "pci-device"
     },
     {
       "name": "chardev-udp",
@@ -20937,8 +20932,8 @@
       "parent": "virtio-scsi-pci-base"
     },
     {
-      "name": "Haswell-v3-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "vmmouse",
+      "parent": "isa-device"
     },
     {
       "name": "migration",
@@ -20981,8 +20976,8 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "chardev-dbus",
-      "parent": "chardev-socket"
+      "name": "vhost-vsock-device",
+      "parent": "vhost-vsock-common"
     },
     {
       "name": "Broadwell-v2-x86_64-cpu",
@@ -21000,6 +20995,10 @@
       "name": "EPYC-IBPB-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "Skylake-Server-v5-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "ib700",
       "parent": "isa-device"
@@ -21009,7 +21008,7 @@
       "parent": "x86-iommu"
     },
     {
-      "name": "Skylake-Server-v5-x86_64-cpu",
+      "name": "Nehalem-v2-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
     {
@@ -21017,16 +21016,16 @@
       "parent": "virtio-9p-pci-base"
     },
     {
-      "name": "Nehalem-v2-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "igd-passthrough-i440FX",
+      "parent": "i440FX"
     },
     {
       "name": "memory-backend-file",
       "parent": "memory-backend"
     },
     {
-      "name": "vhost-vsock-device",
-      "parent": "vhost-vsock-common"
+      "name": "xen-disk",
+      "parent": "xen-block"
     },
     {
       "name": "isa-pcspk",
@@ -21037,21 +21036,25 @@
       "parent": "vhost-scsi-common"
     },
     {
-      "name": "sd-card",
-      "parent": "device"
+      "name": "usb-tablet",
+      "parent": "usb-hid"
     },
     {
       "name": "sysbus-ahci",
       "parent": "sys-bus-device"
     },
     {
-      "name": "usb-tablet",
-      "parent": "usb-hid"
+      "name": "sd-card",
+      "parent": "device"
     },
     {
       "name": "pc-q35-4.0.1-machine",
       "parent": "generic-pc-machine"
     },
+    {
+      "name": "IvyBridge-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "virtio-blk-pci-non-transitional",
       "parent": "virtio-blk-pci-base"
@@ -21061,17 +21064,13 @@
       "parent": "device"
     },
     {
-      "name": "IvyBridge-v2-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "ne2k_pci",
+      "parent": "pci-device"
     },
     {
       "name": "isabus-bridge",
       "parent": "sys-bus-device"
     },
-    {
-      "name": "ne2k_pci",
-      "parent": "pci-device"
-    },
     {
       "name": "usb-bus",
       "parent": "bus"
@@ -21088,10 +21087,18 @@
       "name": "tcg-accel",
       "parent": "accel"
     },
+    {
+      "name": "i82551",
+      "parent": "pci-device"
+    },
     {
       "name": "virtio-balloon-pci",
       "parent": "virtio-balloon-pci-base"
     },
+    {
+      "name": "Cascadelake-Server-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "virtio-gpu-device",
       "parent": "virtio-gpu-base"
@@ -21100,10 +21107,6 @@
       "name": "e1000",
       "parent": "e1000-base"
     },
-    {
-      "name": "Cascadelake-Server-v2-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "athlon-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -21121,8 +21124,8 @@
       "parent": "generic-pc-machine"
     },
     {
-      "name": "i82551",
-      "parent": "pci-device"
+      "name": "xen-apic",
+      "parent": "apic-common"
     },
     {
       "name": "EPYC-v1-x86_64-cpu",
@@ -21156,14 +21159,14 @@
       "name": "pc-q35-6.0-machine",
       "parent": "generic-pc-machine"
     },
-    {
-      "name": "vhost-user-backend",
-      "parent": "object"
-    },
     {
       "name": "mioe3680_pci",
       "parent": "pci-device"
     },
+    {
+      "name": "vhost-user-backend",
+      "parent": "object"
+    },
     {
       "name": "vmxnet3",
       "parent": "pci-device"
@@ -21201,25 +21204,25 @@
       "parent": "smbus-device"
     },
     {
-      "name": "dbus-display",
-      "parent": "object"
-    },
-    {
-      "name": "vhost-user-gpu-pci",
-      "parent": "vhost-user-gpu-pci-base-type"
+      "name": "virtio-serial-device",
+      "parent": "virtio-device"
     },
     {
       "name": "virtio-serial-pci",
       "parent": "virtio-serial-pci-base"
     },
-    {
-      "name": "virtio-serial-device",
-      "parent": "virtio-device"
-    },
     {
       "name": "Denverton-v2-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "xen-bridge",
+      "parent": "sys-bus-device"
+    },
+    {
+      "name": "vhost-user-gpu-pci",
+      "parent": "vhost-user-gpu-pci-base-type"
+    },
     {
       "name": "iothread",
       "parent": "object"
@@ -21240,14 +21243,14 @@
       "name": "ati-vga",
       "parent": "pci-device"
     },
-    {
-      "name": "kvm-i8259",
-      "parent": "pic-common"
-    },
     {
       "name": "pentium3-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "kvm-i8259",
+      "parent": "pic-common"
+    },
     {
       "name": "isa-serial",
       "parent": "isa-device"
@@ -21308,10 +21311,18 @@
       "name": "Opteron_G3-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "xen-cdrom",
+      "parent": "xen-block"
+    },
     {
       "name": "Cooperlake-v2-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "EPYC-v3-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "isa-ide",
       "parent": "isa-device"
@@ -21321,17 +21332,13 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "EPYC-v3-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "sgx-epc",
+      "parent": "device"
     },
     {
       "name": "scsi-cd",
       "parent": "scsi-disk-base"
     },
-    {
-      "name": "sgx-epc",
-      "parent": "device"
-    },
     {
       "name": "gpex-root",
       "parent": "pci-device"
@@ -21400,13 +21407,17 @@
       "name": "VGA",
       "parent": "pci-vga"
     },
+    {
+      "name": "i440FX",
+      "parent": "pci-device"
+    },
     {
       "name": "qio-channel-buffer",
       "parent": "qio-channel"
     },
     {
-      "name": "i440FX",
-      "parent": "pci-device"
+      "name": "xen-bus",
+      "parent": "bus"
     },
     {
       "name": "Penryn-v1-x86_64-cpu",
@@ -21425,16 +21436,16 @@
       "parent": "virtio-device"
     },
     {
-      "name": "pc-i440fx-3.1-machine",
-      "parent": "generic-pc-machine"
+      "name": "Icelake-Server-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "pci-serial-4x",
       "parent": "pci-device"
     },
     {
-      "name": "Icelake-Server-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "pc-i440fx-3.1-machine",
+      "parent": "generic-pc-machine"
     },
     {
       "name": "sga",
@@ -21505,11 +21516,11 @@
       "parent": "usb-device"
     },
     {
-      "name": "SandyBridge-v1-x86_64-cpu",
+      "name": "IvyBridge-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
     {
-      "name": "IvyBridge-x86_64-cpu",
+      "name": "SandyBridge-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
     {
@@ -21572,6 +21583,10 @@
       "name": "ccid-bus",
       "parent": "bus"
     },
+    {
+      "name": "xen-pvdevice",
+      "parent": "pci-device"
+    },
     {
       "name": "ide-hd",
       "parent": "ide-device"
@@ -21604,14 +21619,14 @@
       "name": "pc-i440fx-4.1-machine",
       "parent": "generic-pc-machine"
     },
-    {
-      "name": "chardev-spiceport",
-      "parent": "chardev-spice"
-    },
     {
       "name": "e1000-82544gc",
       "parent": "e1000-base"
     },
+    {
+      "name": "chardev-spiceport",
+      "parent": "chardev-spice"
+    },
     {
       "name": "tls-creds-x509",
       "parent": "tls-creds"
@@ -21644,6 +21659,10 @@
       "name": "isa-cirrus-vga",
       "parent": "isa-device"
     },
+    {
+      "name": "pvrdma",
+      "parent": "pci-device"
+    },
     {
       "name": "qemu64-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -21652,10 +21671,6 @@
       "name": "Skylake-Server-v2-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
-    {
-      "name": "chardev-braille",
-      "parent": "chardev"
-    },
     {
       "name": "pc-q35-4.1-machine",
       "parent": "generic-pc-machine"
@@ -21688,14 +21703,14 @@
       "name": "pc-testdev",
       "parent": "isa-device"
     },
-    {
-      "name": "megasas",
-      "parent": "megasas-base"
-    },
     {
       "name": "qio-channel-websock",
       "parent": "qio-channel"
     },
+    {
+      "name": "megasas",
+      "parent": "megasas-base"
+    },
     {
       "name": "virtio-iommu-pci",
       "parent": "virtio-iommu-pci-base-type"
@@ -21704,18 +21719,22 @@
       "name": "pc-i440fx-6.1-machine",
       "parent": "generic-pc-machine"
     },
-    {
-      "name": "Icelake-Client-v1-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "vmcoreinfo",
       "parent": "device"
     },
+    {
+      "name": "Icelake-Client-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "tpci200",
       "parent": "pci-device"
     },
+    {
+      "name": "chardev-braille",
+      "parent": "chardev"
+    },
     {
       "name": "rocker",
       "parent": "pci-device"
@@ -21748,6 +21767,10 @@
       "name": "qemu-console",
       "parent": "object"
     },
+    {
+      "name": "chardev-socket",
+      "parent": "chardev"
+    },
     {
       "name": "clock",
       "parent": "object"
@@ -21785,20 +21808,20 @@
       "parent": "device"
     },
     {
-      "name": "Cascadelake-Server-noTSX-x86_64-cpu",
+      "name": "Skylake-Server-IBRS-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
     {
-      "name": "chardev-socket",
-      "parent": "chardev"
+      "name": "virtio-pmem",
+      "parent": "virtio-device"
     },
     {
       "name": "nvme-bus",
       "parent": "bus"
     },
     {
-      "name": "virtconsole",
-      "parent": "virtserialport"
+      "name": "xen-sysbus",
+      "parent": "bus"
     },
     {
       "name": "virtio-net-pci-non-transitional",
@@ -21817,12 +21840,12 @@
       "parent": "scsi-disk-base"
     },
     {
-      "name": "usb-kbd",
-      "parent": "usb-hid"
+      "name": "Cascadelake-Server-noTSX-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
-      "name": "lsi53c810",
-      "parent": "lsi53c895a"
+      "name": "usb-kbd",
+      "parent": "usb-hid"
     },
     {
       "name": "isa-fdc",
@@ -21849,24 +21872,24 @@
       "parent": "object"
     },
     {
-      "name": "ccid-card-emulated",
-      "parent": "ccid-card"
+      "name": "Westmere-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "pc-q35-2.9-machine",
       "parent": "generic-pc-machine"
     },
     {
-      "name": "virtio-pmem",
-      "parent": "virtio-device"
+      "name": "Skylake-Client-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "tpm-tis",
       "parent": "isa-device"
     },
     {
-      "name": "Skylake-Server-IBRS-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "virtconsole",
+      "parent": "virtserialport"
     },
     {
       "name": "hyperv-testdev",
@@ -21889,8 +21912,8 @@
       "parent": "generic-pc-machine"
     },
     {
-      "name": "Westmere-v2-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "ccid-card-emulated",
+      "parent": "ccid-card"
     },
     {
       "name": "pc-q35-5.1-machine",
@@ -21905,8 +21928,8 @@
       "parent": "virtio-input-hid-device"
     },
     {
-      "name": "Skylake-Client-v1-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "lsi53c810",
+      "parent": "lsi53c895a"
     },
     {
       "name": "ioh3420",
@@ -22008,6 +22031,10 @@
       "name": "phenom-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "virtio-net-pci-transitional",
+      "parent": "virtio-net-pci-base"
+    },
     {
       "name": "vhost-vsock-pci",
       "parent": "vhost-vsock-pci-base"
@@ -22017,8 +22044,8 @@
       "parent": "device"
     },
     {
-      "name": "virtio-net-pci-transitional",
-      "parent": "virtio-net-pci-base"
+      "name": "vhost-user-blk-pci-transitional",
+      "parent": "vhost-user-blk-pci-base"
     },
     {
       "name": "irq",
@@ -22045,8 +22072,8 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "vhost-user-blk-pci-transitional",
-      "parent": "vhost-user-blk-pci-base"
+      "name": "xenfv-3.1-machine",
+      "parent": "generic-pc-machine"
     },
     {
       "name": "coreduo-x86_64-cpu",
@@ -22132,18 +22159,26 @@
       "name": "Skylake-Server-v4-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
-    {
-      "name": "Nehalem-v1-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "kvmvapic",
       "parent": "sys-bus-device"
     },
+    {
+      "name": "Nehalem-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "nvme-ns",
       "parent": "device"
     },
+    {
+      "name": "authz-simple",
+      "parent": "authz"
+    },
+    {
+      "name": "Icelake-Server-v6-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "Opteron_G2-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -22157,8 +22192,8 @@
       "parent": "vhost-user-blk-pci-base"
     },
     {
-      "name": "authz-simple",
-      "parent": "authz"
+      "name": "xen-accel",
+      "parent": "accel"
     },
     {
       "name": "fw_cfg_io",
@@ -22276,10 +22311,18 @@
       "name": "qemu32-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "xen-sysdev",
+      "parent": "sys-bus-device"
+    },
     {
       "name": "Haswell-noTSX-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "chardev-null",
+      "parent": "chardev"
+    },
     {
       "name": "pci-serial",
       "parent": "pci-device"
@@ -22308,6 +22351,10 @@
       "name": "Opteron_G4-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "qio-channel-rdma",
+      "parent": "qio-channel"
+    },
     {
       "name": "ne2k_isa",
       "parent": "isa-device"
@@ -22328,14 +22375,14 @@
       "name": "vhost-user-gpu",
       "parent": "virtio-gpu-base"
     },
-    {
-      "name": "hda-duplex",
-      "parent": "hda-audio"
-    },
     {
       "name": "pentium-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "hda-duplex",
+      "parent": "hda-audio"
+    },
     {
       "name": "amd-iommu-iommu-memory-region",
       "parent": "iommu-memory-region"
@@ -22349,13 +22396,17 @@
       "parent": "pci-device"
     },
     {
-      "name": "Nehalem-IBRS-x86_64-cpu",
+      "name": "Cooperlake-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
     {
       "name": "Cascadelake-Server-v3-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "vhost-user-rng-pci",
+      "parent": "vhost-user-rng-pci-base"
+    },
     {
       "name": "cfi.pflash01",
       "parent": "sys-bus-device"
@@ -22365,12 +22416,8 @@
       "parent": "virtio-device"
     },
     {
-      "name": "chardev-null",
-      "parent": "chardev"
-    },
-    {
-      "name": "Cooperlake-v1-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "isa-parallel",
+      "parent": "isa-device"
     },
     {
       "name": "Skylake-Server-x86_64-cpu",
@@ -22381,16 +22428,16 @@
       "parent": "generic-pc-machine"
     },
     {
-      "name": "isa-parallel",
-      "parent": "isa-device"
+      "name": "Nehalem-IBRS-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "pentium2-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
     {
-      "name": "vhost-user-rng-pci",
-      "parent": "vhost-user-rng-pci-base"
+      "name": "xen-platform",
+      "parent": "pci-device"
     },
     {
       "name": "isa-vga",
@@ -22429,21 +22476,21 @@
       "parent": "rng-backend"
     },
     {
-      "name": "qxl-vga",
-      "parent": "pci-qxl"
+      "name": "Cascadelake-Server-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "i82558b",
       "parent": "pci-device"
     },
-    {
-      "name": "Cascadelake-Server-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "ivshmem-doorbell",
       "parent": "ivshmem-common"
     },
+    {
+      "name": "qxl-vga",
+      "parent": "pci-qxl"
+    },
     {
       "name": "PIIX3-xen",
       "parent": "pci-piix3"
@@ -22625,8 +22672,8 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "pcie-root-port",
-      "parent": "pcie-root-port-base"
+      "name": "kvm64-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "IDE",
@@ -22637,8 +22684,8 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "kvm64-v1-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "pcie-root-port",
+      "parent": "pcie-root-port-base"
     },
     {
       "name": "mptsas1068",
@@ -22649,13 +22696,17 @@
       "parent": "scsi-disk-base"
     },
     {
-      "name": "chardev-spicevmc",
-      "parent": "chardev-spice"
+      "name": "xenpv-machine",
+      "parent": "machine"
     },
     {
       "name": "Snowridge-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "chardev-spicevmc",
+      "parent": "chardev-spice"
+    },
     {
       "name": "q35-pcihost",
       "parent": "pcie-host-bridge"
@@ -22720,10 +22771,6 @@
       "name": "vhost-user-blk",
       "parent": "virtio-device"
     },
-    {
-      "name": "SandyBridge-v2-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "nvme-subsys",
       "parent": "device"
@@ -22732,6 +22779,10 @@
       "name": "Haswell-noTSX-IBRS-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "SandyBridge-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "pc-q35-5.2-machine",
       "parent": "generic-pc-machine"
@@ -27240,10 +27291,6 @@
       "name": "hv-spinlocks",
       "type": "uint32"
     },
-    {
-      "name": "sgx-tokenkey",
-      "type": "bool"
-    },
     {
       "name": "erms",
       "type": "bool"
@@ -27253,7 +27300,7 @@
       "type": "bool"
     },
     {
-      "name": "vmx-eptad",
+      "name": "sgx-tokenkey",
       "type": "bool"
     },
     {
@@ -27302,7 +27349,7 @@
       "type": "bool"
     },
     {
-      "name": "movdiri",
+      "name": "vmx-eptad",
       "type": "bool"
     },
     {
@@ -27325,6 +27372,10 @@
       "name": "x-vendor-cpuid-only",
       "type": "bool"
     },
+    {
+      "name": "vmx-unrestricted-guest",
+      "type": "bool"
+    },
     {
       "name": "host-phys-bits-limit",
       "type": "uint8"
@@ -27333,23 +27384,23 @@
       "name": "pae",
       "type": "bool"
     },
+    {
+      "name": "ssse3",
+      "type": "bool"
+    },
     {
       "name": "hv-runtime",
       "description": "on/off",
       "type": "bool"
     },
-    {
-      "name": "ssse3",
-      "type": "bool"
-    },
-    {
-      "name": "vmx-unrestricted-guest",
-      "type": "bool"
-    },
     {
       "name": "phe",
       "type": "bool"
     },
+    {
+      "name": "movdiri",
+      "type": "bool"
+    },
     {
       "name": "host-phys-bits",
       "type": "bool"
@@ -27544,6 +27595,10 @@
       "name": "xsaves",
       "type": "bool"
     },
+    {
+      "name": "vmx-entry-load-pat",
+      "type": "bool"
+    },
     {
       "name": "vgif",
       "type": "bool"
@@ -27553,7 +27608,7 @@
       "type": "bool"
     },
     {
-      "name": "vmx-entry-load-pat",
+      "name": "xfd",
       "type": "bool"
     },
     {
@@ -27693,6 +27748,10 @@
       "name": "vmx-entry-load-pkrs",
       "type": "bool"
     },
+    {
+      "name": "vmx-entry-ia32e-mode",
+      "type": "bool"
+    },
     {
       "name": "x-hv-max-vps",
       "type": "int32"
@@ -27706,7 +27765,7 @@
       "type": "bool"
     },
     {
-      "name": "vmx-entry-ia32e-mode",
+      "name": "amx-int8",
       "type": "bool"
     },
     {
@@ -28146,7 +28205,7 @@
       "type": "bool"
     },
     {
-      "name": "sgx-exinfo",
+      "name": "clzero",
       "type": "bool"
     },
     {
@@ -28158,11 +28217,11 @@
       "type": "bool"
     },
     {
-      "name": "legacy-cache",
+      "name": "sgx-exinfo",
       "type": "bool"
     },
     {
-      "name": "clzero",
+      "name": "legacy-cache",
       "type": "bool"
     },
     {
@@ -28358,6 +28417,10 @@
       "name": "decodeassists",
       "type": "bool"
     },
+    {
+      "name": "vmx-wbinvd-exit",
+      "type": "bool"
+    },
     {
       "name": "pat",
       "type": "bool"
@@ -28394,6 +28457,10 @@
       "name": "ht",
       "type": "bool"
     },
+    {
+      "name": "amx-tile",
+      "type": "bool"
+    },
     {
       "name": "xtpr",
       "type": "bool"
@@ -28598,7 +28665,7 @@
       "type": "bool"
     },
     {
-      "name": "vmx-wbinvd-exit",
+      "name": "ibrs-all",
       "type": "bool"
     },
     {
@@ -28631,7 +28698,7 @@
       "type": "OnOffAuto"
     },
     {
-      "name": "ibrs-all",
+      "name": "amx-bf16",
       "type": "bool"
     },
     {
@@ -28888,6 +28955,13 @@
       "deprecated": false,
       "default-ram-id": "pc.ram"
     },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xenpv",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
+    },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-6.2",
@@ -28986,6 +29060,16 @@
       "deprecated": false,
       "default-ram-id": "pc.ram"
     },
+    {
+      "hotpluggable-cpus": true,
+      "name": "xenfv-3.1",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 128,
+      "deprecated": false,
+      "default-ram-id": "pc.ram",
+      "alias": "xenfv"
+    },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-2.4",
@@ -29275,6 +29359,15 @@
       "deprecated": false,
       "default-ram-id": "pc.ram"
     },
+    {
+      "hotpluggable-cpus": true,
+      "name": "xenfv-4.2",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 128,
+      "deprecated": false,
+      "default-ram-id": "pc.ram"
+    },
     {
       "hotpluggable-cpus": false,
       "name": "microvm",
@@ -30461,6 +30554,42 @@
       "migration-safe": true,
       "deprecated": false
     },
+    {
+      "name": "Icelake-Server-v6",
+      "typename": "Icelake-Server-v6-x86_64-cpu",
+      "unavailable-features": [
+        "pcid",
+        "erms",
+        "invpcid",
+        "avx512f",
+        "avx512dq",
+        "avx512ifma",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "avx512vbmi",
+        "pku",
+        "avx512vbmi2",
+        "gfni",
+        "vaes",
+        "vpclmulqdq",
+        "avx512vnni",
+        "avx512bitalg",
+        "avx512-vpopcntdq",
+        "la57",
+        "fsrm",
+        "spec-ctrl",
+        "avx512f",
+        "avx512f",
+        "avx512f",
+        "pku",
+        "ibrs-all",
+        "taa-no"
+      ],
+      "static": false,
+      "migration-safe": true,
+      "deprecated": false
+    },
     {
       "name": "Icelake-Server-v5",
       "typename": "Icelake-Server-v5-x86_64-cpu",
@@ -31683,6 +31812,41 @@
       ],
       "option": "machine"
     },
+    {
+      "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": [
         {
@@ -31816,41 +31980,6 @@
       ],
       "option": "spice"
     },
-    {
-      "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": [
       ],
@@ -33112,6 +33241,7 @@
         "vmx-mwait-exit": false,
         "vmx-pml": false,
         "vmx-nmi-exit": false,
+        "amx-tile": false,
         "vmx-invept-single-context-noglobals": false,
         "pn": false,
         "rsba": false,
@@ -33144,6 +33274,7 @@
         "smap": true,
         "pfthreshold": false,
         "vmx-invpcid-exit": false,
+        "amx-int8": false,
         "x2apic": true,
         "avx512vbmi": false,
         "avx512vnni": false,
@@ -33190,6 +33321,7 @@
         "cldemote": false,
         "sgx-tokenkey": false,
         "vmx-ept": false,
+        "xfd": false,
         "kvm-mmu": false,
         "sse4.2": true,
         "pge": true,
@@ -33294,7 +33426,7 @@
         "bmi1": true,
         "bmi2": true,
         "kvm-pv-unhalt": true,
-        "tsc-scale": false,
+        "tsc-scale": true,
         "topoext": false,
         "amd-stibp": true,
         "vmx-preemption-timer": false,
@@ -33323,6 +33455,7 @@
         "xstore": false,
         "rtm": false,
         "kvm-hint-dedicated": false,
+        "amx-bf16": false,
         "lmce": false,
         "perfctr-nb": false,
         "rdrand": true,
@@ -33459,6 +33592,7 @@
         "vmx-mwait-exit": false,
         "vmx-pml": false,
         "vmx-nmi-exit": false,
+        "amx-tile": false,
         "vmx-invept-single-context-noglobals": false,
         "pn": false,
         "rsba": false,
@@ -33491,6 +33625,7 @@
         "smap": true,
         "pfthreshold": false,
         "vmx-invpcid-exit": false,
+        "amx-int8": false,
         "x2apic": true,
         "avx512vbmi": false,
         "avx512vnni": false,
@@ -33537,6 +33672,7 @@
         "cldemote": false,
         "sgx-tokenkey": false,
         "vmx-ept": false,
+        "xfd": false,
         "kvm-mmu": false,
         "sse4.2": true,
         "pge": true,
@@ -33641,7 +33777,7 @@
         "bmi1": true,
         "bmi2": true,
         "kvm-pv-unhalt": true,
-        "tsc-scale": false,
+        "tsc-scale": true,
         "topoext": false,
         "amd-stibp": true,
         "vmx-preemption-timer": false,
@@ -33670,6 +33806,7 @@
         "xstore": false,
         "rtm": false,
         "kvm-hint-dedicated": false,
+        "amx-bf16": false,
         "lmce": false,
         "perfctr-nb": false,
         "rdrand": true,
@@ -34858,6 +34995,54 @@
       "migration-safe": true,
       "deprecated": false
     },
+    {
+      "name": "Icelake-Server-v6",
+      "typename": "Icelake-Server-v6-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "avx2",
+        "invpcid",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512ifma",
+        "avx512cd",
+        "sha-ni",
+        "avx512bw",
+        "avx512vl",
+        "avx512vbmi",
+        "avx512vbmi2",
+        "gfni",
+        "vaes",
+        "vpclmulqdq",
+        "avx512vnni",
+        "avx512bitalg",
+        "avx512-vpopcntdq",
+        "rdpid",
+        "fsrm",
+        "spec-ctrl",
+        "arch-capabilities",
+        "ssbd",
+        "3dnowprefetch",
+        "wbnoinvd",
+        "xsavec",
+        "xsaves",
+        "rdctl-no",
+        "ibrs-all",
+        "skip-l1dfl-vmentry",
+        "mds-no",
+        "pschange-mc-no",
+        "taa-no"
+      ],
+      "static": false,
+      "migration-safe": true,
+      "deprecated": false
+    },
     {
       "name": "Icelake-Server-v5",
       "typename": "Icelake-Server-v5-x86_64-cpu",
@@ -36552,6 +36737,7 @@
         "vmx-mwait-exit": false,
         "vmx-pml": false,
         "vmx-nmi-exit": false,
+        "amx-tile": false,
         "vmx-invept-single-context-noglobals": false,
         "pn": false,
         "rsba": false,
@@ -36584,6 +36770,7 @@
         "smap": true,
         "pfthreshold": false,
         "vmx-invpcid-exit": false,
+        "amx-int8": false,
         "x2apic": false,
         "avx512vbmi": false,
         "avx512vnni": false,
@@ -36630,6 +36817,7 @@
         "cldemote": false,
         "sgx-tokenkey": false,
         "vmx-ept": false,
+        "xfd": false,
         "kvm-mmu": false,
         "sse4.2": true,
         "pge": true,
@@ -36763,6 +36951,7 @@
         "xstore": false,
         "rtm": false,
         "kvm-hint-dedicated": false,
+        "amx-bf16": false,
         "lmce": false,
         "perfctr-nb": false,
         "rdrand": true,
@@ -36899,6 +37088,7 @@
         "vmx-mwait-exit": false,
         "vmx-pml": false,
         "vmx-nmi-exit": false,
+        "amx-tile": false,
         "vmx-invept-single-context-noglobals": false,
         "pn": false,
         "rsba": false,
@@ -36931,6 +37121,7 @@
         "smap": true,
         "pfthreshold": false,
         "vmx-invpcid-exit": false,
+        "amx-int8": false,
         "x2apic": false,
         "avx512vbmi": false,
         "avx512vnni": false,
@@ -36977,6 +37168,7 @@
         "cldemote": false,
         "sgx-tokenkey": false,
         "vmx-ept": false,
+        "xfd": false,
         "kvm-mmu": false,
         "sse4.2": true,
         "pge": true,
@@ -37110,6 +37302,7 @@
         "xstore": false,
         "rtm": false,
         "kvm-hint-dedicated": false,
+        "amx-bf16": false,
         "lmce": false,
         "perfctr-nb": false,
         "rdrand": true,
@@ -37177,6 +37370,13 @@
       "deprecated": false,
       "default-ram-id": "pc.ram"
     },
+    {
+      "hotpluggable-cpus": false,
+      "name": "xenpv",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
+    },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-6.2",
@@ -37275,6 +37475,16 @@
       "deprecated": false,
       "default-ram-id": "pc.ram"
     },
+    {
+      "hotpluggable-cpus": true,
+      "name": "xenfv-3.1",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 128,
+      "deprecated": false,
+      "default-ram-id": "pc.ram",
+      "alias": "xenfv"
+    },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-2.4",
@@ -37564,6 +37774,15 @@
       "deprecated": false,
       "default-ram-id": "pc.ram"
     },
+    {
+      "hotpluggable-cpus": true,
+      "name": "xenfv-4.2",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 128,
+      "deprecated": false,
+      "default-ram-id": "pc.ram"
+    },
     {
       "hotpluggable-cpus": false,
       "name": "microvm",
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 5227e3ee0b..3f42e67d0b 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -245,10 +245,10 @@
   <flag name='dirtyrate-param.mode'/>
   <flag name='blockdev.nbd.tls-hostname'/>
   <flag name='memory-backend-file.prealloc-threads'/>
-  <version>6002050</version>
+  <version>6002092</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
-  <package>v6.2.0-2347-gd9ccf33f94</package>
+  <package>v7.0.0-rc2</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
     <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/>
@@ -335,6 +335,7 @@
     <property name='vmx-mwait-exit' type='boolean' value='false'/>
     <property name='vmx-pml' type='boolean' value='false'/>
     <property name='vmx-nmi-exit' type='boolean' value='false'/>
+    <property name='amx-tile' type='boolean' value='false'/>
     <property name='vmx-invept-single-context-noglobals' type='boolean' value='false'/>
     <property name='pn' type='boolean' value='false'/>
     <property name='rsba' type='boolean' value='false'/>
@@ -367,6 +368,7 @@
     <property name='smap' type='boolean' value='true' migratable='yes'/>
     <property name='pfthreshold' type='boolean' value='false'/>
     <property name='vmx-invpcid-exit' type='boolean' value='false'/>
+    <property name='amx-int8' type='boolean' value='false'/>
     <property name='x2apic' type='boolean' value='true' migratable='yes'/>
     <property name='avx512vbmi' type='boolean' value='false'/>
     <property name='avx512vnni' type='boolean' value='false'/>
@@ -413,6 +415,7 @@
     <property name='cldemote' type='boolean' value='false'/>
     <property name='sgx-tokenkey' type='boolean' value='false'/>
     <property name='vmx-ept' type='boolean' value='false'/>
+    <property name='xfd' type='boolean' value='false'/>
     <property name='kvm-mmu' type='boolean' value='false'/>
     <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
     <property name='pge' type='boolean' value='true' migratable='yes'/>
@@ -517,7 +520,7 @@
     <property name='bmi1' type='boolean' value='true' migratable='yes'/>
     <property name='bmi2' type='boolean' value='true' migratable='yes'/>
     <property name='kvm-pv-unhalt' type='boolean' value='true' migratable='yes'/>
-    <property name='tsc-scale' type='boolean' value='false'/>
+    <property name='tsc-scale' type='boolean' value='true' migratable='yes'/>
     <property name='topoext' type='boolean' value='false'/>
     <property name='amd-stibp' type='boolean' value='true' migratable='yes'/>
     <property name='vmx-preemption-timer' type='boolean' value='false'/>
@@ -546,6 +549,7 @@
     <property name='xstore' type='boolean' value='false'/>
     <property name='rtm' type='boolean' value='false'/>
     <property name='kvm-hint-dedicated' type='boolean' value='false'/>
+    <property name='amx-bf16' type='boolean' value='false'/>
     <property name='lmce' type='boolean' value='false'/>
     <property name='perfctr-nb' type='boolean' value='false'/>
     <property name='rdrand' type='boolean' value='true' migratable='yes'/>
@@ -953,6 +957,35 @@
   <cpu type='kvm' name='IvyBridge' typename='IvyBridge-x86_64-cpu' usable='no'>
     <blocker name='erms'/>
   </cpu>
+  <cpu type='kvm' name='Icelake-Server-v6' typename='Icelake-Server-v6-x86_64-cpu' usable='no'>
+    <blocker name='pcid'/>
+    <blocker name='erms'/>
+    <blocker name='invpcid'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='avx512ifma'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='avx512vbmi'/>
+    <blocker name='pku'/>
+    <blocker name='avx512vbmi2'/>
+    <blocker name='gfni'/>
+    <blocker name='vaes'/>
+    <blocker name='vpclmulqdq'/>
+    <blocker name='avx512vnni'/>
+    <blocker name='avx512bitalg'/>
+    <blocker name='avx512-vpopcntdq'/>
+    <blocker name='la57'/>
+    <blocker name='fsrm'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='pku'/>
+    <blocker name='ibrs-all'/>
+    <blocker name='taa-no'/>
+  </cpu>
   <cpu type='kvm' name='Icelake-Server-v5' typename='Icelake-Server-v5-x86_64-cpu' usable='no'>
     <blocker name='pcid'/>
     <blocker name='erms'/>
@@ -1587,6 +1620,7 @@
   <machine type='kvm' name='pc-q35-5.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <machine type='kvm' name='xenpv' maxCpus='1'/>
   <machine type='kvm' name='pc-i440fx-6.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
@@ -1597,6 +1631,7 @@
   <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-q35-6.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/>
+  <machine type='kvm' name='xenfv-3.1' alias='xenfv' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='x-remote' maxCpus='1'/>
@@ -1628,6 +1663,7 @@
   <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-i440fx-6.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <machine type='kvm' name='xenfv-4.2' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='microvm.ram'/>
   <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
@@ -1722,6 +1758,7 @@
     <property name='vmx-mwait-exit' type='boolean' value='false'/>
     <property name='vmx-pml' type='boolean' value='false'/>
     <property name='vmx-nmi-exit' type='boolean' value='false'/>
+    <property name='amx-tile' type='boolean' value='false'/>
     <property name='vmx-invept-single-context-noglobals' type='boolean' value='false'/>
     <property name='pn' type='boolean' value='false'/>
     <property name='rsba' type='boolean' value='false'/>
@@ -1754,6 +1791,7 @@
     <property name='smap' type='boolean' value='true' migratable='yes'/>
     <property name='pfthreshold' type='boolean' value='false'/>
     <property name='vmx-invpcid-exit' type='boolean' value='false'/>
+    <property name='amx-int8' type='boolean' value='false'/>
     <property name='x2apic' type='boolean' value='false'/>
     <property name='avx512vbmi' type='boolean' value='false'/>
     <property name='avx512vnni' type='boolean' value='false'/>
@@ -1800,6 +1838,7 @@
     <property name='cldemote' type='boolean' value='false'/>
     <property name='sgx-tokenkey' type='boolean' value='false'/>
     <property name='vmx-ept' type='boolean' value='false'/>
+    <property name='xfd' type='boolean' value='false'/>
     <property name='kvm-mmu' type='boolean' value='false'/>
     <property name='sse4.2' type='boolean' value='true' migratable='yes'/>
     <property name='pge' type='boolean' value='true' migratable='yes'/>
@@ -1933,6 +1972,7 @@
     <property name='xstore' type='boolean' value='false'/>
     <property name='rtm' type='boolean' value='false'/>
     <property name='kvm-hint-dedicated' type='boolean' value='false'/>
+    <property name='amx-bf16' type='boolean' value='false'/>
     <property name='lmce' type='boolean' value='false'/>
     <property name='perfctr-nb' type='boolean' value='false'/>
     <property name='rdrand' type='boolean' value='true' migratable='yes'/>
@@ -2491,6 +2531,47 @@
     <blocker name='avx'/>
     <blocker name='f16c'/>
   </cpu>
+  <cpu type='tcg' name='Icelake-Server-v6' typename='Icelake-Server-v6-x86_64-cpu' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='pcid'/>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='avx2'/>
+    <blocker name='invpcid'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='rdseed'/>
+    <blocker name='avx512ifma'/>
+    <blocker name='avx512cd'/>
+    <blocker name='sha-ni'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='avx512vbmi'/>
+    <blocker name='avx512vbmi2'/>
+    <blocker name='gfni'/>
+    <blocker name='vaes'/>
+    <blocker name='vpclmulqdq'/>
+    <blocker name='avx512vnni'/>
+    <blocker name='avx512bitalg'/>
+    <blocker name='avx512-vpopcntdq'/>
+    <blocker name='rdpid'/>
+    <blocker name='fsrm'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='arch-capabilities'/>
+    <blocker name='ssbd'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='wbnoinvd'/>
+    <blocker name='xsavec'/>
+    <blocker name='xsaves'/>
+    <blocker name='rdctl-no'/>
+    <blocker name='ibrs-all'/>
+    <blocker name='skip-l1dfl-vmentry'/>
+    <blocker name='mds-no'/>
+    <blocker name='pschange-mc-no'/>
+    <blocker name='taa-no'/>
+  </cpu>
   <cpu type='tcg' name='Icelake-Server-v5' typename='Icelake-Server-v5-x86_64-cpu' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
@@ -3645,6 +3726,7 @@
   <machine type='tcg' name='pc-q35-5.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <machine type='tcg' name='xenpv' maxCpus='1'/>
   <machine type='tcg' name='pc-i440fx-6.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
@@ -3655,6 +3737,7 @@
   <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-6.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/>
+  <machine type='tcg' name='xenfv-3.1' alias='xenfv' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='x-remote' maxCpus='1'/>
@@ -3686,6 +3769,7 @@
   <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-6.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <machine type='tcg' name='xenfv-4.2' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='microvm.ram'/>
   <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args
index 7ed0ee28b8..fef92b02ba 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel kvm \
--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
+-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,tsc-scale=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
 -m 214 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \