From c419a4356568291429071b734d335aeda44d8c3c Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 27 Sep 2019 07:27:57 +0200
Subject: [PATCH] tests: qemucapabilities: Update caps of qemu-4.1 to released
 version

Now that qemu 4.1 was released we can update the capabilities to the
final form.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---
 .../caps_4.1.0.x86_64.replies                 | 6915 +++++++++++------
 .../caps_4.1.0.x86_64.xml                     |  720 +-
 2 files changed, 5120 insertions(+), 2515 deletions(-)

diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
index 516e7139bd..68cae3d599 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
@@ -17,11 +17,11 @@
 {
   "return": {
     "qemu": {
-      "micro": 50,
-      "minor": 0,
+      "micro": 0,
+      "minor": 1,
       "major": 4
     },
-    "package": "v4.0.0-1481-g33d6099906"
+    "package": "v4.1.0"
   },
   "id": "libvirt-2"
 }
@@ -54,12 +54,6 @@
     {
       "name": "query-qmp-schema"
     },
-    {
-      "name": "query-cpu-definitions"
-    },
-    {
-      "name": "query-cpu-model-expansion"
-    },
     {
       "name": "query-sev-capabilities"
     },
@@ -72,15 +66,9 @@
     {
       "name": "rtc-reset-reinjection"
     },
-    {
-      "name": "set-numa-node"
-    },
     {
       "name": "query-vm-generation-id"
     },
-    {
-      "name": "query-hotpluggable-cpus"
-    },
     {
       "name": "xen-load-devices-state"
     },
@@ -90,9 +78,6 @@
     {
       "name": "query-memory-devices"
     },
-    {
-      "name": "query-memdev"
-    },
     {
       "name": "query-command-line-options"
     },
@@ -111,60 +96,18 @@
     {
       "name": "query-memory-size-summary"
     },
-    {
-      "name": "query-current-machine"
-    },
-    {
-      "name": "query-machines"
-    },
     {
       "name": "closefd"
     },
     {
       "name": "getfd"
     },
-    {
-      "name": "object-del"
-    },
-    {
-      "name": "object-add"
-    },
-    {
-      "name": "query-dump-guest-memory-capability"
-    },
-    {
-      "name": "query-dump"
-    },
-    {
-      "name": "dump-guest-memory"
-    },
-    {
-      "name": "device_del"
-    },
     {
       "name": "xen-set-global-dirty-log"
     },
-    {
-      "name": "qom-list-properties"
-    },
-    {
-      "name": "device-list-properties"
-    },
-    {
-      "name": "qom-list-types"
-    },
     {
       "name": "change"
     },
-    {
-      "name": "qom-set"
-    },
-    {
-      "name": "qom-get"
-    },
-    {
-      "name": "qom-list"
-    },
     {
       "name": "human-monitor-command"
     },
@@ -189,9 +132,6 @@
     {
       "name": "memsave"
     },
-    {
-      "name": "cpu-add"
-    },
     {
       "name": "system_powerdown"
     },
@@ -213,12 +153,6 @@
     {
       "name": "query-iothreads"
     },
-    {
-      "name": "query-cpus-fast"
-    },
-    {
-      "name": "query-cpus"
-    },
     {
       "name": "query-events"
     },
@@ -243,6 +177,63 @@
     {
       "name": "qmp_capabilities"
     },
+    {
+      "name": "query-cpu-definitions"
+    },
+    {
+      "name": "query-cpu-model-expansion"
+    },
+    {
+      "name": "set-numa-node"
+    },
+    {
+      "name": "query-hotpluggable-cpus"
+    },
+    {
+      "name": "query-memdev"
+    },
+    {
+      "name": "query-current-machine"
+    },
+    {
+      "name": "query-machines"
+    },
+    {
+      "name": "cpu-add"
+    },
+    {
+      "name": "query-cpus-fast"
+    },
+    {
+      "name": "query-cpus"
+    },
+    {
+      "name": "device_del"
+    },
+    {
+      "name": "device-list-properties"
+    },
+    {
+      "name": "object-del"
+    },
+    {
+      "name": "object-add"
+    },
+    {
+      "name": "qom-list-properties"
+    },
+    {
+      "name": "qom-list-types"
+    },
+    {
+      "name": "qom-set"
+    },
+    {
+      "name": "qom-get"
+    },
+    {
+      "name": "qom-list"
+    },
     {
       "name": "trace-event-set-state"
     },
@@ -387,6 +378,15 @@
     {
       "name": "set_link"
     },
+    {
+      "name": "query-dump-guest-memory-capability"
+    },
+    {
+      "name": "query-dump"
+    },
+    {
+      "name": "dump-guest-memory"
+    },
     {
       "name": "chardev-send-break"
     },
@@ -638,34 +638,42 @@
       "name": "floppy-bus",
       "parent": "bus"
     },
-    {
-      "name": "chardev-stdio",
-      "parent": "chardev-fd"
-    },
     {
       "name": "chardev-testdev",
       "parent": "chardev"
     },
-    {
-      "name": "virtio-rng-device",
-      "parent": "virtio-device"
-    },
-    {
-      "name": "sev-guest",
-      "parent": "object"
-    },
     {
       "name": "usb-redir",
       "parent": "usb-device"
     },
     {
-      "name": "filter-buffer",
-      "parent": "netfilter"
+      "name": "vhost-user-input-pci",
+      "parent": "vhost-user-input-pci-base-type"
+    },
+    {
+      "name": "virtio-rng-device",
+      "parent": "virtio-device"
+    },
+    {
+      "name": "chardev-stdio",
+      "parent": "chardev-fd"
     },
     {
       "name": "usb-wacom-tablet",
       "parent": "usb-device"
     },
+    {
+      "name": "ich9-usb-uhci5",
+      "parent": "pci-uhci-usb"
+    },
+    {
+      "name": "filter-buffer",
+      "parent": "netfilter"
+    },
+    {
+      "name": "Icelake-Server-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "ich9-usb-uhci6",
       "parent": "pci-uhci-usb"
@@ -679,16 +687,16 @@
       "parent": "pit-common"
     },
     {
-      "name": "vhost-user-input-pci",
-      "parent": "virtio-input-pci"
+      "name": "Haswell-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "rtl8139",
       "parent": "pci-device"
     },
     {
-      "name": "ich9-usb-uhci5",
-      "parent": "pci-uhci-usb"
+      "name": "core2duo-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "pci-bridge",
@@ -699,16 +707,16 @@
       "parent": "generic-pc-machine"
     },
     {
-      "name": "pcm3680_pci",
-      "parent": "pci-device"
+      "name": "sev-guest",
+      "parent": "object"
     },
     {
       "name": "virtio-crypto-device",
       "parent": "virtio-device"
     },
     {
-      "name": "core2duo-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "pcm3680_pci",
+      "parent": "pci-device"
     },
     {
       "name": "virtio-blk-pci-transitional",
@@ -734,14 +742,14 @@
       "name": "kvm-ioapic",
       "parent": "ioapic-common"
     },
-    {
-      "name": "gus",
-      "parent": "isa-device"
-    },
     {
       "name": "ich9-usb-uhci4",
       "parent": "pci-uhci-usb"
     },
+    {
+      "name": "gus",
+      "parent": "isa-device"
+    },
     {
       "name": "usb-hub",
       "parent": "usb-device"
@@ -762,6 +770,14 @@
       "name": "chardev-wctablet",
       "parent": "chardev"
     },
+    {
+      "name": "Westmere-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
+    {
+      "name": "Opteron_G5-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "ich9-usb-uhci2",
       "parent": "pci-uhci-usb"
@@ -834,6 +850,10 @@
       "name": "tpm-passthrough",
       "parent": "tpm-backend"
     },
+    {
+      "name": "pentium3-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "virtio-serial-bus",
       "parent": "bus"
@@ -858,33 +878,33 @@
       "name": "pc-1.2-machine",
       "parent": "generic-pc-machine"
     },
-    {
-      "name": "isa-ipmi-bt",
-      "parent": "isa-device"
-    },
     {
       "name": "vhost-scsi-pci",
       "parent": "vhost-scsi-pci-base"
     },
     {
-      "name": "virtio-gpu-pci",
-      "parent": "virtio-gpu-pci-base"
+      "name": "isa-ipmi-bt",
+      "parent": "isa-device"
     },
     {
-      "name": "xio3130-downstream",
-      "parent": "pcie-slot"
+      "name": "virtio-gpu-pci",
+      "parent": "virtio-gpu-pci-base-type"
+    },
+    {
+      "name": "imx-usdhc",
+      "parent": "generic-sdhci"
     },
     {
       "name": "intel-iommu-iommu-memory-region",
       "parent": "qemu:iommu-memory-region"
     },
     {
-      "name": "pc-i440fx-2.3-machine",
-      "parent": "generic-pc-machine"
+      "name": "xio3130-downstream",
+      "parent": "pcie-slot"
     },
     {
-      "name": "ICH9-LPC",
-      "parent": "pci-device"
+      "name": "pc-i440fx-2.3-machine",
+      "parent": "generic-pc-machine"
     },
     {
       "name": "PCI",
@@ -895,8 +915,8 @@
       "parent": "sd-bus"
     },
     {
-      "name": "imx-usdhc",
-      "parent": "generic-sdhci"
+      "name": "ICH9-LPC",
+      "parent": "pci-device"
     },
     {
       "name": "pci-serial-2x",
@@ -906,6 +926,10 @@
       "name": "igd-passthrough-isa-bridge",
       "parent": "pci-device"
     },
+    {
+      "name": "ich9-usb-ehci2",
+      "parent": "pci-ehci-usb"
+    },
     {
       "name": "virtio-9p-device",
       "parent": "virtio-device"
@@ -935,8 +959,8 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "ich9-usb-ehci2",
-      "parent": "pci-ehci-usb"
+      "name": "Skylake-Client-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "usb-net",
@@ -967,12 +991,12 @@
       "parent": "pci-ehci-usb"
     },
     {
-      "name": "virtio-input-host-pci",
-      "parent": "virtio-input-pci"
+      "name": "pc-q35-3.0-machine",
+      "parent": "generic-pc-machine"
     },
     {
-      "name": "mch",
-      "parent": "pci-device"
+      "name": "virtio-input-host-pci",
+      "parent": "virtio-input-host-pci-base-type"
     },
     {
       "name": "chardev-hci",
@@ -983,8 +1007,8 @@
       "parent": "pc-dimm"
     },
     {
-      "name": "pc-q35-3.0-machine",
-      "parent": "generic-pc-machine"
+      "name": "mch",
+      "parent": "pci-device"
     },
     {
       "name": "virtio-9p-pci-transitional",
@@ -1031,16 +1055,20 @@
       "parent": "device"
     },
     {
-      "name": "pc-q35-2.8-machine",
-      "parent": "generic-pc-machine"
+      "name": "generic-sdhci",
+      "parent": "sys-bus-device"
     },
     {
       "name": "vhost-user-scsi-pci-non-transitional",
       "parent": "vhost-user-scsi-pci-base"
     },
     {
-      "name": "generic-sdhci",
-      "parent": "sys-bus-device"
+      "name": "vmmouse",
+      "parent": "isa-device"
+    },
+    {
+      "name": "pc-q35-2.8-machine",
+      "parent": "generic-pc-machine"
     },
     {
       "name": "i82557a",
@@ -1055,24 +1083,28 @@
       "parent": "virtio-scsi-pci-base"
     },
     {
-      "name": "vmmouse",
-      "parent": "isa-device"
+      "name": "Haswell-v3-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "athlon-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "chardev-memory",
+      "parent": "chardev-ringbuf"
+    },
     {
       "name": "chardev-udp",
       "parent": "chardev"
     },
     {
       "name": "virtio-mouse-pci",
-      "parent": "virtio-input-hid-pci"
+      "parent": "virtio-mouse-pci-base-type"
     },
     {
-      "name": "chardev-memory",
-      "parent": "chardev-ringbuf"
+      "name": "usb-tablet",
+      "parent": "usb-hid"
     },
     {
       "name": "pc-i440fx-1.6-machine",
@@ -1080,7 +1112,15 @@
     },
     {
       "name": "vhost-user-vga",
-      "parent": "virtio-vga-base"
+      "parent": "vhost-user-vga-base-type"
+    },
+    {
+      "name": "Opteron_G2-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
+    {
+      "name": "Broadwell-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "usb-braille",
@@ -1098,6 +1138,10 @@
       "name": "amd-iommu",
       "parent": "x86-iommu"
     },
+    {
+      "name": "Nehalem-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "virtio-9p-pci-non-transitional",
       "parent": "virtio-9p-pci-base"
@@ -1123,8 +1167,8 @@
       "parent": "device"
     },
     {
-      "name": "pc-q35-4.0.1-machine",
-      "parent": "generic-pc-machine"
+      "name": "isabus-bridge",
+      "parent": "sys-bus-device"
     },
     {
       "name": "sysbus-ahci",
@@ -1135,20 +1179,20 @@
       "parent": "vhost-scsi-common"
     },
     {
-      "name": "usb-tablet",
-      "parent": "usb-hid"
-    },
-    {
-      "name": "virtio-blk-pci-non-transitional",
-      "parent": "virtio-blk-pci-base"
+      "name": "pc-q35-4.0.1-machine",
+      "parent": "generic-pc-machine"
     },
     {
       "name": "esp",
       "parent": "sys-bus-device"
     },
     {
-      "name": "isabus-bridge",
-      "parent": "sys-bus-device"
+      "name": "virtio-blk-pci-non-transitional",
+      "parent": "virtio-blk-pci-base"
+    },
+    {
+      "name": "IvyBridge-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "ne2k_pci",
@@ -1166,6 +1210,10 @@
       "name": "tcg-accel",
       "parent": "accel"
     },
+    {
+      "name": "virtio-gpu-device",
+      "parent": "virtio-gpu-base"
+    },
     {
       "name": "virtio-balloon-pci",
       "parent": "virtio-balloon-pci-base"
@@ -1174,17 +1222,17 @@
       "name": "qemu:memory-region",
       "parent": "object"
     },
-    {
-      "name": "virtio-gpu-device",
-      "parent": "virtio-gpu-base"
-    },
     {
       "name": "e1000",
       "parent": "e1000-base"
     },
     {
-      "name": "ES1370",
-      "parent": "pci-device"
+      "name": "Cascadelake-Server-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
+    {
+      "name": "athlon-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "pc-i440fx-2.6-machine",
@@ -1198,6 +1246,10 @@
       "name": "isa-ipmi-kcs",
       "parent": "isa-device"
     },
+    {
+      "name": "EPYC-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "nvme",
       "parent": "pci-device"
@@ -1207,7 +1259,7 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "vmxnet3",
+      "name": "i82550",
       "parent": "pci-device"
     },
     {
@@ -1223,24 +1275,36 @@
       "parent": "pci-device"
     },
     {
-      "name": "i82550",
+      "name": "vmxnet3",
       "parent": "pci-device"
     },
     {
       "name": "nec-usb-xhci",
       "parent": "base-xhci"
     },
+    {
+      "name": "ES1370",
+      "parent": "pci-device"
+    },
+    {
+      "name": "Conroe-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "kvm-apic",
       "parent": "apic-common"
     },
+    {
+      "name": "isa-pit",
+      "parent": "pit-common"
+    },
     {
       "name": "kvm64-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
     {
-      "name": "isa-pit",
-      "parent": "pit-common"
+      "name": "Broadwell-v4-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "memory-backend-memfd",
@@ -1256,11 +1320,11 @@
     },
     {
       "name": "vhost-user-gpu-pci",
-      "parent": "virtio-gpu-pci-base"
+      "parent": "vhost-user-gpu-pci-base-type"
     },
     {
       "name": "virtio-crypto-pci",
-      "parent": "virtio-pci"
+      "parent": "virtio-crypto-pci-base-type"
     },
     {
       "name": "iothread",
@@ -1270,14 +1334,14 @@
       "name": "i8042",
       "parent": "isa-device"
     },
-    {
-      "name": "System",
-      "parent": "bus"
-    },
     {
       "name": "or-irq",
       "parent": "device"
     },
+    {
+      "name": "System",
+      "parent": "bus"
+    },
     {
       "name": "pc-1.0-machine",
       "parent": "generic-pc-machine"
@@ -1298,17 +1362,25 @@
       "name": "isa-serial",
       "parent": "isa-device"
     },
+    {
+      "name": "core2duo-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "cirrus-vga",
       "parent": "pci-device"
     },
+    {
+      "name": "kvm32-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "pc-i440fx-2.1-machine",
       "parent": "generic-pc-machine"
     },
     {
-      "name": "virtio-serial-pci",
-      "parent": "virtio-serial-pci-base"
+      "name": "Skylake-Client-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "i82559er",
@@ -1319,21 +1391,21 @@
       "parent": "virtio-rng-pci-base"
     },
     {
-      "name": "Skylake-Client-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "virtio-serial-pci",
+      "parent": "virtio-serial-pci-base"
     },
     {
       "name": "Opteron_G3-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
-    {
-      "name": "split-irq",
-      "parent": "device"
-    },
     {
       "name": "am53c974",
       "parent": "pci-device"
     },
+    {
+      "name": "split-irq",
+      "parent": "device"
+    },
     {
       "name": "container",
       "parent": "object"
@@ -1342,6 +1414,10 @@
       "name": "scsi-cd",
       "parent": "scsi-disk-base"
     },
+    {
+      "name": "486-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "vmport",
       "parent": "isa-device"
@@ -1354,6 +1430,10 @@
       "name": "isa-ide",
       "parent": "isa-device"
     },
+    {
+      "name": "qemu64-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "e1000-82545em",
       "parent": "e1000-base"
@@ -1366,14 +1446,14 @@
       "name": "ICH9 SMB",
       "parent": "pci-device"
     },
-    {
-      "name": "pxb-pcie-bus",
-      "parent": "PCIE"
-    },
     {
       "name": "sdhci-pci",
       "parent": "pci-device"
     },
+    {
+      "name": "pxb-pcie-bus",
+      "parent": "PCIE"
+    },
     {
       "name": "vhost-user-scsi",
       "parent": "vhost-scsi-common"
@@ -1410,6 +1490,10 @@
       "name": "i440FX",
       "parent": "pci-device"
     },
+    {
+      "name": "Penryn-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "vhost-vsock-pci-transitional",
       "parent": "vhost-vsock-pci-base"
@@ -1430,17 +1514,17 @@
       "name": "pci-serial-4x",
       "parent": "pci-device"
     },
-    {
-      "name": "Icelake-Server-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "apic",
       "parent": "apic-common"
     },
     {
-      "name": "sga",
-      "parent": "isa-device"
+      "name": "Icelake-Server-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
+    {
+      "name": "hpet",
+      "parent": "sys-bus-device"
     },
     {
       "name": "Opteron_G5-x86_64-cpu",
@@ -1451,8 +1535,8 @@
       "parent": "generic-pc-machine"
     },
     {
-      "name": "hpet",
-      "parent": "sys-bus-device"
+      "name": "sga",
+      "parent": "isa-device"
     },
     {
       "name": "pci-ohci",
@@ -1514,6 +1598,10 @@
       "name": "IvyBridge-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "SandyBridge-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "pc-i440fx-2.9-machine",
       "parent": "generic-pc-machine"
@@ -1524,12 +1612,16 @@
     },
     {
       "name": "virtio-keyboard-pci",
-      "parent": "virtio-input-hid-pci"
+      "parent": "virtio-keyboard-pci-base-type"
     },
     {
       "name": "pcnet",
       "parent": "pci-device"
     },
+    {
+      "name": "Dhyana-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "sysbus-fdc",
       "parent": "base-sysbus-fdc"
@@ -1542,6 +1634,10 @@
       "name": "AMDVI-PCI",
       "parent": "pci-device"
     },
+    {
+      "name": "filter-redirector",
+      "parent": "netfilter"
+    },
     {
       "name": "virtserialport",
       "parent": "virtio-serial-port"
@@ -1551,8 +1647,8 @@
       "parent": "ipack-device"
     },
     {
-      "name": "filter-redirector",
-      "parent": "netfilter"
+      "name": "usb-mouse",
+      "parent": "usb-hid"
     },
     {
       "name": "Nehalem-x86_64-cpu",
@@ -1562,10 +1658,6 @@
       "name": "i82559b",
       "parent": "pci-device"
     },
-    {
-      "name": "usb-mouse",
-      "parent": "usb-hid"
-    },
     {
       "name": "ccid-bus",
       "parent": "bus"
@@ -1578,10 +1670,6 @@
       "name": "Broadwell-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
-    {
-      "name": "i82559a",
-      "parent": "pci-device"
-    },
     {
       "name": "kvaser_pci",
       "parent": "pci-device"
@@ -1590,6 +1678,10 @@
       "name": "vhost-user-scsi-pci",
       "parent": "vhost-user-scsi-pci-base"
     },
+    {
+      "name": "i82559a",
+      "parent": "pci-device"
+    },
     {
       "name": "pc-i440fx-4.1-machine",
       "parent": "generic-pc-machine"
@@ -1598,18 +1690,22 @@
       "name": "pc-1.3-machine",
       "parent": "generic-pc-machine"
     },
-    {
-      "name": "e1000-82544gc",
-      "parent": "e1000-base"
-    },
     {
       "name": "chardev-spiceport",
       "parent": "chardev-spice"
     },
+    {
+      "name": "e1000-82544gc",
+      "parent": "e1000-base"
+    },
     {
       "name": "qio-channel-command",
       "parent": "qio-channel"
     },
+    {
+      "name": "Opteron_G3-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "usb-ccid",
       "parent": "usb-device"
@@ -1642,6 +1738,10 @@
       "name": "unimplemented-device",
       "parent": "sys-bus-device"
     },
+    {
+      "name": "Skylake-Server-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "pc-q35-4.1-machine",
       "parent": "generic-pc-machine"
@@ -1690,6 +1790,10 @@
       "name": "chardev-braille",
       "parent": "chardev"
     },
+    {
+      "name": "Icelake-Client-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "vmcoreinfo",
       "parent": "device"
@@ -1706,6 +1810,14 @@
       "name": "qio-channel-file",
       "parent": "qio-channel"
     },
+    {
+      "name": "gpio_i2c",
+      "parent": "sys-bus-device"
+    },
+    {
+      "name": "coreduo-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "pc-q35-3.1-machine",
       "parent": "generic-pc-machine"
@@ -1719,16 +1831,20 @@
       "parent": "object"
     },
     {
-      "name": "host-x86_64-cpu",
-      "parent": "max-x86_64-cpu"
+      "name": "Haswell-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
+    {
+      "name": "pxb",
+      "parent": "pci-device"
     },
     {
       "name": "usb-ehci",
       "parent": "pci-ehci-usb"
     },
     {
-      "name": "pxb",
-      "parent": "pci-device"
+      "name": "host-x86_64-cpu",
+      "parent": "max-x86_64-cpu"
     },
     {
       "name": "pc-i440fx-2.11-machine",
@@ -1742,6 +1858,14 @@
       "name": "vmgenid",
       "parent": "device"
     },
+    {
+      "name": "input-linux",
+      "parent": "object"
+    },
+    {
+      "name": "secret",
+      "parent": "object"
+    },
     {
       "name": "virtio-net-pci-non-transitional",
       "parent": "virtio-net-pci-base"
@@ -1758,21 +1882,21 @@
       "name": "scsi-hd",
       "parent": "scsi-disk-base"
     },
-    {
-      "name": "secret",
-      "parent": "object"
-    },
     {
       "name": "usb-kbd",
       "parent": "usb-hid"
     },
+    {
+      "name": "lsi53c810",
+      "parent": "lsi53c895a"
+    },
     {
       "name": "isa-fdc",
       "parent": "isa-device"
     },
     {
-      "name": "input-linux",
-      "parent": "object"
+      "name": "filter-mirror",
+      "parent": "netfilter"
     },
     {
       "name": "filter-replay",
@@ -1802,6 +1926,10 @@
       "name": "hyperv-testdev",
       "parent": "isa-device"
     },
+    {
+      "name": "tpm-tis",
+      "parent": "isa-device"
+    },
     {
       "name": "fw_cfg_mem",
       "parent": "fw_cfg"
@@ -1811,12 +1939,12 @@
       "parent": "ccid-card"
     },
     {
-      "name": "tpm-tis",
-      "parent": "isa-device"
+      "name": "Westmere-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
-      "name": "lsi53c810",
-      "parent": "lsi53c895a"
+      "name": "virtio-pmem",
+      "parent": "virtio-device"
     },
     {
       "name": "pc-i440fx-1.7-machine",
@@ -1835,21 +1963,21 @@
       "parent": "pcie-root-port-base"
     },
     {
-      "name": "filter-mirror",
-      "parent": "netfilter"
+      "name": "Skylake-Client-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "throttle-group",
       "parent": "object"
     },
-    {
-      "name": "pc-q35-2.10-machine",
-      "parent": "generic-pc-machine"
-    },
     {
       "name": "piix4-usb-uhci",
       "parent": "pci-uhci-usb"
     },
+    {
+      "name": "pc-q35-2.10-machine",
+      "parent": "generic-pc-machine"
+    },
     {
       "name": "virtio-rng-pci",
       "parent": "virtio-rng-pci-base"
@@ -1866,6 +1994,10 @@
       "name": "Skylake-Client-IBRS-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "Cascadelake-Server-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "pci-testdev",
       "parent": "pci-device"
@@ -1898,6 +2030,10 @@
       "name": "ISA",
       "parent": "bus"
     },
+    {
+      "name": "phenom-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "vhost-vsock-pci",
       "parent": "vhost-vsock-pci-base"
@@ -1910,14 +2046,14 @@
       "name": "virtio-balloon-pci-non-transitional",
       "parent": "virtio-balloon-pci-base"
     },
-    {
-      "name": "ipmi-bmc-sim",
-      "parent": "ipmi-bmc"
-    },
     {
       "name": "virtio-net-pci-transitional",
       "parent": "virtio-net-pci-base"
     },
+    {
+      "name": "ipmi-bmc-sim",
+      "parent": "ipmi-bmc"
+    },
     {
       "name": "IvyBridge-IBRS-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -1970,10 +2106,18 @@
       "name": "pentium2-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "Broadwell-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "qemu-xhci",
       "parent": "base-xhci"
     },
+    {
+      "name": "n270-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "pvpanic",
       "parent": "isa-device"
@@ -1982,6 +2126,14 @@
       "name": "rng-random",
       "parent": "rng-backend"
     },
+    {
+      "name": "KnightsMill-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
+    {
+      "name": "Nehalem-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "kvmvapic",
       "parent": "sys-bus-device"
@@ -2026,6 +2178,14 @@
       "name": "pc-1.1-machine",
       "parent": "generic-pc-machine"
     },
+    {
+      "name": "Snowridge-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
+    {
+      "name": "IvyBridge-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "qxl",
       "parent": "pci-qxl"
@@ -2054,18 +2214,22 @@
       "name": "virtio-balloon-pci-transitional",
       "parent": "virtio-balloon-pci-base"
     },
+    {
+      "name": "Haswell-v4-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "usb-bt-dongle",
       "parent": "usb-device"
     },
-    {
-      "name": "i82801b11-bridge",
-      "parent": "base-pci-bridge"
-    },
     {
       "name": "virtio-keyboard-device",
       "parent": "virtio-input-hid-device"
     },
+    {
+      "name": "i82801b11-bridge",
+      "parent": "base-pci-bridge"
+    },
     {
       "name": "ramfb",
       "parent": "sys-bus-device"
@@ -2082,6 +2246,10 @@
       "name": "IndustryPack",
       "parent": "bus"
     },
+    {
+      "name": "Broadwell-v3-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "ioapic",
       "parent": "ioapic-common"
@@ -2090,6 +2258,10 @@
       "name": "pentium-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "qemu32-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "Haswell-noTSX-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -2114,6 +2286,10 @@
       "name": "piix3-usb-uhci",
       "parent": "pci-uhci-usb"
     },
+    {
+      "name": "Opteron_G4-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "ne2k_isa",
       "parent": "isa-device"
@@ -2134,6 +2310,10 @@
       "name": "hda-duplex",
       "parent": "hda-audio"
     },
+    {
+      "name": "pentium-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "amd-iommu-iommu-memory-region",
       "parent": "qemu:iommu-memory-region"
@@ -2170,6 +2350,10 @@
       "name": "isa-parallel",
       "parent": "isa-device"
     },
+    {
+      "name": "pentium2-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "chardev-null",
       "parent": "chardev"
@@ -2178,6 +2362,10 @@
       "name": "isa-vga",
       "parent": "isa-device"
     },
+    {
+      "name": "EPYC-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "pc-i440fx-1.5-machine",
       "parent": "generic-pc-machine"
@@ -2226,14 +2414,14 @@
       "name": "i82558a",
       "parent": "pci-device"
     },
-    {
-      "name": "loader",
-      "parent": "device"
-    },
     {
       "name": "usb-serial",
       "parent": "usb-serial-dev"
     },
+    {
+      "name": "loader",
+      "parent": "device"
+    },
     {
       "name": "pvscsi",
       "parent": "pci-device"
@@ -2242,13 +2430,17 @@
       "name": "i82801",
       "parent": "pci-device"
     },
+    {
+      "name": "virtio-pmem-pci",
+      "parent": "virtio-pmem-pci-base"
+    },
     {
       "name": "accel",
       "parent": "object"
     },
     {
       "name": "virtio-tablet-pci",
-      "parent": "virtio-input-hid-pci"
+      "parent": "virtio-tablet-pci-base-type"
     },
     {
       "name": "dc390",
@@ -2294,6 +2486,10 @@
       "name": "chardev-pipe",
       "parent": "chardev-fd"
     },
+    {
+      "name": "i2c-ddc",
+      "parent": "i2c-slave"
+    },
     {
       "name": "can-host-socketcan",
       "parent": "can-host"
@@ -2302,18 +2498,22 @@
       "name": "i82562",
       "parent": "pci-device"
     },
+    {
+      "name": "mptsas1068",
+      "parent": "pci-device"
+    },
     {
       "name": "pci-bridge-seat",
       "parent": "pci-bridge"
     },
-    {
-      "name": "kvm32-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "lsi53c895a",
       "parent": "pci-device"
     },
+    {
+      "name": "kvm32-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "SandyBridge-IBRS-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -2322,6 +2522,10 @@
       "name": "intel-hda",
       "parent": "intel-hda-generic"
     },
+    {
+      "name": "scsi-block",
+      "parent": "scsi-disk-base"
+    },
     {
       "name": "hyperv-synic",
       "parent": "device"
@@ -2331,7 +2535,7 @@
       "parent": "chardev"
     },
     {
-      "name": "base-x86_64-cpu",
+      "name": "Opteron_G1-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
     {
@@ -2347,12 +2551,16 @@
       "parent": "pcie-root-port-base"
     },
     {
-      "name": "mptsas1068",
-      "parent": "pci-device"
+      "name": "base-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
-      "name": "scsi-block",
-      "parent": "scsi-disk-base"
+      "name": "kvm64-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
+    {
+      "name": "Snowridge-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "chardev-spicevmc",
@@ -2398,6 +2606,10 @@
       "name": "filter-dump",
       "parent": "netfilter"
     },
+    {
+      "name": "chardev-ringbuf",
+      "parent": "chardev"
+    },
     {
       "name": "virtio-pci-bus",
       "parent": "virtio-bus"
@@ -2406,14 +2618,14 @@
       "name": "qemu,register",
       "parent": "device"
     },
-    {
-      "name": "chardev-ringbuf",
-      "parent": "chardev"
-    },
     {
       "name": "pc-0.15-machine",
       "parent": "generic-pc-machine"
     },
+    {
+      "name": "Skylake-Server-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "vhost-user-blk",
       "parent": "virtio-device"
@@ -2422,13 +2634,17 @@
       "name": "Haswell-noTSX-IBRS-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "SandyBridge-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "qio-channel-tls",
       "parent": "qio-channel"
     },
     {
       "name": "virtio-vga",
-      "parent": "virtio-vga-base"
+      "parent": "virtio-vga-base-type"
     },
     {
       "name": "authz-pam",
@@ -2469,6 +2685,10 @@
       "name": "queue-size",
       "type": "uint16"
     },
+    {
+      "name": "use-started",
+      "type": "bool"
+    },
     {
       "name": "werror",
       "description": "Error handling policy, report/ignore/enospc/stop/auto",
@@ -2825,6 +3045,10 @@
       "name": "x-mtu-bypass-backend",
       "type": "bool"
     },
+    {
+      "name": "bootindex",
+      "type": "int32"
+    },
     {
       "name": "x-pcie-pm-init",
       "description": "on/off",
@@ -2836,8 +3060,8 @@
       "type": "bool"
     },
     {
-      "name": "bootindex",
-      "type": "int32"
+      "name": "use-started",
+      "type": "bool"
     },
     {
       "name": "ats",
@@ -3039,6 +3263,10 @@
       "name": "virtio-backend",
       "type": "child<virtio-scsi-device>"
     },
+    {
+      "name": "use-started",
+      "type": "bool"
+    },
     {
       "name": "virtqueue_size",
       "type": "uint32"
@@ -4293,6 +4521,10 @@
       "name": "virtio-backend",
       "type": "child<virtio-gpu-device>"
     },
+    {
+      "name": "use-started",
+      "type": "bool"
+    },
     {
       "name": "multifunction",
       "description": "on/off",
@@ -4489,6 +4721,10 @@
       "description": "on/off",
       "type": "bool"
     },
+    {
+      "name": "use-started",
+      "type": "bool"
+    },
     {
       "name": "virgl",
       "description": "on/off",
@@ -4633,6 +4869,10 @@
       "name": "x-ignore-backend-features",
       "type": "bool"
     },
+    {
+      "name": "qemu-4-0-config-size",
+      "type": "bool"
+    },
     {
       "name": "virtio-backend",
       "type": "child<virtio-balloon-device>"
@@ -4670,6 +4910,10 @@
       "description": "on/off",
       "type": "bool"
     },
+    {
+      "name": "use-started",
+      "type": "bool"
+    },
     {
       "name": "iommu_platform",
       "description": "on/off",
@@ -4701,7 +4945,7 @@
       "type": "bool"
     },
     {
-      "name": "deflate-on-oom",
+      "name": "event_idx",
       "description": "on/off",
       "type": "bool"
     },
@@ -4729,7 +4973,7 @@
       "type": "uint32"
     },
     {
-      "name": "event_idx",
+      "name": "deflate-on-oom",
       "description": "on/off",
       "type": "bool"
     },
@@ -4797,15 +5041,7 @@
 {
   "return": [
     {
-      "name": "guest-stats",
-      "type": "guest statistics"
-    },
-    {
-      "name": "iothread",
-      "type": "link<iothread>"
-    },
-    {
-      "name": "iommu_platform",
+      "name": "indirect_desc",
       "description": "on/off",
       "type": "bool"
     },
@@ -4813,11 +5049,25 @@
       "name": "guest-stats-polling-interval",
       "type": "int"
     },
+    {
+      "name": "iommu_platform",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "deflate-on-oom",
+      "description": "on/off",
+      "type": "bool"
+    },
     {
       "name": "event_idx",
       "description": "on/off",
       "type": "bool"
     },
+    {
+      "name": "guest-stats",
+      "type": "guest statistics"
+    },
     {
       "name": "any_layout",
       "description": "on/off",
@@ -4828,20 +5078,22 @@
       "description": "on/off",
       "type": "bool"
     },
+    {
+      "name": "iothread",
+      "type": "link<iothread>"
+    },
+    {
+      "name": "qemu-4-0-config-size",
+      "type": "bool"
+    },
+    {
+      "name": "use-started",
+      "type": "bool"
+    },
     {
       "name": "free-page-hint",
       "description": "on/off",
       "type": "bool"
-    },
-    {
-      "name": "deflate-on-oom",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "indirect_desc",
-      "description": "on/off",
-      "type": "bool"
     }
   ],
   "id": "libvirt-30"
@@ -5247,6 +5499,10 @@
       "name": "sse4_1",
       "type": "bool"
     },
+    {
+      "name": "core-capability",
+      "type": "bool"
+    },
     {
       "name": "popcnt",
       "type": "bool"
@@ -5309,7 +5565,7 @@
     },
     {
       "name": "hv-spinlocks",
-      "type": "int"
+      "type": "uint32"
     },
     {
       "name": "erms",
@@ -5325,28 +5581,29 @@
     },
     {
       "name": "hv-reset",
+      "description": "on/off",
       "type": "bool"
     },
     {
       "name": "rdrand",
       "type": "bool"
     },
-    {
-      "name": "model",
-      "type": "int"
-    },
     {
       "name": "avx512-vpopcntdq",
       "type": "bool"
     },
     {
-      "name": "tbm",
-      "type": "bool"
+      "name": "model",
+      "type": "int"
     },
     {
       "name": "xcrypt",
       "type": "bool"
     },
+    {
+      "name": "tbm",
+      "type": "bool"
+    },
     {
       "name": "movdiri",
       "type": "bool"
@@ -5377,6 +5634,7 @@
     },
     {
       "name": "hv-runtime",
+      "description": "on/off",
       "type": "bool"
     },
     {
@@ -5425,6 +5683,7 @@
     },
     {
       "name": "hv-evmcs",
+      "description": "on/off",
       "type": "bool"
     },
     {
@@ -5435,6 +5694,10 @@
       "name": "pmm-en",
       "type": "bool"
     },
+    {
+      "name": "x-force-features",
+      "type": "bool"
+    },
     {
       "name": "dca",
       "type": "bool"
@@ -5447,6 +5710,11 @@
       "name": "perfctr-core",
       "type": "bool"
     },
+    {
+      "name": "hv-stimer-direct",
+      "description": "on/off",
+      "type": "bool"
+    },
     {
       "name": "pmu",
       "type": "bool"
@@ -5456,11 +5724,11 @@
       "type": "bool"
     },
     {
-      "name": "pn",
+      "name": "invtsc",
       "type": "bool"
     },
     {
-      "name": "invtsc",
+      "name": "pn",
       "type": "bool"
     },
     {
@@ -5556,11 +5824,12 @@
       "type": "bool"
     },
     {
-      "name": "cldemote",
+      "name": "hv-tlbflush",
+      "description": "on/off",
       "type": "bool"
     },
     {
-      "name": "hv-tlbflush",
+      "name": "cldemote",
       "type": "bool"
     },
     {
@@ -5579,10 +5848,18 @@
       "name": "cpuid-0xb",
       "type": "bool"
     },
+    {
+      "name": "vmcb_clean",
+      "type": "bool"
+    },
     {
       "name": "nrip_save",
       "type": "bool"
     },
+    {
+      "name": "die-id",
+      "type": "int32"
+    },
     {
       "name": "vme",
       "type": "bool"
@@ -5595,16 +5872,12 @@
       "name": "kvm-no-smi-migration",
       "type": "bool"
     },
-    {
-      "name": "kvm_pv_unhalt",
-      "type": "bool"
-    },
     {
       "name": "svm",
       "type": "bool"
     },
     {
-      "name": "lahf-lm",
+      "name": "kvm_pv_unhalt",
       "type": "bool"
     },
     {
@@ -5628,11 +5901,11 @@
       "type": "bool"
     },
     {
-      "name": "vmcb_clean",
+      "name": "pfthreshold",
       "type": "bool"
     },
     {
-      "name": "pfthreshold",
+      "name": "lahf-lm",
       "type": "bool"
     },
     {
@@ -5655,6 +5928,10 @@
       "name": "pbe",
       "type": "bool"
     },
+    {
+      "name": "split-lock-detect",
+      "type": "bool"
+    },
     {
       "name": "apic-id",
       "type": "uint32"
@@ -5664,11 +5941,11 @@
       "type": "bool"
     },
     {
-      "name": "l3-cache",
+      "name": "skinit",
       "type": "bool"
     },
     {
-      "name": "skinit",
+      "name": "l3-cache",
       "type": "bool"
     },
     {
@@ -5680,11 +5957,11 @@
       "type": "bool"
     },
     {
-      "name": "ds-cpl",
+      "name": "pause-filter",
       "type": "bool"
     },
     {
-      "name": "pause-filter",
+      "name": "ds-cpl",
       "type": "bool"
     },
     {
@@ -5724,11 +6001,11 @@
       "type": "bool"
     },
     {
-      "name": "avx512vl",
+      "name": "xstore-en",
       "type": "bool"
     },
     {
-      "name": "xstore-en",
+      "name": "avx512vl",
       "type": "bool"
     },
     {
@@ -5749,6 +6026,7 @@
     },
     {
       "name": "hv-frequencies",
+      "description": "on/off",
       "type": "bool"
     },
     {
@@ -5776,11 +6054,11 @@
       "type": "int"
     },
     {
-      "name": "lbrv",
+      "name": "smx",
       "type": "bool"
     },
     {
-      "name": "smx",
+      "name": "lbrv",
       "type": "bool"
     },
     {
@@ -5876,11 +6154,12 @@
       "type": "bool"
     },
     {
-      "name": "hv-stimer",
+      "name": "xop",
       "type": "bool"
     },
     {
-      "name": "xop",
+      "name": "hv-stimer",
+      "description": "on/off",
       "type": "bool"
     },
     {
@@ -5893,6 +6172,7 @@
     },
     {
       "name": "hv-synic",
+      "description": "on/off",
       "type": "bool"
     },
     {
@@ -5911,6 +6191,10 @@
       "name": "sse4-2",
       "type": "bool"
     },
+    {
+      "name": "hv-passthrough",
+      "type": "bool"
+    },
     {
       "name": "vmcb-clean",
       "type": "bool"
@@ -5920,11 +6204,12 @@
       "type": "bool"
     },
     {
-      "name": "hv-reenlightenment",
+      "name": "svm-lock",
       "type": "bool"
     },
     {
-      "name": "svm-lock",
+      "name": "hv-reenlightenment",
+      "description": "on/off",
       "type": "bool"
     },
     {
@@ -5945,6 +6230,7 @@
     },
     {
       "name": "hv-vpindex",
+      "description": "on/off",
       "type": "bool"
     },
     {
@@ -5988,7 +6274,7 @@
       "type": "bool"
     },
     {
-      "name": "kvm-mmu",
+      "name": "sha-ni",
       "type": "bool"
     },
     {
@@ -6000,7 +6286,7 @@
       "type": "bool"
     },
     {
-      "name": "sha-ni",
+      "name": "kvm-mmu",
       "type": "bool"
     },
     {
@@ -6153,6 +6439,7 @@
     },
     {
       "name": "hv-crash",
+      "description": "on/off",
       "type": "bool"
     },
     {
@@ -6193,6 +6480,7 @@
     },
     {
       "name": "hv-time",
+      "description": "on/off",
       "type": "bool"
     },
     {
@@ -6305,6 +6593,7 @@
     },
     {
       "name": "hv-relaxed",
+      "description": "on/off",
       "type": "bool"
     },
     {
@@ -6315,12 +6604,9 @@
       "name": "fxsr",
       "type": "bool"
     },
-    {
-      "name": "amd-ssbd",
-      "type": "bool"
-    },
     {
       "name": "hv-vapic",
+      "description": "on/off",
       "type": "bool"
     },
     {
@@ -6329,6 +6615,11 @@
     },
     {
       "name": "hv-ipi",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "sse4_2",
       "type": "bool"
     },
     {
@@ -6340,11 +6631,7 @@
       "type": "bool"
     },
     {
-      "name": "de",
-      "type": "bool"
-    },
-    {
-      "name": "sse4_2",
+      "name": "amd-ssbd",
       "type": "bool"
     },
     {
@@ -6355,6 +6642,10 @@
       "name": "ss",
       "type": "bool"
     },
+    {
+      "name": "de",
+      "type": "bool"
+    },
     {
       "name": "fma",
       "type": "bool"
@@ -6373,230 +6664,320 @@
     {
       "hotpluggable-cpus": true,
       "name": "pc-0.15",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": true
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-2.12",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-2.0",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-2.5",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-1.5",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-2.7",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-0.12",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": true
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-2.2",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-1.1",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": false,
       "name": "none",
-      "cpu-max": 1
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-2.7",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-2.4",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-2.10",
-      "cpu-max": 288
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-1.7",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-0.14",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": true
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-2.9",
-      "cpu-max": 288
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-2.11",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-3.1",
-      "cpu-max": 288
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-4.1",
+      "numa-mem-supported": true,
       "cpu-max": 288,
+      "deprecated": false,
       "alias": "q35"
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-2.4",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-1.3",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-4.1",
+      "numa-mem-supported": true,
       "is-default": true,
       "cpu-max": 255,
+      "deprecated": false,
       "alias": "pc"
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-2.9",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "isapc",
-      "cpu-max": 1
+      "numa-mem-supported": true,
+      "cpu-max": 1,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-1.4",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-2.6",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-3.1",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-2.12",
-      "cpu-max": 288
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-2.1",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-1.0",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-2.6",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-4.0.1",
-      "cpu-max": 288
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-1.6",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-0.13",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": true
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-2.8",
-      "cpu-max": 288
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-2.10",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-3.0",
-      "cpu-max": 288
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-4.0",
-      "cpu-max": 288
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-2.3",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-1.2",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-4.0",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-2.8",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-2.5",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-i440fx-3.0",
-      "cpu-max": 255
+      "numa-mem-supported": true,
+      "cpu-max": 255,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-2.11",
-      "cpu-max": 288
+      "numa-mem-supported": true,
+      "cpu-max": 288,
+      "deprecated": false
     }
   ],
   "id": "libvirt-38"
@@ -6633,11 +7014,28 @@
       "static": true,
       "migration-safe": true
     },
+    {
+      "name": "qemu64-v1",
+      "typename": "qemu64-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "qemu64-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "qemu32-v1",
+      "typename": "qemu32-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6646,6 +7044,21 @@
       "typename": "qemu32-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "qemu32-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "phenom-v1",
+      "typename": "phenom-v1-x86_64-cpu",
+      "unavailable-features": [
+        "mmxext",
+        "fxsr-opt",
+        "3dnowext",
+        "3dnow",
+        "sse4a",
+        "npt"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6660,6 +7073,15 @@
         "sse4a",
         "npt"
       ],
+      "alias-of": "phenom-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium3-v1",
+      "typename": "pentium3-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6668,6 +7090,15 @@
       "typename": "pentium3-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "pentium3-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium2-v1",
+      "typename": "pentium2-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6676,6 +7107,15 @@
       "typename": "pentium2-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "pentium2-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium-v1",
+      "typename": "pentium-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6684,6 +7124,15 @@
       "typename": "pentium-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "pentium-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "n270-v1",
+      "typename": "n270-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6692,6 +7141,15 @@
       "typename": "n270-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "n270-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "kvm64-v1",
+      "typename": "kvm64-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6700,6 +7158,15 @@
       "typename": "kvm64-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "kvm64-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "kvm32-v1",
+      "typename": "kvm32-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6708,6 +7175,15 @@
       "typename": "kvm32-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "kvm32-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "coreduo-v1",
+      "typename": "coreduo-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6716,6 +7192,15 @@
       "typename": "coreduo-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "coreduo-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "core2duo-v1",
+      "typename": "core2duo-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6724,6 +7209,18 @@
       "typename": "core2duo-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "core2duo-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "athlon-v1",
+      "typename": "athlon-v1-x86_64-cpu",
+      "unavailable-features": [
+        "mmxext",
+        "3dnowext",
+        "3dnow"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6735,6 +7232,23 @@
         "3dnowext",
         "3dnow"
       ],
+      "alias-of": "athlon-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Westmere-v2",
+      "typename": "Westmere-v2-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Westmere-v1",
+      "typename": "Westmere-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6743,6 +7257,7 @@
       "typename": "Westmere-IBRS-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Westmere-v2",
       "static": false,
       "migration-safe": true
     },
@@ -6751,6 +7266,78 @@
       "typename": "Westmere-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Westmere-v2",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Snowridge-v1",
+      "typename": "Snowridge-v1-x86_64-cpu",
+      "unavailable-features": [
+        "clwb",
+        "sha-ni",
+        "gfni",
+        "cldemote",
+        "movdiri",
+        "movdir64b",
+        "core-capability",
+        "split-lock-detect"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Snowridge",
+      "typename": "Snowridge-x86_64-cpu",
+      "unavailable-features": [
+        "clwb",
+        "sha-ni",
+        "gfni",
+        "cldemote",
+        "movdiri",
+        "movdir64b",
+        "core-capability",
+        "split-lock-detect"
+      ],
+      "alias-of": "Snowridge-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Server-v2",
+      "typename": "Skylake-Server-v2-x86_64-cpu",
+      "unavailable-features": [
+        "avx512f",
+        "avx512dq",
+        "clwb",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "pku",
+        "avx512f",
+        "avx512f",
+        "avx512f",
+        "pku"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Server-v1",
+      "typename": "Skylake-Server-v1-x86_64-cpu",
+      "unavailable-features": [
+        "avx512f",
+        "avx512dq",
+        "clwb",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "pku",
+        "avx512f",
+        "avx512f",
+        "avx512f",
+        "pku"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6770,6 +7357,7 @@
         "avx512f",
         "pku"
       ],
+      "alias-of": "Skylake-Server-v2",
       "static": false,
       "migration-safe": true
     },
@@ -6789,6 +7377,23 @@
         "avx512f",
         "pku"
       ],
+      "alias-of": "Skylake-Server-v2",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Client-v2",
+      "typename": "Skylake-Client-v2-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Client-v1",
+      "typename": "Skylake-Client-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6797,6 +7402,7 @@
       "typename": "Skylake-Client-IBRS-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Skylake-Client-v2",
       "static": false,
       "migration-safe": true
     },
@@ -6805,6 +7411,23 @@
       "typename": "Skylake-Client-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Skylake-Client-v2",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "SandyBridge-v2",
+      "typename": "SandyBridge-v2-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "SandyBridge-v1",
+      "typename": "SandyBridge-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6813,6 +7436,7 @@
       "typename": "SandyBridge-IBRS-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "SandyBridge-v2",
       "static": false,
       "migration-safe": true
     },
@@ -6821,6 +7445,15 @@
       "typename": "SandyBridge-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "SandyBridge-v2",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Penryn-v1",
+      "typename": "Penryn-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6829,6 +7462,22 @@
       "typename": "Penryn-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Penryn-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G5-v1",
+      "typename": "Opteron_G5-v1-x86_64-cpu",
+      "unavailable-features": [
+        "sse4a",
+        "misalignsse",
+        "xop",
+        "fma4",
+        "tbm",
+        "npt",
+        "nrip-save"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6844,6 +7493,21 @@
         "npt",
         "nrip-save"
       ],
+      "alias-of": "Opteron_G5-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G4-v1",
+      "typename": "Opteron_G4-v1-x86_64-cpu",
+      "unavailable-features": [
+        "sse4a",
+        "misalignsse",
+        "xop",
+        "fma4",
+        "npt",
+        "nrip-save"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6858,6 +7522,17 @@
         "npt",
         "nrip-save"
       ],
+      "alias-of": "Opteron_G4-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G3-v1",
+      "typename": "Opteron_G3-v1-x86_64-cpu",
+      "unavailable-features": [
+        "sse4a",
+        "misalignsse"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6868,6 +7543,15 @@
         "sse4a",
         "misalignsse"
       ],
+      "alias-of": "Opteron_G3-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G2-v1",
+      "typename": "Opteron_G2-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6876,6 +7560,15 @@
       "typename": "Opteron_G2-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Opteron_G2-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G1-v1",
+      "typename": "Opteron_G1-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6884,6 +7577,23 @@
       "typename": "Opteron_G1-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Opteron_G1-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Nehalem-v2",
+      "typename": "Nehalem-v2-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Nehalem-v1",
+      "typename": "Nehalem-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6892,6 +7602,7 @@
       "typename": "Nehalem-IBRS-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Nehalem-v2",
       "static": false,
       "migration-safe": true
     },
@@ -6900,6 +7611,25 @@
       "typename": "Nehalem-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Nehalem-v2",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "KnightsMill-v1",
+      "typename": "KnightsMill-v1-x86_64-cpu",
+      "unavailable-features": [
+        "avx512f",
+        "avx512pf",
+        "avx512er",
+        "avx512cd",
+        "avx512-vpopcntdq",
+        "avx512-4vnniw",
+        "avx512-4fmaps",
+        "avx512f",
+        "avx512f",
+        "avx512f"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6918,6 +7648,23 @@
         "avx512f",
         "avx512f"
       ],
+      "alias-of": "KnightsMill-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "IvyBridge-v2",
+      "typename": "IvyBridge-v2-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "IvyBridge-v1",
+      "typename": "IvyBridge-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6926,6 +7673,7 @@
       "typename": "IvyBridge-IBRS-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "IvyBridge-v2",
       "static": false,
       "migration-safe": true
     },
@@ -6934,6 +7682,36 @@
       "typename": "IvyBridge-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "IvyBridge-v2",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Icelake-Server-v1",
+      "typename": "Icelake-Server-v1-x86_64-cpu",
+      "unavailable-features": [
+        "avx512f",
+        "avx512dq",
+        "clwb",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "avx512vbmi",
+        "pku",
+        "avx512vbmi2",
+        "gfni",
+        "vaes",
+        "vpclmulqdq",
+        "avx512vnni",
+        "avx512bitalg",
+        "avx512-vpopcntdq",
+        "la57",
+        "wbnoinvd",
+        "avx512f",
+        "avx512f",
+        "avx512f",
+        "pku"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6963,6 +7741,26 @@
         "avx512f",
         "pku"
       ],
+      "alias-of": "Icelake-Server-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Icelake-Client-v1",
+      "typename": "Icelake-Client-v1-x86_64-cpu",
+      "unavailable-features": [
+        "avx512vbmi",
+        "pku",
+        "avx512vbmi2",
+        "gfni",
+        "vaes",
+        "vpclmulqdq",
+        "avx512vnni",
+        "avx512bitalg",
+        "avx512-vpopcntdq",
+        "wbnoinvd",
+        "pku"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6982,6 +7780,39 @@
         "wbnoinvd",
         "pku"
       ],
+      "alias-of": "Icelake-Client-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-v4",
+      "typename": "Haswell-v4-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-v3",
+      "typename": "Haswell-v3-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-v2",
+      "typename": "Haswell-v2-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-v1",
+      "typename": "Haswell-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -6990,6 +7821,7 @@
       "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Haswell-v4",
       "static": false,
       "migration-safe": true
     },
@@ -6998,6 +7830,7 @@
       "typename": "Haswell-noTSX-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Haswell-v2",
       "static": false,
       "migration-safe": true
     },
@@ -7006,6 +7839,7 @@
       "typename": "Haswell-IBRS-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Haswell-v3",
       "static": false,
       "migration-safe": true
     },
@@ -7014,6 +7848,42 @@
       "typename": "Haswell-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Haswell-v4",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "EPYC-v2",
+      "typename": "EPYC-v2-x86_64-cpu",
+      "unavailable-features": [
+        "sha-ni",
+        "mmxext",
+        "fxsr-opt",
+        "cr8legacy",
+        "sse4a",
+        "misalignsse",
+        "osvw",
+        "ibpb",
+        "npt",
+        "nrip-save"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "EPYC-v1",
+      "typename": "EPYC-v1-x86_64-cpu",
+      "unavailable-features": [
+        "sha-ni",
+        "mmxext",
+        "fxsr-opt",
+        "cr8legacy",
+        "sse4a",
+        "misalignsse",
+        "osvw",
+        "npt",
+        "nrip-save"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -7032,6 +7902,7 @@
         "npt",
         "nrip-save"
       ],
+      "alias-of": "EPYC-v2",
       "static": false,
       "migration-safe": true
     },
@@ -7046,6 +7917,25 @@
         "sse4a",
         "misalignsse",
         "osvw",
+        "ibpb",
+        "npt",
+        "nrip-save"
+      ],
+      "alias-of": "EPYC-v2",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Dhyana-v1",
+      "typename": "Dhyana-v1-x86_64-cpu",
+      "unavailable-features": [
+        "mmxext",
+        "fxsr-opt",
+        "cr8legacy",
+        "sse4a",
+        "misalignsse",
+        "osvw",
+        "ibpb",
         "npt",
         "nrip-save"
       ],
@@ -7066,6 +7956,15 @@
         "npt",
         "nrip-save"
       ],
+      "alias-of": "Dhyana-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Conroe-v1",
+      "typename": "Conroe-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -7074,6 +7973,50 @@
       "typename": "Conroe-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Conroe-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Cascadelake-Server-v2",
+      "typename": "Cascadelake-Server-v2-x86_64-cpu",
+      "unavailable-features": [
+        "avx512f",
+        "avx512dq",
+        "clwb",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "pku",
+        "avx512vnni",
+        "avx512f",
+        "avx512f",
+        "avx512f",
+        "pku",
+        "rdctl-no",
+        "ibrs-all",
+        "mds-no"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Cascadelake-Server-v1",
+      "typename": "Cascadelake-Server-v1-x86_64-cpu",
+      "unavailable-features": [
+        "avx512f",
+        "avx512dq",
+        "clwb",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "pku",
+        "avx512vnni",
+        "avx512f",
+        "avx512f",
+        "avx512f",
+        "pku"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -7092,7 +8035,43 @@
         "avx512f",
         "avx512f",
         "avx512f",
-        "pku"
+        "pku",
+        "rdctl-no",
+        "ibrs-all",
+        "mds-no"
+      ],
+      "alias-of": "Cascadelake-Server-v2",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-v4",
+      "typename": "Broadwell-v4-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-v3",
+      "typename": "Broadwell-v3-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-v2",
+      "typename": "Broadwell-v2-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-v1",
+      "typename": "Broadwell-v1-x86_64-cpu",
+      "unavailable-features": [
       ],
       "static": false,
       "migration-safe": true
@@ -7102,6 +8081,7 @@
       "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Broadwell-v4",
       "static": false,
       "migration-safe": true
     },
@@ -7110,6 +8090,7 @@
       "typename": "Broadwell-noTSX-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Broadwell-v2",
       "static": false,
       "migration-safe": true
     },
@@ -7118,6 +8099,7 @@
       "typename": "Broadwell-IBRS-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Broadwell-v3",
       "static": false,
       "migration-safe": true
     },
@@ -7126,6 +8108,15 @@
       "typename": "Broadwell-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Broadwell-v4",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "486-v1",
+      "typename": "486-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -7134,6 +8125,7 @@
       "typename": "486-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "486-v1",
       "static": false,
       "migration-safe": true
     }
@@ -7826,6 +8818,10 @@
           "name": "cores",
           "type": "number"
         },
+        {
+          "name": "dies",
+          "type": "number"
+        },
         {
           "name": "sockets",
           "type": "number"
@@ -9063,84 +10059,107 @@
       "arg-type": "85"
     },
     {
-      "name": "set_link",
+      "name": "dump-guest-memory",
       "ret-type": "0",
       "meta-type": "command",
       "arg-type": "86"
     },
+    {
+      "name": "query-dump",
+      "ret-type": "87",
+      "meta-type": "command",
+      "arg-type": "0"
+    },
+    {
+      "name": "DUMP_COMPLETED",
+      "meta-type": "event",
+      "arg-type": "88"
+    },
+    {
+      "name": "query-dump-guest-memory-capability",
+      "ret-type": "89",
+      "meta-type": "command",
+      "arg-type": "0"
+    },
+    {
+      "name": "set_link",
+      "ret-type": "0",
+      "meta-type": "command",
+      "arg-type": "90"
+    },
     {
       "name": "netdev_add",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "87"
+      "arg-type": "91"
     },
     {
       "name": "netdev_del",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "88"
+      "arg-type": "92"
     },
     {
       "name": "query-rx-filter",
-      "ret-type": "[90]",
+      "ret-type": "[94]",
       "meta-type": "command",
-      "arg-type": "89"
+      "arg-type": "93"
     },
     {
       "name": "NIC_RX_FILTER_CHANGED",
       "meta-type": "event",
-      "arg-type": "91"
+      "arg-type": "95"
     },
     {
       "name": "announce-self",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "92"
+      "arg-type": "96"
     },
     {
       "name": "RDMA_GID_STATUS_CHANGED",
       "meta-type": "event",
-      "arg-type": "93"
+      "arg-type": "97"
     },
     {
       "name": "query-rocker",
-      "ret-type": "95",
-      "meta-type": "command",
-      "arg-type": "94"
-    },
-    {
-      "name": "query-rocker-ports",
-      "ret-type": "[97]",
-      "meta-type": "command",
-      "arg-type": "96"
-    },
-    {
-      "name": "query-rocker-of-dpa-flows",
-      "ret-type": "[99]",
+      "ret-type": "99",
       "meta-type": "command",
       "arg-type": "98"
     },
     {
-      "name": "query-rocker-of-dpa-groups",
+      "name": "query-rocker-ports",
       "ret-type": "[101]",
       "meta-type": "command",
       "arg-type": "100"
     },
+    {
+      "name": "query-rocker-of-dpa-flows",
+      "ret-type": "[103]",
+      "meta-type": "command",
+      "arg-type": "102"
+    },
+    {
+      "name": "query-rocker-of-dpa-groups",
+      "ret-type": "[105]",
+      "meta-type": "command",
+      "arg-type": "104"
+    },
     {
       "name": "query-tpm-models",
-      "ret-type": "[102]",
+      "ret-type": "[106]",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-tpm-types",
-      "ret-type": "[103]",
+      "ret-type": "[107]",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-tpm",
-      "ret-type": "[104]",
+      "ret-type": "[108]",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -9148,40 +10167,40 @@
       "name": "set_password",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "105"
+      "arg-type": "109"
     },
     {
       "name": "expire_password",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "106"
+      "arg-type": "110"
     },
     {
       "name": "screendump",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "107"
+      "arg-type": "111"
     },
     {
       "name": "query-spice",
-      "ret-type": "108",
+      "ret-type": "112",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "SPICE_CONNECTED",
       "meta-type": "event",
-      "arg-type": "109"
+      "arg-type": "113"
     },
     {
       "name": "SPICE_INITIALIZED",
       "meta-type": "event",
-      "arg-type": "110"
+      "arg-type": "114"
     },
     {
       "name": "SPICE_DISCONNECTED",
       "meta-type": "event",
-      "arg-type": "111"
+      "arg-type": "115"
     },
     {
       "name": "SPICE_MIGRATE_COMPLETED",
@@ -9190,13 +10209,13 @@
     },
     {
       "name": "query-vnc",
-      "ret-type": "112",
+      "ret-type": "116",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-vnc-servers",
-      "ret-type": "[113]",
+      "ret-type": "[117]",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -9204,26 +10223,26 @@
       "name": "change-vnc-password",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "114"
+      "arg-type": "118"
     },
     {
       "name": "VNC_CONNECTED",
       "meta-type": "event",
-      "arg-type": "115"
+      "arg-type": "119"
     },
     {
       "name": "VNC_INITIALIZED",
       "meta-type": "event",
-      "arg-type": "116"
+      "arg-type": "120"
     },
     {
       "name": "VNC_DISCONNECTED",
       "meta-type": "event",
-      "arg-type": "117"
+      "arg-type": "121"
     },
     {
       "name": "query-mice",
-      "ret-type": "[118]",
+      "ret-type": "[122]",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -9231,23 +10250,23 @@
       "name": "send-key",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "119"
+      "arg-type": "123"
     },
     {
       "name": "input-send-event",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "120"
+      "arg-type": "124"
     },
     {
       "name": "query-display-options",
-      "ret-type": "121",
+      "ret-type": "125",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-migrate",
-      "ret-type": "122",
+      "ret-type": "126",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -9255,11 +10274,11 @@
       "name": "migrate-set-capabilities",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "123"
+      "arg-type": "127"
     },
     {
       "name": "query-migrate-capabilities",
-      "ret-type": "[124]",
+      "ret-type": "[128]",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -9267,11 +10286,11 @@
       "name": "migrate-set-parameters",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "125"
+      "arg-type": "129"
     },
     {
       "name": "query-migrate-parameters",
-      "ret-type": "126",
+      "ret-type": "130",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -9279,7 +10298,7 @@
       "name": "client_migrate_info",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "127"
+      "arg-type": "131"
     },
     {
       "name": "migrate-start-postcopy",
@@ -9290,17 +10309,17 @@
     {
       "name": "MIGRATION",
       "meta-type": "event",
-      "arg-type": "128"
+      "arg-type": "132"
     },
     {
       "name": "MIGRATION_PASS",
       "meta-type": "event",
-      "arg-type": "129"
+      "arg-type": "133"
     },
     {
       "name": "COLO_EXIT",
       "meta-type": "event",
-      "arg-type": "130"
+      "arg-type": "134"
     },
     {
       "name": "x-colo-lost-heartbeat",
@@ -9318,25 +10337,25 @@
       "name": "migrate-continue",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "131"
+      "arg-type": "135"
     },
     {
       "name": "migrate_set_downtime",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "132"
+      "arg-type": "136"
     },
     {
       "name": "migrate_set_speed",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "133"
+      "arg-type": "137"
     },
     {
       "name": "migrate-set-cache-size",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "134"
+      "arg-type": "138"
     },
     {
       "name": "query-migrate-cache-size",
@@ -9348,29 +10367,29 @@
       "name": "migrate",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "135"
+      "arg-type": "139"
     },
     {
       "name": "migrate-incoming",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "136"
+      "arg-type": "140"
     },
     {
       "name": "xen-save-devices-state",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "137"
+      "arg-type": "141"
     },
     {
       "name": "xen-set-replication",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "138"
+      "arg-type": "142"
     },
     {
       "name": "query-xen-replication-status",
-      "ret-type": "139",
+      "ret-type": "143",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -9382,7 +10401,7 @@
     },
     {
       "name": "query-colo-status",
-      "ret-type": "140",
+      "ret-type": "144",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -9391,7 +10410,7 @@
       "ret-type": "0",
       "allow-oob": true,
       "meta-type": "command",
-      "arg-type": "141"
+      "arg-type": "145"
     },
     {
       "name": "migrate-pause",
@@ -9404,23 +10423,148 @@
       "name": "transaction",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "142"
+      "arg-type": "146"
     },
     {
       "name": "trace-event-get-state",
-      "ret-type": "[144]",
+      "ret-type": "[148]",
       "meta-type": "command",
-      "arg-type": "143"
+      "arg-type": "147"
     },
     {
       "name": "trace-event-set-state",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "145"
+      "arg-type": "149"
     },
     {
       "name": "query-qmp-schema",
-      "ret-type": "[146]",
+      "ret-type": "[150]",
+      "meta-type": "command",
+      "arg-type": "0"
+    },
+    {
+      "name": "qom-list",
+      "ret-type": "[152]",
+      "meta-type": "command",
+      "arg-type": "151"
+    },
+    {
+      "name": "qom-get",
+      "ret-type": "any",
+      "meta-type": "command",
+      "arg-type": "153"
+    },
+    {
+      "name": "qom-set",
+      "ret-type": "0",
+      "meta-type": "command",
+      "arg-type": "154"
+    },
+    {
+      "name": "qom-list-types",
+      "ret-type": "[156]",
+      "meta-type": "command",
+      "arg-type": "155"
+    },
+    {
+      "name": "qom-list-properties",
+      "ret-type": "[152]",
+      "meta-type": "command",
+      "arg-type": "157"
+    },
+    {
+      "name": "object-add",
+      "ret-type": "0",
+      "meta-type": "command",
+      "arg-type": "158"
+    },
+    {
+      "name": "object-del",
+      "ret-type": "0",
+      "meta-type": "command",
+      "arg-type": "159"
+    },
+    {
+      "name": "device-list-properties",
+      "ret-type": "[152]",
+      "meta-type": "command",
+      "arg-type": "160"
+    },
+    {
+      "name": "device_add",
+      "ret-type": "0",
+      "meta-type": "command",
+      "arg-type": "161"
+    },
+    {
+      "name": "device_del",
+      "ret-type": "0",
+      "meta-type": "command",
+      "arg-type": "162"
+    },
+    {
+      "name": "DEVICE_DELETED",
+      "meta-type": "event",
+      "arg-type": "163"
+    },
+    {
+      "name": "query-cpus",
+      "ret-type": "[164]",
+      "meta-type": "command",
+      "arg-type": "0"
+    },
+    {
+      "name": "query-cpus-fast",
+      "ret-type": "[165]",
+      "meta-type": "command",
+      "arg-type": "0"
+    },
+    {
+      "name": "cpu-add",
+      "ret-type": "0",
+      "meta-type": "command",
+      "arg-type": "166"
+    },
+    {
+      "name": "query-machines",
+      "ret-type": "[167]",
+      "meta-type": "command",
+      "arg-type": "0"
+    },
+    {
+      "name": "query-current-machine",
+      "ret-type": "168",
+      "meta-type": "command",
+      "arg-type": "0"
+    },
+    {
+      "name": "query-memdev",
+      "ret-type": "[169]",
+      "meta-type": "command",
+      "arg-type": "0"
+    },
+    {
+      "name": "query-hotpluggable-cpus",
+      "ret-type": "[170]",
+      "meta-type": "command",
+      "arg-type": "0"
+    },
+    {
+      "name": "set-numa-node",
+      "ret-type": "0",
+      "meta-type": "command",
+      "arg-type": "171"
+    },
+    {
+      "name": "query-cpu-model-expansion",
+      "ret-type": "177",
+      "meta-type": "command",
+      "arg-type": "176"
+    },
+    {
+      "name": "query-cpu-definitions",
+      "ret-type": "[178]",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -9428,17 +10572,17 @@
       "name": "qmp_capabilities",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "147"
+      "arg-type": "179"
     },
     {
       "name": "query-version",
-      "ret-type": "148",
+      "ret-type": "180",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-commands",
-      "ret-type": "[149]",
+      "ret-type": "[181]",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -9446,64 +10590,52 @@
       "name": "add_client",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "150"
+      "arg-type": "182"
     },
     {
       "name": "query-name",
-      "ret-type": "151",
+      "ret-type": "183",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-kvm",
-      "ret-type": "152",
+      "ret-type": "184",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-uuid",
-      "ret-type": "153",
+      "ret-type": "185",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-events",
-      "ret-type": "[154]",
-      "meta-type": "command",
-      "arg-type": "0"
-    },
-    {
-      "name": "query-cpus",
-      "ret-type": "[155]",
-      "meta-type": "command",
-      "arg-type": "0"
-    },
-    {
-      "name": "query-cpus-fast",
-      "ret-type": "[156]",
+      "ret-type": "[186]",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-iothreads",
-      "ret-type": "[157]",
+      "ret-type": "[187]",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-balloon",
-      "ret-type": "158",
+      "ret-type": "188",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "BALLOON_CHANGE",
       "meta-type": "event",
-      "arg-type": "159"
+      "arg-type": "189"
     },
     {
       "name": "query-pci",
-      "ret-type": "[160]",
+      "ret-type": "[190]",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -9531,23 +10663,17 @@
       "meta-type": "command",
       "arg-type": "0"
     },
-    {
-      "name": "cpu-add",
-      "ret-type": "0",
-      "meta-type": "command",
-      "arg-type": "161"
-    },
     {
       "name": "memsave",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "162"
+      "arg-type": "191"
     },
     {
       "name": "pmemsave",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "163"
+      "arg-type": "192"
     },
     {
       "name": "cont",
@@ -9577,230 +10703,112 @@
       "name": "balloon",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "164"
+      "arg-type": "193"
     },
     {
       "name": "human-monitor-command",
       "ret-type": "str",
       "meta-type": "command",
-      "arg-type": "165"
-    },
-    {
-      "name": "qom-list",
-      "ret-type": "[167]",
-      "meta-type": "command",
-      "arg-type": "166"
-    },
-    {
-      "name": "qom-get",
-      "ret-type": "any",
-      "meta-type": "command",
-      "arg-type": "168"
-    },
-    {
-      "name": "qom-set",
-      "ret-type": "0",
-      "meta-type": "command",
-      "arg-type": "169"
+      "arg-type": "194"
     },
     {
       "name": "change",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "170"
-    },
-    {
-      "name": "qom-list-types",
-      "ret-type": "[172]",
-      "meta-type": "command",
-      "arg-type": "171"
-    },
-    {
-      "name": "device-list-properties",
-      "ret-type": "[167]",
-      "meta-type": "command",
-      "arg-type": "173"
-    },
-    {
-      "name": "qom-list-properties",
-      "ret-type": "[167]",
-      "meta-type": "command",
-      "arg-type": "174"
+      "arg-type": "195"
     },
     {
       "name": "xen-set-global-dirty-log",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "175"
-    },
-    {
-      "name": "device_add",
-      "ret-type": "0",
-      "meta-type": "command",
-      "arg-type": "176"
-    },
-    {
-      "name": "device_del",
-      "ret-type": "0",
-      "meta-type": "command",
-      "arg-type": "177"
-    },
-    {
-      "name": "DEVICE_DELETED",
-      "meta-type": "event",
-      "arg-type": "178"
-    },
-    {
-      "name": "dump-guest-memory",
-      "ret-type": "0",
-      "meta-type": "command",
-      "arg-type": "179"
-    },
-    {
-      "name": "query-dump",
-      "ret-type": "180",
-      "meta-type": "command",
-      "arg-type": "0"
-    },
-    {
-      "name": "DUMP_COMPLETED",
-      "meta-type": "event",
-      "arg-type": "181"
-    },
-    {
-      "name": "query-dump-guest-memory-capability",
-      "ret-type": "182",
-      "meta-type": "command",
-      "arg-type": "0"
-    },
-    {
-      "name": "object-add",
-      "ret-type": "0",
-      "meta-type": "command",
-      "arg-type": "183"
-    },
-    {
-      "name": "object-del",
-      "ret-type": "0",
-      "meta-type": "command",
-      "arg-type": "184"
+      "arg-type": "196"
     },
     {
       "name": "getfd",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "185"
+      "arg-type": "197"
     },
     {
       "name": "closefd",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "186"
-    },
-    {
-      "name": "query-machines",
-      "ret-type": "[187]",
-      "meta-type": "command",
-      "arg-type": "0"
-    },
-    {
-      "name": "query-current-machine",
-      "ret-type": "188",
-      "meta-type": "command",
-      "arg-type": "0"
+      "arg-type": "198"
     },
     {
       "name": "query-memory-size-summary",
-      "ret-type": "189",
+      "ret-type": "199",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "add-fd",
-      "ret-type": "191",
+      "ret-type": "201",
       "meta-type": "command",
-      "arg-type": "190"
+      "arg-type": "200"
     },
     {
       "name": "remove-fd",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "192"
+      "arg-type": "202"
     },
     {
       "name": "query-fdsets",
-      "ret-type": "[193]",
+      "ret-type": "[203]",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-target",
-      "ret-type": "194",
+      "ret-type": "204",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-command-line-options",
-      "ret-type": "[196]",
+      "ret-type": "[206]",
       "meta-type": "command",
-      "arg-type": "195"
-    },
-    {
-      "name": "query-memdev",
-      "ret-type": "[197]",
-      "meta-type": "command",
-      "arg-type": "0"
+      "arg-type": "205"
     },
     {
       "name": "query-memory-devices",
-      "ret-type": "[198]",
+      "ret-type": "[207]",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "MEM_UNPLUG_ERROR",
       "meta-type": "event",
-      "arg-type": "199"
+      "arg-type": "208"
     },
     {
       "name": "query-acpi-ospm-status",
-      "ret-type": "[200]",
+      "ret-type": "[209]",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "ACPI_DEVICE_OST",
       "meta-type": "event",
-      "arg-type": "201"
+      "arg-type": "210"
     },
     {
       "name": "xen-load-devices-state",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "202"
-    },
-    {
-      "name": "query-hotpluggable-cpus",
-      "ret-type": "[203]",
-      "meta-type": "command",
-      "arg-type": "0"
+      "arg-type": "211"
     },
     {
       "name": "query-vm-generation-id",
-      "ret-type": "204",
+      "ret-type": "212",
       "meta-type": "command",
       "arg-type": "0"
     },
-    {
-      "name": "set-numa-node",
-      "ret-type": "0",
-      "meta-type": "command",
-      "arg-type": "205"
-    },
     {
       "name": "RTC_CHANGE",
       "meta-type": "event",
-      "arg-type": "206"
+      "arg-type": "213"
     },
     {
       "name": "rtc-reset-reinjection",
@@ -9810,31 +10818,19 @@
     },
     {
       "name": "query-sev",
-      "ret-type": "207",
+      "ret-type": "214",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-sev-launch-measure",
-      "ret-type": "208",
+      "ret-type": "215",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-sev-capabilities",
-      "ret-type": "209",
-      "meta-type": "command",
-      "arg-type": "0"
-    },
-    {
-      "name": "query-cpu-model-expansion",
-      "ret-type": "217",
-      "meta-type": "command",
-      "arg-type": "216"
-    },
-    {
-      "name": "query-cpu-definitions",
-      "ret-type": "[218]",
+      "ret-type": "216",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -12141,6 +13137,83 @@
     },
     {
       "name": "86",
+      "members": [
+        {
+          "name": "paging",
+          "type": "bool"
+        },
+        {
+          "name": "protocol",
+          "type": "str"
+        },
+        {
+          "name": "detach",
+          "default": null,
+          "type": "bool"
+        },
+        {
+          "name": "begin",
+          "default": null,
+          "type": "int"
+        },
+        {
+          "name": "length",
+          "default": null,
+          "type": "int"
+        },
+        {
+          "name": "format",
+          "default": null,
+          "type": "280"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "87",
+      "members": [
+        {
+          "name": "status",
+          "type": "281"
+        },
+        {
+          "name": "completed",
+          "type": "int"
+        },
+        {
+          "name": "total",
+          "type": "int"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "88",
+      "members": [
+        {
+          "name": "result",
+          "type": "87"
+        },
+        {
+          "name": "error",
+          "default": null,
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "89",
+      "members": [
+        {
+          "name": "formats",
+          "type": "[280]"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "90",
       "members": [
         {
           "name": "name",
@@ -12154,7 +13227,7 @@
       "meta-type": "object"
     },
     {
-      "name": "87",
+      "name": "91",
       "members": [
         {
           "name": "type",
@@ -12168,7 +13241,7 @@
       "meta-type": "object"
     },
     {
-      "name": "88",
+      "name": "92",
       "members": [
         {
           "name": "id",
@@ -12178,7 +13251,7 @@
       "meta-type": "object"
     },
     {
-      "name": "89",
+      "name": "93",
       "members": [
         {
           "name": "name",
@@ -12189,12 +13262,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[90]",
-      "element-type": "90",
+      "name": "[94]",
+      "element-type": "94",
       "meta-type": "array"
     },
     {
-      "name": "90",
+      "name": "94",
       "members": [
         {
           "name": "name",
@@ -12206,15 +13279,15 @@
         },
         {
           "name": "multicast",
-          "type": "280"
+          "type": "282"
         },
         {
           "name": "unicast",
-          "type": "280"
+          "type": "282"
         },
         {
           "name": "vlan",
-          "type": "280"
+          "type": "282"
         },
         {
           "name": "broadcast-allowed",
@@ -12248,7 +13321,7 @@
       "meta-type": "object"
     },
     {
-      "name": "91",
+      "name": "95",
       "members": [
         {
           "name": "name",
@@ -12263,7 +13336,7 @@
       "meta-type": "object"
     },
     {
-      "name": "92",
+      "name": "96",
       "members": [
         {
           "name": "initial",
@@ -12280,12 +13353,22 @@
         {
           "name": "step",
           "type": "int"
+        },
+        {
+          "name": "interfaces",
+          "default": null,
+          "type": "[str]"
+        },
+        {
+          "name": "id",
+          "default": null,
+          "type": "str"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "93",
+      "name": "97",
       "members": [
         {
           "name": "netdev",
@@ -12307,7 +13390,7 @@
       "meta-type": "object"
     },
     {
-      "name": "94",
+      "name": "98",
       "members": [
         {
           "name": "name",
@@ -12317,7 +13400,7 @@
       "meta-type": "object"
     },
     {
-      "name": "95",
+      "name": "99",
       "members": [
         {
           "name": "name",
@@ -12335,7 +13418,7 @@
       "meta-type": "object"
     },
     {
-      "name": "96",
+      "name": "100",
       "members": [
         {
           "name": "name",
@@ -12345,12 +13428,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[97]",
-      "element-type": "97",
+      "name": "[101]",
+      "element-type": "101",
       "meta-type": "array"
     },
     {
-      "name": "97",
+      "name": "101",
       "members": [
         {
           "name": "name",
@@ -12370,17 +13453,17 @@
         },
         {
           "name": "duplex",
-          "type": "281"
+          "type": "283"
         },
         {
           "name": "autoneg",
-          "type": "282"
+          "type": "284"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "98",
+      "name": "102",
       "members": [
         {
           "name": "name",
@@ -12395,12 +13478,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[99]",
-      "element-type": "99",
+      "name": "[103]",
+      "element-type": "103",
       "meta-type": "array"
     },
     {
-      "name": "99",
+      "name": "103",
       "members": [
         {
           "name": "cookie",
@@ -12412,21 +13495,21 @@
         },
         {
           "name": "key",
-          "type": "283"
+          "type": "285"
         },
         {
           "name": "mask",
-          "type": "284"
+          "type": "286"
         },
         {
           "name": "action",
-          "type": "285"
+          "type": "287"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "100",
+      "name": "104",
       "members": [
         {
           "name": "name",
@@ -12441,12 +13524,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[101]",
-      "element-type": "101",
+      "name": "[105]",
+      "element-type": "105",
       "meta-type": "array"
     },
     {
-      "name": "101",
+      "name": "105",
       "members": [
         {
           "name": "id",
@@ -12515,12 +13598,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[102]",
-      "element-type": "102",
+      "name": "[106]",
+      "element-type": "106",
       "meta-type": "array"
     },
     {
-      "name": "102",
+      "name": "106",
       "meta-type": "enum",
       "values": [
         "tpm-tis",
@@ -12528,12 +13611,12 @@
       ]
     },
     {
-      "name": "[103]",
-      "element-type": "103",
+      "name": "[107]",
+      "element-type": "107",
       "meta-type": "array"
     },
     {
-      "name": "103",
+      "name": "107",
       "meta-type": "enum",
       "values": [
         "passthrough",
@@ -12541,12 +13624,12 @@
       ]
     },
     {
-      "name": "[104]",
-      "element-type": "104",
+      "name": "[108]",
+      "element-type": "108",
       "meta-type": "array"
     },
     {
-      "name": "104",
+      "name": "108",
       "members": [
         {
           "name": "id",
@@ -12554,17 +13637,17 @@
         },
         {
           "name": "model",
-          "type": "102"
+          "type": "106"
         },
         {
           "name": "options",
-          "type": "286"
+          "type": "288"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "105",
+      "name": "109",
       "members": [
         {
           "name": "protocol",
@@ -12583,7 +13666,7 @@
       "meta-type": "object"
     },
     {
-      "name": "106",
+      "name": "110",
       "members": [
         {
           "name": "protocol",
@@ -12597,7 +13680,7 @@
       "meta-type": "object"
     },
     {
-      "name": "107",
+      "name": "111",
       "members": [
         {
           "name": "filename",
@@ -12617,7 +13700,7 @@
       "meta-type": "object"
     },
     {
-      "name": "108",
+      "name": "112",
       "members": [
         {
           "name": "enabled",
@@ -12654,60 +13737,60 @@
         },
         {
           "name": "mouse-mode",
-          "type": "287"
+          "type": "289"
         },
         {
           "name": "channels",
           "default": null,
-          "type": "[288]"
+          "type": "[290]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "109",
+      "name": "113",
       "members": [
         {
           "name": "server",
-          "type": "289"
+          "type": "291"
         },
         {
           "name": "client",
-          "type": "289"
+          "type": "291"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "110",
+      "name": "114",
       "members": [
         {
           "name": "server",
+          "type": "292"
+        },
+        {
+          "name": "client",
           "type": "290"
-        },
-        {
-          "name": "client",
-          "type": "288"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "111",
+      "name": "115",
       "members": [
         {
           "name": "server",
-          "type": "289"
+          "type": "291"
         },
         {
           "name": "client",
-          "type": "289"
+          "type": "291"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "112",
+      "name": "116",
       "members": [
         {
           "name": "enabled",
@@ -12721,7 +13804,7 @@
         {
           "name": "family",
           "default": null,
-          "type": "291"
+          "type": "293"
         },
         {
           "name": "service",
@@ -12736,18 +13819,18 @@
         {
           "name": "clients",
           "default": null,
-          "type": "[292]"
+          "type": "[294]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[113]",
-      "element-type": "113",
+      "name": "[117]",
+      "element-type": "117",
       "meta-type": "array"
     },
     {
-      "name": "113",
+      "name": "117",
       "members": [
         {
           "name": "id",
@@ -12755,20 +13838,20 @@
         },
         {
           "name": "server",
-          "type": "[293]"
+          "type": "[295]"
         },
         {
           "name": "clients",
-          "type": "[292]"
+          "type": "[294]"
         },
         {
           "name": "auth",
-          "type": "294"
+          "type": "296"
         },
         {
           "name": "vencrypt",
           "default": null,
-          "type": "295"
+          "type": "297"
         },
         {
           "name": "display",
@@ -12779,7 +13862,7 @@
       "meta-type": "object"
     },
     {
-      "name": "114",
+      "name": "118",
       "members": [
         {
           "name": "password",
@@ -12789,54 +13872,54 @@
       "meta-type": "object"
     },
     {
-      "name": "115",
+      "name": "119",
       "members": [
         {
           "name": "server",
-          "type": "296"
+          "type": "298"
         },
         {
           "name": "client",
-          "type": "297"
+          "type": "299"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "116",
+      "name": "120",
       "members": [
         {
           "name": "server",
-          "type": "296"
+          "type": "298"
         },
         {
           "name": "client",
-          "type": "292"
+          "type": "294"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "117",
+      "name": "121",
       "members": [
         {
           "name": "server",
-          "type": "296"
+          "type": "298"
         },
         {
           "name": "client",
-          "type": "292"
+          "type": "294"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[118]",
-      "element-type": "118",
+      "name": "[122]",
+      "element-type": "122",
       "meta-type": "array"
     },
     {
-      "name": "118",
+      "name": "122",
       "members": [
         {
           "name": "name",
@@ -12858,11 +13941,11 @@
       "meta-type": "object"
     },
     {
-      "name": "119",
+      "name": "123",
       "members": [
         {
           "name": "keys",
-          "type": "[298]"
+          "type": "[300]"
         },
         {
           "name": "hold-time",
@@ -12873,7 +13956,7 @@
       "meta-type": "object"
     },
     {
-      "name": "120",
+      "name": "124",
       "members": [
         {
           "name": "device",
@@ -12887,26 +13970,26 @@
         },
         {
           "name": "events",
-          "type": "[299]"
+          "type": "[301]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "121",
+      "name": "125",
       "tag": "type",
       "variants": [
         {
           "case": "gtk",
-          "type": "302"
+          "type": "304"
         },
         {
           "case": "curses",
-          "type": "303"
+          "type": "305"
         },
         {
           "case": "egl-headless",
-          "type": "304"
+          "type": "306"
         },
         {
           "case": "default",
@@ -12932,7 +14015,7 @@
       "members": [
         {
           "name": "type",
-          "type": "300"
+          "type": "302"
         },
         {
           "name": "full-screen",
@@ -12947,33 +14030,33 @@
         {
           "name": "gl",
           "default": null,
-          "type": "301"
+          "type": "303"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "122",
+      "name": "126",
       "members": [
         {
           "name": "status",
           "default": null,
-          "type": "305"
+          "type": "307"
         },
         {
           "name": "ram",
           "default": null,
-          "type": "306"
+          "type": "308"
         },
         {
           "name": "disk",
           "default": null,
-          "type": "306"
+          "type": "308"
         },
         {
           "name": "xbzrle-cache",
           "default": null,
-          "type": "307"
+          "type": "309"
         },
         {
           "name": "total-time",
@@ -13018,37 +14101,37 @@
         {
           "name": "compression",
           "default": null,
-          "type": "308"
+          "type": "310"
         },
         {
           "name": "socket-address",
           "default": null,
-          "type": "[309]"
+          "type": "[311]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "123",
+      "name": "127",
       "members": [
         {
           "name": "capabilities",
-          "type": "[124]"
+          "type": "[128]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[124]",
-      "element-type": "124",
+      "name": "[128]",
+      "element-type": "128",
       "meta-type": "array"
     },
     {
-      "name": "124",
+      "name": "128",
       "members": [
         {
           "name": "capability",
-          "type": "310"
+          "type": "312"
         },
         {
           "name": "state",
@@ -13058,7 +14141,7 @@
       "meta-type": "object"
     },
     {
-      "name": "125",
+      "name": "129",
       "members": [
         {
           "name": "announce-initial",
@@ -13169,7 +14252,7 @@
       "meta-type": "object"
     },
     {
-      "name": "126",
+      "name": "130",
       "members": [
         {
           "name": "announce-initial",
@@ -13280,7 +14363,7 @@
       "meta-type": "object"
     },
     {
-      "name": "127",
+      "name": "131",
       "members": [
         {
           "name": "protocol",
@@ -13309,17 +14392,17 @@
       "meta-type": "object"
     },
     {
-      "name": "128",
+      "name": "132",
       "members": [
         {
           "name": "status",
-          "type": "305"
+          "type": "307"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "129",
+      "name": "133",
       "members": [
         {
           "name": "pass",
@@ -13329,31 +14412,31 @@
       "meta-type": "object"
     },
     {
-      "name": "130",
+      "name": "134",
       "members": [
         {
           "name": "mode",
-          "type": "311"
+          "type": "313"
         },
         {
           "name": "reason",
-          "type": "312"
+          "type": "314"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "131",
+      "name": "135",
       "members": [
         {
           "name": "state",
-          "type": "305"
+          "type": "307"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "132",
+      "name": "136",
       "members": [
         {
           "name": "value",
@@ -13363,7 +14446,7 @@
       "meta-type": "object"
     },
     {
-      "name": "133",
+      "name": "137",
       "members": [
         {
           "name": "value",
@@ -13373,7 +14456,7 @@
       "meta-type": "object"
     },
     {
-      "name": "134",
+      "name": "138",
       "members": [
         {
           "name": "value",
@@ -13388,7 +14471,7 @@
       "meta-type": "builtin"
     },
     {
-      "name": "135",
+      "name": "139",
       "members": [
         {
           "name": "uri",
@@ -13418,7 +14501,7 @@
       "meta-type": "object"
     },
     {
-      "name": "136",
+      "name": "140",
       "members": [
         {
           "name": "uri",
@@ -13428,7 +14511,7 @@
       "meta-type": "object"
     },
     {
-      "name": "137",
+      "name": "141",
       "members": [
         {
           "name": "filename",
@@ -13443,7 +14526,7 @@
       "meta-type": "object"
     },
     {
-      "name": "138",
+      "name": "142",
       "members": [
         {
           "name": "enable",
@@ -13462,7 +14545,7 @@
       "meta-type": "object"
     },
     {
-      "name": "139",
+      "name": "143",
       "members": [
         {
           "name": "error",
@@ -13477,25 +14560,25 @@
       "meta-type": "object"
     },
     {
-      "name": "140",
+      "name": "144",
       "members": [
         {
           "name": "mode",
-          "type": "311"
+          "type": "313"
         },
         {
           "name": "last-mode",
-          "type": "311"
+          "type": "313"
         },
         {
           "name": "reason",
-          "type": "312"
+          "type": "314"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "141",
+      "name": "145",
       "members": [
         {
           "name": "uri",
@@ -13505,22 +14588,22 @@
       "meta-type": "object"
     },
     {
-      "name": "142",
+      "name": "146",
       "members": [
         {
           "name": "actions",
-          "type": "[313]"
+          "type": "[315]"
         },
         {
           "name": "properties",
           "default": null,
-          "type": "314"
+          "type": "316"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "143",
+      "name": "147",
       "members": [
         {
           "name": "name",
@@ -13535,12 +14618,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[144]",
-      "element-type": "144",
+      "name": "[148]",
+      "element-type": "148",
       "meta-type": "array"
     },
     {
-      "name": "144",
+      "name": "148",
       "members": [
         {
           "name": "name",
@@ -13548,7 +14631,7 @@
         },
         {
           "name": "state",
-          "type": "315"
+          "type": "317"
         },
         {
           "name": "vcpu",
@@ -13558,7 +14641,7 @@
       "meta-type": "object"
     },
     {
-      "name": "145",
+      "name": "149",
       "members": [
         {
           "name": "name",
@@ -13582,41 +14665,41 @@
       "meta-type": "object"
     },
     {
-      "name": "[146]",
-      "element-type": "146",
+      "name": "[150]",
+      "element-type": "150",
       "meta-type": "array"
     },
     {
-      "name": "146",
+      "name": "150",
       "tag": "meta-type",
       "variants": [
         {
           "case": "builtin",
-          "type": "317"
-        },
-        {
-          "case": "enum",
-          "type": "318"
-        },
-        {
-          "case": "array",
           "type": "319"
         },
         {
-          "case": "object",
+          "case": "enum",
           "type": "320"
         },
         {
-          "case": "alternate",
+          "case": "array",
           "type": "321"
         },
         {
-          "case": "command",
+          "case": "object",
           "type": "322"
         },
         {
-          "case": "event",
+          "case": "alternate",
           "type": "323"
+        },
+        {
+          "case": "command",
+          "type": "324"
+        },
+        {
+          "case": "event",
+          "type": "325"
         }
       ],
       "members": [
@@ -13626,71 +14709,7 @@
         },
         {
           "name": "meta-type",
-          "type": "316"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "147",
-      "members": [
-        {
-          "name": "enable",
-          "default": null,
-          "type": "[324]"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "148",
-      "members": [
-        {
-          "name": "qemu",
-          "type": "325"
-        },
-        {
-          "name": "package",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "[149]",
-      "element-type": "149",
-      "meta-type": "array"
-    },
-    {
-      "name": "149",
-      "members": [
-        {
-          "name": "name",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "150",
-      "members": [
-        {
-          "name": "protocol",
-          "type": "str"
-        },
-        {
-          "name": "fdname",
-          "type": "str"
-        },
-        {
-          "name": "skipauth",
-          "default": null,
-          "type": "bool"
-        },
-        {
-          "name": "tls",
-          "default": null,
-          "type": "bool"
+          "type": "318"
         }
       ],
       "meta-type": "object"
@@ -13699,23 +14718,32 @@
       "name": "151",
       "members": [
         {
-          "name": "name",
-          "default": null,
+          "name": "path",
           "type": "str"
         }
       ],
       "meta-type": "object"
     },
+    {
+      "name": "[152]",
+      "element-type": "152",
+      "meta-type": "array"
+    },
     {
       "name": "152",
       "members": [
         {
-          "name": "enabled",
-          "type": "bool"
+          "name": "name",
+          "type": "str"
         },
         {
-          "name": "present",
-          "type": "bool"
+          "name": "type",
+          "type": "str"
+        },
+        {
+          "name": "description",
+          "default": null,
+          "type": "str"
         }
       ],
       "meta-type": "object"
@@ -13724,34 +14752,181 @@
       "name": "153",
       "members": [
         {
-          "name": "UUID",
+          "name": "path",
+          "type": "str"
+        },
+        {
+          "name": "property",
           "type": "str"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[154]",
-      "element-type": "154",
-      "meta-type": "array"
+      "name": "any",
+      "json-type": "value",
+      "meta-type": "builtin"
     },
     {
       "name": "154",
+      "members": [
+        {
+          "name": "path",
+          "type": "str"
+        },
+        {
+          "name": "property",
+          "type": "str"
+        },
+        {
+          "name": "value",
+          "type": "any"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "155",
+      "members": [
+        {
+          "name": "implements",
+          "default": null,
+          "type": "str"
+        },
+        {
+          "name": "abstract",
+          "default": null,
+          "type": "bool"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "[156]",
+      "element-type": "156",
+      "meta-type": "array"
+    },
+    {
+      "name": "156",
       "members": [
         {
           "name": "name",
           "type": "str"
+        },
+        {
+          "name": "abstract",
+          "default": null,
+          "type": "bool"
+        },
+        {
+          "name": "parent",
+          "default": null,
+          "type": "str"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[155]",
-      "element-type": "155",
+      "name": "157",
+      "members": [
+        {
+          "name": "typename",
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "158",
+      "members": [
+        {
+          "name": "qom-type",
+          "type": "str"
+        },
+        {
+          "name": "id",
+          "type": "str"
+        },
+        {
+          "name": "props",
+          "default": null,
+          "type": "any"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "159",
+      "members": [
+        {
+          "name": "id",
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "160",
+      "members": [
+        {
+          "name": "typename",
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "161",
+      "members": [
+        {
+          "name": "driver",
+          "type": "str"
+        },
+        {
+          "name": "bus",
+          "default": null,
+          "type": "str"
+        },
+        {
+          "name": "id",
+          "default": null,
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "162",
+      "members": [
+        {
+          "name": "id",
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "163",
+      "members": [
+        {
+          "name": "device",
+          "default": null,
+          "type": "str"
+        },
+        {
+          "name": "path",
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "[164]",
+      "element-type": "164",
       "meta-type": "array"
     },
     {
-      "name": "155",
+      "name": "164",
       "tag": "arch",
       "variants": [
         {
@@ -13821,12 +14996,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[156]",
-      "element-type": "156",
+      "name": "[165]",
+      "element-type": "165",
       "meta-type": "array"
     },
     {
-      "name": "156",
+      "name": "165",
       "tag": "target",
       "variants": [
         {
@@ -13983,158 +15158,12 @@
       ],
       "meta-type": "object"
     },
-    {
-      "name": "[157]",
-      "element-type": "157",
-      "meta-type": "array"
-    },
-    {
-      "name": "157",
-      "members": [
-        {
-          "name": "id",
-          "type": "str"
-        },
-        {
-          "name": "thread-id",
-          "type": "int"
-        },
-        {
-          "name": "poll-max-ns",
-          "type": "int"
-        },
-        {
-          "name": "poll-grow",
-          "type": "int"
-        },
-        {
-          "name": "poll-shrink",
-          "type": "int"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "158",
-      "members": [
-        {
-          "name": "actual",
-          "type": "int"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "159",
-      "members": [
-        {
-          "name": "actual",
-          "type": "int"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "[160]",
-      "element-type": "160",
-      "meta-type": "array"
-    },
-    {
-      "name": "160",
-      "members": [
-        {
-          "name": "bus",
-          "type": "int"
-        },
-        {
-          "name": "devices",
-          "type": "[336]"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "161",
-      "members": [
-        {
-          "name": "id",
-          "type": "int"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "162",
-      "members": [
-        {
-          "name": "val",
-          "type": "int"
-        },
-        {
-          "name": "size",
-          "type": "int"
-        },
-        {
-          "name": "filename",
-          "type": "str"
-        },
-        {
-          "name": "cpu-index",
-          "default": null,
-          "type": "int"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "163",
-      "members": [
-        {
-          "name": "val",
-          "type": "int"
-        },
-        {
-          "name": "size",
-          "type": "int"
-        },
-        {
-          "name": "filename",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "164",
-      "members": [
-        {
-          "name": "value",
-          "type": "int"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "165",
-      "members": [
-        {
-          "name": "command-line",
-          "type": "str"
-        },
-        {
-          "name": "cpu-index",
-          "default": null,
-          "type": "int"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "166",
       "members": [
         {
-          "name": "path",
-          "type": "str"
+          "name": "id",
+          "type": "int"
         }
       ],
       "meta-type": "object"
@@ -14146,328 +15175,6 @@
     },
     {
       "name": "167",
-      "members": [
-        {
-          "name": "name",
-          "type": "str"
-        },
-        {
-          "name": "type",
-          "type": "str"
-        },
-        {
-          "name": "description",
-          "default": null,
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "168",
-      "members": [
-        {
-          "name": "path",
-          "type": "str"
-        },
-        {
-          "name": "property",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "any",
-      "json-type": "value",
-      "meta-type": "builtin"
-    },
-    {
-      "name": "169",
-      "members": [
-        {
-          "name": "path",
-          "type": "str"
-        },
-        {
-          "name": "property",
-          "type": "str"
-        },
-        {
-          "name": "value",
-          "type": "any"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "170",
-      "members": [
-        {
-          "name": "device",
-          "type": "str"
-        },
-        {
-          "name": "target",
-          "type": "str"
-        },
-        {
-          "name": "arg",
-          "default": null,
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "171",
-      "members": [
-        {
-          "name": "implements",
-          "default": null,
-          "type": "str"
-        },
-        {
-          "name": "abstract",
-          "default": null,
-          "type": "bool"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "[172]",
-      "element-type": "172",
-      "meta-type": "array"
-    },
-    {
-      "name": "172",
-      "members": [
-        {
-          "name": "name",
-          "type": "str"
-        },
-        {
-          "name": "abstract",
-          "default": null,
-          "type": "bool"
-        },
-        {
-          "name": "parent",
-          "default": null,
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "173",
-      "members": [
-        {
-          "name": "typename",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "174",
-      "members": [
-        {
-          "name": "typename",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "175",
-      "members": [
-        {
-          "name": "enable",
-          "type": "bool"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "176",
-      "members": [
-        {
-          "name": "driver",
-          "type": "str"
-        },
-        {
-          "name": "bus",
-          "default": null,
-          "type": "str"
-        },
-        {
-          "name": "id",
-          "default": null,
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "177",
-      "members": [
-        {
-          "name": "id",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "178",
-      "members": [
-        {
-          "name": "device",
-          "default": null,
-          "type": "str"
-        },
-        {
-          "name": "path",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "179",
-      "members": [
-        {
-          "name": "paging",
-          "type": "bool"
-        },
-        {
-          "name": "protocol",
-          "type": "str"
-        },
-        {
-          "name": "detach",
-          "default": null,
-          "type": "bool"
-        },
-        {
-          "name": "begin",
-          "default": null,
-          "type": "int"
-        },
-        {
-          "name": "length",
-          "default": null,
-          "type": "int"
-        },
-        {
-          "name": "format",
-          "default": null,
-          "type": "337"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "180",
-      "members": [
-        {
-          "name": "status",
-          "type": "338"
-        },
-        {
-          "name": "completed",
-          "type": "int"
-        },
-        {
-          "name": "total",
-          "type": "int"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "181",
-      "members": [
-        {
-          "name": "result",
-          "type": "180"
-        },
-        {
-          "name": "error",
-          "default": null,
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "182",
-      "members": [
-        {
-          "name": "formats",
-          "type": "[337]"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "183",
-      "members": [
-        {
-          "name": "qom-type",
-          "type": "str"
-        },
-        {
-          "name": "id",
-          "type": "str"
-        },
-        {
-          "name": "props",
-          "default": null,
-          "type": "any"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "184",
-      "members": [
-        {
-          "name": "id",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "185",
-      "members": [
-        {
-          "name": "fdname",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "186",
-      "members": [
-        {
-          "name": "fdname",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "[187]",
-      "element-type": "187",
-      "meta-type": "array"
-    },
-    {
-      "name": "187",
       "members": [
         {
           "name": "name",
@@ -14490,12 +15197,20 @@
         {
           "name": "hotpluggable-cpus",
           "type": "bool"
+        },
+        {
+          "name": "numa-mem-supported",
+          "type": "bool"
+        },
+        {
+          "name": "deprecated",
+          "type": "bool"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "188",
+      "name": "168",
       "members": [
         {
           "name": "wakeup-suspend-support",
@@ -14505,131 +15220,12 @@
       "meta-type": "object"
     },
     {
-      "name": "189",
-      "members": [
-        {
-          "name": "base-memory",
-          "type": "int"
-        },
-        {
-          "name": "plugged-memory",
-          "default": null,
-          "type": "int"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "190",
-      "members": [
-        {
-          "name": "fdset-id",
-          "default": null,
-          "type": "int"
-        },
-        {
-          "name": "opaque",
-          "default": null,
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "191",
-      "members": [
-        {
-          "name": "fdset-id",
-          "type": "int"
-        },
-        {
-          "name": "fd",
-          "type": "int"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "192",
-      "members": [
-        {
-          "name": "fdset-id",
-          "type": "int"
-        },
-        {
-          "name": "fd",
-          "default": null,
-          "type": "int"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "[193]",
-      "element-type": "193",
+      "name": "[169]",
+      "element-type": "169",
       "meta-type": "array"
     },
     {
-      "name": "193",
-      "members": [
-        {
-          "name": "fdset-id",
-          "type": "int"
-        },
-        {
-          "name": "fds",
-          "type": "[339]"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "194",
-      "members": [
-        {
-          "name": "arch",
-          "type": "335"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "195",
-      "members": [
-        {
-          "name": "option",
-          "default": null,
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "[196]",
-      "element-type": "196",
-      "meta-type": "array"
-    },
-    {
-      "name": "196",
-      "members": [
-        {
-          "name": "option",
-          "type": "str"
-        },
-        {
-          "name": "parameters",
-          "type": "[340]"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "[197]",
-      "element-type": "197",
-      "meta-type": "array"
-    },
-    {
-      "name": "197",
+      "name": "169",
       "members": [
         {
           "name": "id",
@@ -14658,110 +15254,18 @@
         },
         {
           "name": "policy",
-          "type": "341"
+          "type": "336"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[198]",
-      "element-type": "198",
+      "name": "[170]",
+      "element-type": "170",
       "meta-type": "array"
     },
     {
-      "name": "198",
-      "tag": "type",
-      "variants": [
-        {
-          "case": "dimm",
-          "type": "343"
-        },
-        {
-          "case": "nvdimm",
-          "type": "343"
-        }
-      ],
-      "members": [
-        {
-          "name": "type",
-          "type": "342"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "199",
-      "members": [
-        {
-          "name": "device",
-          "type": "str"
-        },
-        {
-          "name": "msg",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "[200]",
-      "element-type": "200",
-      "meta-type": "array"
-    },
-    {
-      "name": "200",
-      "members": [
-        {
-          "name": "device",
-          "default": null,
-          "type": "str"
-        },
-        {
-          "name": "slot",
-          "type": "str"
-        },
-        {
-          "name": "slot-type",
-          "type": "344"
-        },
-        {
-          "name": "source",
-          "type": "int"
-        },
-        {
-          "name": "status",
-          "type": "int"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "201",
-      "members": [
-        {
-          "name": "info",
-          "type": "200"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "202",
-      "members": [
-        {
-          "name": "filename",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "[203]",
-      "element-type": "203",
-      "meta-type": "array"
-    },
-    {
-      "name": "203",
+      "name": "170",
       "members": [
         {
           "name": "type",
@@ -14783,8 +15287,609 @@
       ],
       "meta-type": "object"
     },
+    {
+      "name": "171",
+      "tag": "type",
+      "variants": [
+        {
+          "case": "node",
+          "type": "338"
+        },
+        {
+          "case": "dist",
+          "type": "339"
+        },
+        {
+          "case": "cpu",
+          "type": "340"
+        }
+      ],
+      "members": [
+        {
+          "name": "type",
+          "type": "337"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "176",
+      "members": [
+        {
+          "name": "type",
+          "type": "343"
+        },
+        {
+          "name": "model",
+          "type": "341"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "177",
+      "members": [
+        {
+          "name": "model",
+          "type": "341"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "[178]",
+      "element-type": "178",
+      "meta-type": "array"
+    },
+    {
+      "name": "178",
+      "members": [
+        {
+          "name": "name",
+          "type": "str"
+        },
+        {
+          "name": "migration-safe",
+          "default": null,
+          "type": "bool"
+        },
+        {
+          "name": "static",
+          "type": "bool"
+        },
+        {
+          "name": "unavailable-features",
+          "default": null,
+          "type": "[str]"
+        },
+        {
+          "name": "typename",
+          "type": "str"
+        },
+        {
+          "name": "alias-of",
+          "default": null,
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "179",
+      "members": [
+        {
+          "name": "enable",
+          "default": null,
+          "type": "[344]"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "180",
+      "members": [
+        {
+          "name": "qemu",
+          "type": "345"
+        },
+        {
+          "name": "package",
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "[181]",
+      "element-type": "181",
+      "meta-type": "array"
+    },
+    {
+      "name": "181",
+      "members": [
+        {
+          "name": "name",
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "182",
+      "members": [
+        {
+          "name": "protocol",
+          "type": "str"
+        },
+        {
+          "name": "fdname",
+          "type": "str"
+        },
+        {
+          "name": "skipauth",
+          "default": null,
+          "type": "bool"
+        },
+        {
+          "name": "tls",
+          "default": null,
+          "type": "bool"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "183",
+      "members": [
+        {
+          "name": "name",
+          "default": null,
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "184",
+      "members": [
+        {
+          "name": "enabled",
+          "type": "bool"
+        },
+        {
+          "name": "present",
+          "type": "bool"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "185",
+      "members": [
+        {
+          "name": "UUID",
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "[186]",
+      "element-type": "186",
+      "meta-type": "array"
+    },
+    {
+      "name": "186",
+      "members": [
+        {
+          "name": "name",
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "[187]",
+      "element-type": "187",
+      "meta-type": "array"
+    },
+    {
+      "name": "187",
+      "members": [
+        {
+          "name": "id",
+          "type": "str"
+        },
+        {
+          "name": "thread-id",
+          "type": "int"
+        },
+        {
+          "name": "poll-max-ns",
+          "type": "int"
+        },
+        {
+          "name": "poll-grow",
+          "type": "int"
+        },
+        {
+          "name": "poll-shrink",
+          "type": "int"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "188",
+      "members": [
+        {
+          "name": "actual",
+          "type": "int"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "189",
+      "members": [
+        {
+          "name": "actual",
+          "type": "int"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "[190]",
+      "element-type": "190",
+      "meta-type": "array"
+    },
+    {
+      "name": "190",
+      "members": [
+        {
+          "name": "bus",
+          "type": "int"
+        },
+        {
+          "name": "devices",
+          "type": "[346]"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "191",
+      "members": [
+        {
+          "name": "val",
+          "type": "int"
+        },
+        {
+          "name": "size",
+          "type": "int"
+        },
+        {
+          "name": "filename",
+          "type": "str"
+        },
+        {
+          "name": "cpu-index",
+          "default": null,
+          "type": "int"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "192",
+      "members": [
+        {
+          "name": "val",
+          "type": "int"
+        },
+        {
+          "name": "size",
+          "type": "int"
+        },
+        {
+          "name": "filename",
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "193",
+      "members": [
+        {
+          "name": "value",
+          "type": "int"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "194",
+      "members": [
+        {
+          "name": "command-line",
+          "type": "str"
+        },
+        {
+          "name": "cpu-index",
+          "default": null,
+          "type": "int"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "195",
+      "members": [
+        {
+          "name": "device",
+          "type": "str"
+        },
+        {
+          "name": "target",
+          "type": "str"
+        },
+        {
+          "name": "arg",
+          "default": null,
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "196",
+      "members": [
+        {
+          "name": "enable",
+          "type": "bool"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "197",
+      "members": [
+        {
+          "name": "fdname",
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "198",
+      "members": [
+        {
+          "name": "fdname",
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "199",
+      "members": [
+        {
+          "name": "base-memory",
+          "type": "int"
+        },
+        {
+          "name": "plugged-memory",
+          "default": null,
+          "type": "int"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "200",
+      "members": [
+        {
+          "name": "fdset-id",
+          "default": null,
+          "type": "int"
+        },
+        {
+          "name": "opaque",
+          "default": null,
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "201",
+      "members": [
+        {
+          "name": "fdset-id",
+          "type": "int"
+        },
+        {
+          "name": "fd",
+          "type": "int"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "202",
+      "members": [
+        {
+          "name": "fdset-id",
+          "type": "int"
+        },
+        {
+          "name": "fd",
+          "default": null,
+          "type": "int"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "[203]",
+      "element-type": "203",
+      "meta-type": "array"
+    },
+    {
+      "name": "203",
+      "members": [
+        {
+          "name": "fdset-id",
+          "type": "int"
+        },
+        {
+          "name": "fds",
+          "type": "[347]"
+        }
+      ],
+      "meta-type": "object"
+    },
     {
       "name": "204",
+      "members": [
+        {
+          "name": "arch",
+          "type": "335"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "205",
+      "members": [
+        {
+          "name": "option",
+          "default": null,
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "[206]",
+      "element-type": "206",
+      "meta-type": "array"
+    },
+    {
+      "name": "206",
+      "members": [
+        {
+          "name": "option",
+          "type": "str"
+        },
+        {
+          "name": "parameters",
+          "type": "[348]"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "[207]",
+      "element-type": "207",
+      "meta-type": "array"
+    },
+    {
+      "name": "207",
+      "tag": "type",
+      "variants": [
+        {
+          "case": "dimm",
+          "type": "350"
+        },
+        {
+          "case": "nvdimm",
+          "type": "350"
+        },
+        {
+          "case": "virtio-pmem",
+          "type": "351"
+        }
+      ],
+      "members": [
+        {
+          "name": "type",
+          "type": "349"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "208",
+      "members": [
+        {
+          "name": "device",
+          "type": "str"
+        },
+        {
+          "name": "msg",
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "[209]",
+      "element-type": "209",
+      "meta-type": "array"
+    },
+    {
+      "name": "209",
+      "members": [
+        {
+          "name": "device",
+          "default": null,
+          "type": "str"
+        },
+        {
+          "name": "slot",
+          "type": "str"
+        },
+        {
+          "name": "slot-type",
+          "type": "352"
+        },
+        {
+          "name": "source",
+          "type": "int"
+        },
+        {
+          "name": "status",
+          "type": "int"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "210",
+      "members": [
+        {
+          "name": "info",
+          "type": "209"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "211",
+      "members": [
+        {
+          "name": "filename",
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "212",
       "members": [
         {
           "name": "guid",
@@ -14794,32 +15899,7 @@
       "meta-type": "object"
     },
     {
-      "name": "205",
-      "tag": "type",
-      "variants": [
-        {
-          "case": "node",
-          "type": "346"
-        },
-        {
-          "case": "dist",
-          "type": "347"
-        },
-        {
-          "case": "cpu",
-          "type": "348"
-        }
-      ],
-      "members": [
-        {
-          "name": "type",
-          "type": "345"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "206",
+      "name": "213",
       "members": [
         {
           "name": "offset",
@@ -14829,7 +15909,7 @@
       "meta-type": "object"
     },
     {
-      "name": "207",
+      "name": "214",
       "members": [
         {
           "name": "enabled",
@@ -14853,7 +15933,7 @@
         },
         {
           "name": "state",
-          "type": "349"
+          "type": "353"
         },
         {
           "name": "handle",
@@ -14863,7 +15943,7 @@
       "meta-type": "object"
     },
     {
-      "name": "208",
+      "name": "215",
       "members": [
         {
           "name": "data",
@@ -14873,7 +15953,7 @@
       "meta-type": "object"
     },
     {
-      "name": "209",
+      "name": "216",
       "members": [
         {
           "name": "pdh",
@@ -14894,63 +15974,6 @@
       ],
       "meta-type": "object"
     },
-    {
-      "name": "216",
-      "members": [
-        {
-          "name": "type",
-          "type": "352"
-        },
-        {
-          "name": "model",
-          "type": "350"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "217",
-      "members": [
-        {
-          "name": "model",
-          "type": "350"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "[218]",
-      "element-type": "218",
-      "meta-type": "array"
-    },
-    {
-      "name": "218",
-      "members": [
-        {
-          "name": "name",
-          "type": "str"
-        },
-        {
-          "name": "migration-safe",
-          "default": null,
-          "type": "bool"
-        },
-        {
-          "name": "static",
-          "type": "bool"
-        },
-        {
-          "name": "unavailable-features",
-          "default": null,
-          "type": "[str]"
-        },
-        {
-          "name": "typename",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "bool",
       "json-type": "boolean",
@@ -15022,17 +16045,17 @@
       "variants": [
         {
           "case": "hyper-v",
-          "type": "354"
+          "type": "355"
         },
         {
           "case": "s390",
-          "type": "355"
+          "type": "356"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "353"
+          "type": "354"
         }
       ],
       "meta-type": "object"
@@ -15110,7 +16133,7 @@
         },
         {
           "name": "status",
-          "type": "356"
+          "type": "357"
         },
         {
           "name": "persistent",
@@ -15210,22 +16233,22 @@
         },
         {
           "name": "timed_stats",
-          "type": "[357]"
+          "type": "[358]"
         },
         {
           "name": "rd_latency_histogram",
           "default": null,
-          "type": "358"
+          "type": "359"
         },
         {
           "name": "wr_latency_histogram",
           "default": null,
-          "type": "358"
+          "type": "359"
         },
         {
           "name": "flush_latency_histogram",
           "default": null,
-          "type": "358"
+          "type": "359"
         }
       ],
       "meta-type": "object"
@@ -15336,7 +16359,7 @@
         {
           "name": "format-specific",
           "default": null,
-          "type": "359"
+          "type": "360"
         }
       ],
       "meta-type": "object"
@@ -15373,7 +16396,7 @@
         },
         {
           "name": "type",
-          "type": "360"
+          "type": "361"
         },
         {
           "name": "name",
@@ -15404,11 +16427,11 @@
         },
         {
           "name": "perm",
-          "type": "[361]"
+          "type": "[362]"
         },
         {
           "name": "shared-perm",
-          "type": "[361]"
+          "type": "[362]"
         }
       ],
       "meta-type": "object"
@@ -15512,7 +16535,7 @@
       "members": [
         {
           "name": "image",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "config",
@@ -15552,12 +16575,12 @@
         {
           "name": "inject-error",
           "default": null,
-          "type": "[363]"
+          "type": "[364]"
         },
         {
           "name": "set-state",
           "default": null,
-          "type": "[364]"
+          "type": "[365]"
         }
       ],
       "meta-type": "object"
@@ -15567,11 +16590,11 @@
       "members": [
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "log",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "log-sector-size",
@@ -15596,11 +16619,11 @@
       "members": [
         {
           "name": "test",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "raw",
-          "type": "362"
+          "type": "363"
         }
       ],
       "meta-type": "object"
@@ -15610,7 +16633,7 @@
       "members": [
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         }
       ],
       "meta-type": "object"
@@ -15630,12 +16653,12 @@
         {
           "name": "locking",
           "default": null,
-          "type": "365"
+          "type": "366"
         },
         {
           "name": "aio",
           "default": null,
-          "type": "366"
+          "type": "367"
         },
         {
           "name": "drop-cache",
@@ -15751,7 +16774,7 @@
         },
         {
           "name": "server",
-          "type": "[309]"
+          "type": "[311]"
         },
         {
           "name": "debug",
@@ -15876,7 +16899,7 @@
       "members": [
         {
           "name": "transport",
-          "type": "367"
+          "type": "368"
         },
         {
           "name": "portal",
@@ -15909,7 +16932,7 @@
         {
           "name": "header-digest",
           "default": null,
-          "type": "368"
+          "type": "369"
         },
         {
           "name": "timeout",
@@ -15924,7 +16947,7 @@
       "members": [
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "key-secret",
@@ -15939,7 +16962,7 @@
       "members": [
         {
           "name": "server",
-          "type": "309"
+          "type": "311"
         },
         {
           "name": "export",
@@ -15964,7 +16987,7 @@
       "members": [
         {
           "name": "server",
-          "type": "369"
+          "type": "370"
         },
         {
           "name": "path",
@@ -16043,12 +17066,12 @@
       "members": [
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "backing",
           "default": null,
-          "type": "370"
+          "type": "371"
         },
         {
           "name": "lazy-refcounts",
@@ -16073,7 +17096,7 @@
         {
           "name": "overlap-check",
           "default": null,
-          "type": "371"
+          "type": "372"
         },
         {
           "name": "cache-size",
@@ -16103,12 +17126,12 @@
         {
           "name": "encrypt",
           "default": null,
-          "type": "372"
+          "type": "373"
         },
         {
           "name": "data-file",
           "default": null,
-          "type": "362"
+          "type": "363"
         }
       ],
       "meta-type": "object"
@@ -16118,17 +17141,17 @@
       "members": [
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "backing",
           "default": null,
-          "type": "370"
+          "type": "371"
         },
         {
           "name": "encrypt",
           "default": null,
-          "type": "373"
+          "type": "374"
         }
       ],
       "meta-type": "object"
@@ -16138,12 +17161,12 @@
       "members": [
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "backing",
           "default": null,
-          "type": "370"
+          "type": "371"
         }
       ],
       "meta-type": "object"
@@ -16158,7 +17181,7 @@
         },
         {
           "name": "children",
-          "type": "[362]"
+          "type": "[363]"
         },
         {
           "name": "vote-threshold",
@@ -16172,7 +17195,7 @@
         {
           "name": "read-pattern",
           "default": null,
-          "type": "374"
+          "type": "375"
         }
       ],
       "meta-type": "object"
@@ -16182,7 +17205,7 @@
       "members": [
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "offset",
@@ -16226,7 +17249,7 @@
         {
           "name": "auth-client-required",
           "default": null,
-          "type": "[375]"
+          "type": "[376]"
         },
         {
           "name": "key-secret",
@@ -16236,7 +17259,7 @@
         {
           "name": "server",
           "default": null,
-          "type": "[376]"
+          "type": "[377]"
         }
       ],
       "meta-type": "object"
@@ -16246,11 +17269,11 @@
       "members": [
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "mode",
-          "type": "377"
+          "type": "378"
         },
         {
           "name": "top-id",
@@ -16265,7 +17288,7 @@
       "members": [
         {
           "name": "server",
-          "type": "309"
+          "type": "311"
         },
         {
           "name": "vdi",
@@ -16289,7 +17312,7 @@
       "members": [
         {
           "name": "server",
-          "type": "378"
+          "type": "379"
         },
         {
           "name": "path",
@@ -16303,7 +17326,7 @@
         {
           "name": "host-key-check",
           "default": null,
-          "type": "379"
+          "type": "380"
         }
       ],
       "meta-type": "object"
@@ -16317,7 +17340,7 @@
         },
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         }
       ],
       "meta-type": "object"
@@ -16361,7 +17384,7 @@
         },
         {
           "name": "server",
-          "type": "376"
+          "type": "377"
         },
         {
           "name": "tls-creds",
@@ -16377,64 +17400,64 @@
       "variants": [
         {
           "case": "file",
-          "type": "380"
-        },
-        {
-          "case": "gluster",
           "type": "381"
         },
         {
-          "case": "luks",
+          "case": "gluster",
           "type": "382"
         },
         {
-          "case": "nfs",
+          "case": "luks",
           "type": "383"
         },
         {
-          "case": "parallels",
+          "case": "nfs",
           "type": "384"
         },
         {
-          "case": "qcow",
+          "case": "parallels",
           "type": "385"
         },
         {
-          "case": "qcow2",
+          "case": "qcow",
           "type": "386"
         },
         {
-          "case": "qed",
+          "case": "qcow2",
           "type": "387"
         },
         {
-          "case": "rbd",
+          "case": "qed",
           "type": "388"
         },
         {
-          "case": "sheepdog",
+          "case": "rbd",
           "type": "389"
         },
         {
-          "case": "ssh",
+          "case": "sheepdog",
           "type": "390"
         },
         {
-          "case": "vdi",
+          "case": "ssh",
           "type": "391"
         },
         {
-          "case": "vhdx",
+          "case": "vdi",
           "type": "392"
         },
         {
-          "case": "vmdk",
+          "case": "vhdx",
           "type": "393"
         },
         {
-          "case": "vpc",
+          "case": "vmdk",
           "type": "394"
         },
+        {
+          "case": "vpc",
+          "type": "395"
+        },
         {
           "case": "blkdebug",
           "type": "0"
@@ -16584,25 +17607,25 @@
       "variants": [
         {
           "case": "inet",
-          "type": "396"
-        },
-        {
-          "case": "unix",
           "type": "397"
         },
         {
-          "case": "vsock",
+          "case": "unix",
           "type": "398"
         },
         {
-          "case": "fd",
+          "case": "vsock",
           "type": "399"
+        },
+        {
+          "case": "fd",
+          "type": "400"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "395"
+          "type": "396"
         }
       ],
       "meta-type": "object"
@@ -16638,89 +17661,89 @@
       "variants": [
         {
           "case": "file",
-          "type": "401"
+          "type": "402"
         },
         {
           "case": "serial",
-          "type": "402"
-        },
-        {
-          "case": "parallel",
-          "type": "402"
-        },
-        {
-          "case": "pipe",
-          "type": "402"
-        },
-        {
-          "case": "socket",
           "type": "403"
         },
         {
-          "case": "udp",
+          "case": "parallel",
+          "type": "403"
+        },
+        {
+          "case": "pipe",
+          "type": "403"
+        },
+        {
+          "case": "socket",
           "type": "404"
         },
+        {
+          "case": "udp",
+          "type": "405"
+        },
         {
           "case": "pty",
-          "type": "405"
-        },
-        {
-          "case": "null",
-          "type": "405"
-        },
-        {
-          "case": "mux",
           "type": "406"
         },
         {
-          "case": "msmouse",
-          "type": "405"
+          "case": "null",
+          "type": "406"
         },
         {
-          "case": "wctablet",
-          "type": "405"
-        },
-        {
-          "case": "braille",
-          "type": "405"
-        },
-        {
-          "case": "testdev",
-          "type": "405"
-        },
-        {
-          "case": "stdio",
+          "case": "mux",
           "type": "407"
         },
         {
-          "case": "console",
-          "type": "405"
+          "case": "msmouse",
+          "type": "406"
         },
         {
-          "case": "spicevmc",
+          "case": "wctablet",
+          "type": "406"
+        },
+        {
+          "case": "braille",
+          "type": "406"
+        },
+        {
+          "case": "testdev",
+          "type": "406"
+        },
+        {
+          "case": "stdio",
           "type": "408"
         },
         {
-          "case": "spiceport",
+          "case": "console",
+          "type": "406"
+        },
+        {
+          "case": "spicevmc",
           "type": "409"
         },
         {
-          "case": "vc",
+          "case": "spiceport",
           "type": "410"
         },
         {
-          "case": "ringbuf",
+          "case": "vc",
           "type": "411"
         },
+        {
+          "case": "ringbuf",
+          "type": "412"
+        },
         {
           "case": "memory",
-          "type": "411"
+          "type": "412"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "400"
+          "type": "401"
         }
       ],
       "meta-type": "object"
@@ -16728,6 +17751,32 @@
     {
       "name": "280",
       "meta-type": "enum",
+      "values": [
+        "elf",
+        "kdump-zlib",
+        "kdump-lzo",
+        "kdump-snappy",
+        "win-dmp"
+      ]
+    },
+    {
+      "name": "281",
+      "meta-type": "enum",
+      "values": [
+        "none",
+        "active",
+        "completed",
+        "failed"
+      ]
+    },
+    {
+      "name": "[280]",
+      "element-type": "280",
+      "meta-type": "array"
+    },
+    {
+      "name": "282",
+      "meta-type": "enum",
       "values": [
         "normal",
         "none",
@@ -16740,7 +17789,7 @@
       "meta-type": "array"
     },
     {
-      "name": "281",
+      "name": "283",
       "meta-type": "enum",
       "values": [
         "half",
@@ -16748,7 +17797,7 @@
       ]
     },
     {
-      "name": "282",
+      "name": "284",
       "meta-type": "enum",
       "values": [
         "off",
@@ -16756,7 +17805,7 @@
       ]
     },
     {
-      "name": "283",
+      "name": "285",
       "members": [
         {
           "name": "priority",
@@ -16815,7 +17864,7 @@
       "meta-type": "object"
     },
     {
-      "name": "284",
+      "name": "286",
       "members": [
         {
           "name": "in-pport",
@@ -16856,7 +17905,7 @@
       "meta-type": "object"
     },
     {
-      "name": "285",
+      "name": "287",
       "members": [
         {
           "name": "goto-tbl",
@@ -16892,28 +17941,28 @@
       "meta-type": "object"
     },
     {
-      "name": "286",
+      "name": "288",
       "tag": "type",
       "variants": [
         {
           "case": "passthrough",
-          "type": "413"
+          "type": "414"
         },
         {
           "case": "emulator",
-          "type": "414"
+          "type": "415"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "412"
+          "type": "413"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "287",
+      "name": "289",
       "meta-type": "enum",
       "values": [
         "client",
@@ -16922,12 +17971,12 @@
       ]
     },
     {
-      "name": "[288]",
-      "element-type": "288",
+      "name": "[290]",
+      "element-type": "290",
       "meta-type": "array"
     },
     {
-      "name": "288",
+      "name": "290",
       "members": [
         {
           "name": "host",
@@ -16939,7 +17988,7 @@
         },
         {
           "name": "family",
-          "type": "291"
+          "type": "293"
         },
         {
           "name": "connection-id",
@@ -16961,7 +18010,7 @@
       "meta-type": "object"
     },
     {
-      "name": "289",
+      "name": "291",
       "members": [
         {
           "name": "host",
@@ -16973,13 +18022,13 @@
         },
         {
           "name": "family",
-          "type": "291"
+          "type": "293"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "290",
+      "name": "292",
       "members": [
         {
           "name": "host",
@@ -16991,7 +18040,7 @@
         },
         {
           "name": "family",
-          "type": "291"
+          "type": "293"
         },
         {
           "name": "auth",
@@ -17002,7 +18051,7 @@
       "meta-type": "object"
     },
     {
-      "name": "291",
+      "name": "293",
       "meta-type": "enum",
       "values": [
         "ipv4",
@@ -17013,12 +18062,12 @@
       ]
     },
     {
-      "name": "[292]",
-      "element-type": "292",
+      "name": "[294]",
+      "element-type": "294",
       "meta-type": "array"
     },
     {
-      "name": "292",
+      "name": "294",
       "members": [
         {
           "name": "host",
@@ -17030,7 +18079,7 @@
         },
         {
           "name": "family",
-          "type": "291"
+          "type": "293"
         },
         {
           "name": "websocket",
@@ -17050,12 +18099,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[293]",
-      "element-type": "293",
+      "name": "[295]",
+      "element-type": "295",
       "meta-type": "array"
     },
     {
-      "name": "293",
+      "name": "295",
       "members": [
         {
           "name": "host",
@@ -17067,7 +18116,7 @@
         },
         {
           "name": "family",
-          "type": "291"
+          "type": "293"
         },
         {
           "name": "websocket",
@@ -17075,18 +18124,18 @@
         },
         {
           "name": "auth",
-          "type": "294"
+          "type": "296"
         },
         {
           "name": "vencrypt",
           "default": null,
-          "type": "295"
+          "type": "297"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "294",
+      "name": "296",
       "meta-type": "enum",
       "values": [
         "none",
@@ -17101,7 +18150,7 @@
       ]
     },
     {
-      "name": "295",
+      "name": "297",
       "meta-type": "enum",
       "values": [
         "plain",
@@ -17116,7 +18165,7 @@
       ]
     },
     {
-      "name": "296",
+      "name": "298",
       "members": [
         {
           "name": "host",
@@ -17128,7 +18177,7 @@
         },
         {
           "name": "family",
-          "type": "291"
+          "type": "293"
         },
         {
           "name": "websocket",
@@ -17143,7 +18192,7 @@
       "meta-type": "object"
     },
     {
-      "name": "297",
+      "name": "299",
       "members": [
         {
           "name": "host",
@@ -17155,7 +18204,7 @@
         },
         {
           "name": "family",
-          "type": "291"
+          "type": "293"
         },
         {
           "name": "websocket",
@@ -17165,67 +18214,67 @@
       "meta-type": "object"
     },
     {
-      "name": "[298]",
-      "element-type": "298",
+      "name": "[300]",
+      "element-type": "300",
       "meta-type": "array"
     },
     {
-      "name": "298",
+      "name": "300",
       "tag": "type",
       "variants": [
         {
           "case": "number",
-          "type": "416"
+          "type": "417"
         },
         {
           "case": "qcode",
-          "type": "417"
+          "type": "418"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "415"
+          "type": "416"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[299]",
-      "element-type": "299",
+      "name": "[301]",
+      "element-type": "301",
       "meta-type": "array"
     },
     {
-      "name": "299",
+      "name": "301",
       "tag": "type",
       "variants": [
         {
           "case": "key",
-          "type": "419"
-        },
-        {
-          "case": "btn",
           "type": "420"
         },
         {
-          "case": "rel",
+          "case": "btn",
           "type": "421"
         },
+        {
+          "case": "rel",
+          "type": "422"
+        },
         {
           "case": "abs",
-          "type": "421"
+          "type": "422"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "418"
+          "type": "419"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "300",
+      "name": "302",
       "meta-type": "enum",
       "values": [
         "default",
@@ -17239,7 +18288,7 @@
       ]
     },
     {
-      "name": "301",
+      "name": "303",
       "meta-type": "enum",
       "values": [
         "off",
@@ -17249,7 +18298,7 @@
       ]
     },
     {
-      "name": "302",
+      "name": "304",
       "members": [
         {
           "name": "grab-on-hover",
@@ -17265,7 +18314,7 @@
       "meta-type": "object"
     },
     {
-      "name": "303",
+      "name": "305",
       "members": [
         {
           "name": "charset",
@@ -17276,7 +18325,7 @@
       "meta-type": "object"
     },
     {
-      "name": "304",
+      "name": "306",
       "members": [
         {
           "name": "rendernode",
@@ -17287,7 +18336,7 @@
       "meta-type": "object"
     },
     {
-      "name": "305",
+      "name": "307",
       "meta-type": "enum",
       "values": [
         "none",
@@ -17306,7 +18355,7 @@
       ]
     },
     {
-      "name": "306",
+      "name": "308",
       "members": [
         {
           "name": "transferred",
@@ -17368,7 +18417,7 @@
       "meta-type": "object"
     },
     {
-      "name": "307",
+      "name": "309",
       "members": [
         {
           "name": "cache-size",
@@ -17398,7 +18447,7 @@
       "meta-type": "object"
     },
     {
-      "name": "308",
+      "name": "310",
       "members": [
         {
           "name": "pages",
@@ -17424,41 +18473,41 @@
       "meta-type": "object"
     },
     {
-      "name": "[309]",
-      "element-type": "309",
+      "name": "[311]",
+      "element-type": "311",
       "meta-type": "array"
     },
     {
-      "name": "309",
+      "name": "311",
       "tag": "type",
       "variants": [
         {
           "case": "inet",
-          "type": "378"
+          "type": "379"
         },
         {
           "case": "unix",
-          "type": "423"
-        },
-        {
-          "case": "vsock",
           "type": "424"
         },
         {
-          "case": "fd",
+          "case": "vsock",
           "type": "425"
+        },
+        {
+          "case": "fd",
+          "type": "426"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "422"
+          "type": "423"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "310",
+      "name": "312",
       "meta-type": "enum",
       "values": [
         "xbzrle",
@@ -17481,7 +18530,7 @@
       ]
     },
     {
-      "name": "311",
+      "name": "313",
       "meta-type": "enum",
       "values": [
         "none",
@@ -17490,7 +18539,7 @@
       ]
     },
     {
-      "name": "312",
+      "name": "314",
       "meta-type": "enum",
       "values": [
         "none",
@@ -17505,80 +18554,80 @@
       "meta-type": "builtin"
     },
     {
-      "name": "[313]",
-      "element-type": "313",
+      "name": "[315]",
+      "element-type": "315",
       "meta-type": "array"
     },
     {
-      "name": "313",
+      "name": "315",
       "tag": "type",
       "variants": [
         {
           "case": "abort",
-          "type": "427"
-        },
-        {
-          "case": "block-dirty-bitmap-add",
           "type": "428"
         },
+        {
+          "case": "block-dirty-bitmap-add",
+          "type": "429"
+        },
         {
           "case": "block-dirty-bitmap-clear",
-          "type": "429"
-        },
-        {
-          "case": "block-dirty-bitmap-enable",
-          "type": "429"
-        },
-        {
-          "case": "block-dirty-bitmap-disable",
-          "type": "429"
-        },
-        {
-          "case": "block-dirty-bitmap-merge",
           "type": "430"
         },
         {
-          "case": "blockdev-backup",
+          "case": "block-dirty-bitmap-enable",
+          "type": "430"
+        },
+        {
+          "case": "block-dirty-bitmap-disable",
+          "type": "430"
+        },
+        {
+          "case": "block-dirty-bitmap-merge",
           "type": "431"
         },
         {
-          "case": "blockdev-snapshot",
+          "case": "blockdev-backup",
           "type": "432"
         },
         {
-          "case": "blockdev-snapshot-internal-sync",
+          "case": "blockdev-snapshot",
           "type": "433"
         },
         {
-          "case": "blockdev-snapshot-sync",
+          "case": "blockdev-snapshot-internal-sync",
           "type": "434"
         },
         {
-          "case": "drive-backup",
+          "case": "blockdev-snapshot-sync",
           "type": "435"
+        },
+        {
+          "case": "drive-backup",
+          "type": "436"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "426"
+          "type": "427"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "314",
+      "name": "316",
       "members": [
         {
           "name": "completion-mode",
           "default": null,
-          "type": "436"
+          "type": "437"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "315",
+      "name": "317",
       "meta-type": "enum",
       "values": [
         "unavailable",
@@ -17587,7 +18636,7 @@
       ]
     },
     {
-      "name": "316",
+      "name": "318",
       "meta-type": "enum",
       "values": [
         "builtin",
@@ -17600,17 +18649,17 @@
       ]
     },
     {
-      "name": "317",
+      "name": "319",
       "members": [
         {
           "name": "json-type",
-          "type": "437"
+          "type": "438"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "318",
+      "name": "320",
       "members": [
         {
           "name": "values",
@@ -17620,7 +18669,7 @@
       "meta-type": "object"
     },
     {
-      "name": "319",
+      "name": "321",
       "members": [
         {
           "name": "element-type",
@@ -17630,11 +18679,11 @@
       "meta-type": "object"
     },
     {
-      "name": "320",
+      "name": "322",
       "members": [
         {
           "name": "members",
-          "type": "[438]"
+          "type": "[439]"
         },
         {
           "name": "tag",
@@ -17644,7 +18693,7 @@
         {
           "name": "variants",
           "default": null,
-          "type": "[439]"
+          "type": "[440]"
         },
         {
           "name": "features",
@@ -17655,17 +18704,17 @@
       "meta-type": "object"
     },
     {
-      "name": "321",
+      "name": "323",
       "members": [
         {
           "name": "members",
-          "type": "[440]"
+          "type": "[441]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "322",
+      "name": "324",
       "members": [
         {
           "name": "arg-type",
@@ -17684,7 +18733,7 @@
       "meta-type": "object"
     },
     {
-      "name": "323",
+      "name": "325",
       "members": [
         {
           "name": "arg-type",
@@ -17693,36 +18742,6 @@
       ],
       "meta-type": "object"
     },
-    {
-      "name": "[324]",
-      "element-type": "324",
-      "meta-type": "array"
-    },
-    {
-      "name": "324",
-      "meta-type": "enum",
-      "values": [
-        "oob"
-      ]
-    },
-    {
-      "name": "325",
-      "members": [
-        {
-          "name": "major",
-          "type": "int"
-        },
-        {
-          "name": "minor",
-          "type": "int"
-        },
-        {
-          "name": "micro",
-          "type": "int"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "326",
       "members": [
@@ -17736,6 +18755,11 @@
           "default": null,
           "type": "int"
         },
+        {
+          "name": "die-id",
+          "default": null,
+          "type": "int"
+        },
         {
           "name": "core-id",
           "default": null,
@@ -17822,7 +18846,7 @@
       "members": [
         {
           "name": "cpu-state",
-          "type": "441"
+          "type": "442"
         }
       ],
       "meta-type": "object"
@@ -17874,132 +18898,8 @@
         "xtensaeb"
       ]
     },
-    {
-      "name": "[336]",
-      "element-type": "336",
-      "meta-type": "array"
-    },
     {
       "name": "336",
-      "members": [
-        {
-          "name": "bus",
-          "type": "int"
-        },
-        {
-          "name": "slot",
-          "type": "int"
-        },
-        {
-          "name": "function",
-          "type": "int"
-        },
-        {
-          "name": "class_info",
-          "type": "442"
-        },
-        {
-          "name": "id",
-          "type": "443"
-        },
-        {
-          "name": "irq",
-          "default": null,
-          "type": "int"
-        },
-        {
-          "name": "qdev_id",
-          "type": "str"
-        },
-        {
-          "name": "pci_bridge",
-          "default": null,
-          "type": "444"
-        },
-        {
-          "name": "regions",
-          "type": "[445]"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "337",
-      "meta-type": "enum",
-      "values": [
-        "elf",
-        "kdump-zlib",
-        "kdump-lzo",
-        "kdump-snappy",
-        "win-dmp"
-      ]
-    },
-    {
-      "name": "338",
-      "meta-type": "enum",
-      "values": [
-        "none",
-        "active",
-        "completed",
-        "failed"
-      ]
-    },
-    {
-      "name": "[337]",
-      "element-type": "337",
-      "meta-type": "array"
-    },
-    {
-      "name": "[339]",
-      "element-type": "339",
-      "meta-type": "array"
-    },
-    {
-      "name": "339",
-      "members": [
-        {
-          "name": "fd",
-          "type": "int"
-        },
-        {
-          "name": "opaque",
-          "default": null,
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "[340]",
-      "element-type": "340",
-      "meta-type": "array"
-    },
-    {
-      "name": "340",
-      "members": [
-        {
-          "name": "name",
-          "type": "str"
-        },
-        {
-          "name": "type",
-          "type": "446"
-        },
-        {
-          "name": "help",
-          "default": null,
-          "type": "str"
-        },
-        {
-          "name": "default",
-          "default": null,
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "341",
       "meta-type": "enum",
       "values": [
         "default",
@@ -18009,33 +18909,7 @@
       ]
     },
     {
-      "name": "342",
-      "meta-type": "enum",
-      "values": [
-        "dimm",
-        "nvdimm"
-      ]
-    },
-    {
-      "name": "343",
-      "members": [
-        {
-          "name": "data",
-          "type": "447"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "344",
-      "meta-type": "enum",
-      "values": [
-        "DIMM",
-        "CPU"
-      ]
-    },
-    {
-      "name": "345",
+      "name": "337",
       "meta-type": "enum",
       "values": [
         "node",
@@ -18044,7 +18918,7 @@
       ]
     },
     {
-      "name": "346",
+      "name": "338",
       "members": [
         {
           "name": "nodeid",
@@ -18070,7 +18944,7 @@
       "meta-type": "object"
     },
     {
-      "name": "347",
+      "name": "339",
       "members": [
         {
           "name": "src",
@@ -18088,7 +18962,7 @@
       "meta-type": "object"
     },
     {
-      "name": "348",
+      "name": "340",
       "members": [
         {
           "name": "node-id",
@@ -18100,6 +18974,11 @@
           "default": null,
           "type": "int"
         },
+        {
+          "name": "die-id",
+          "default": null,
+          "type": "int"
+        },
         {
           "name": "core-id",
           "default": null,
@@ -18114,19 +18993,7 @@
       "meta-type": "object"
     },
     {
-      "name": "349",
-      "meta-type": "enum",
-      "values": [
-        "uninit",
-        "launch-update",
-        "launch-secret",
-        "running",
-        "send-update",
-        "receive-update"
-      ]
-    },
-    {
-      "name": "350",
+      "name": "341",
       "members": [
         {
           "name": "name",
@@ -18141,7 +19008,7 @@
       "meta-type": "object"
     },
     {
-      "name": "351",
+      "name": "342",
       "meta-type": "enum",
       "values": [
         "incompatible",
@@ -18151,23 +19018,200 @@
       ]
     },
     {
-      "name": "352",
+      "name": "343",
       "meta-type": "enum",
       "values": [
         "static",
         "full"
       ]
     },
+    {
+      "name": "[344]",
+      "element-type": "344",
+      "meta-type": "array"
+    },
+    {
+      "name": "344",
+      "meta-type": "enum",
+      "values": [
+        "oob"
+      ]
+    },
+    {
+      "name": "345",
+      "members": [
+        {
+          "name": "major",
+          "type": "int"
+        },
+        {
+          "name": "minor",
+          "type": "int"
+        },
+        {
+          "name": "micro",
+          "type": "int"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "[346]",
+      "element-type": "346",
+      "meta-type": "array"
+    },
+    {
+      "name": "346",
+      "members": [
+        {
+          "name": "bus",
+          "type": "int"
+        },
+        {
+          "name": "slot",
+          "type": "int"
+        },
+        {
+          "name": "function",
+          "type": "int"
+        },
+        {
+          "name": "class_info",
+          "type": "443"
+        },
+        {
+          "name": "id",
+          "type": "444"
+        },
+        {
+          "name": "irq",
+          "default": null,
+          "type": "int"
+        },
+        {
+          "name": "qdev_id",
+          "type": "str"
+        },
+        {
+          "name": "pci_bridge",
+          "default": null,
+          "type": "445"
+        },
+        {
+          "name": "regions",
+          "type": "[446]"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "[347]",
+      "element-type": "347",
+      "meta-type": "array"
+    },
+    {
+      "name": "347",
+      "members": [
+        {
+          "name": "fd",
+          "type": "int"
+        },
+        {
+          "name": "opaque",
+          "default": null,
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "[348]",
+      "element-type": "348",
+      "meta-type": "array"
+    },
+    {
+      "name": "348",
+      "members": [
+        {
+          "name": "name",
+          "type": "str"
+        },
+        {
+          "name": "type",
+          "type": "447"
+        },
+        {
+          "name": "help",
+          "default": null,
+          "type": "str"
+        },
+        {
+          "name": "default",
+          "default": null,
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "349",
+      "meta-type": "enum",
+      "values": [
+        "dimm",
+        "nvdimm",
+        "virtio-pmem"
+      ]
+    },
+    {
+      "name": "350",
+      "members": [
+        {
+          "name": "data",
+          "type": "448"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "351",
+      "members": [
+        {
+          "name": "data",
+          "type": "449"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "352",
+      "meta-type": "enum",
+      "values": [
+        "DIMM",
+        "CPU"
+      ]
+    },
     {
       "name": "353",
       "meta-type": "enum",
+      "values": [
+        "uninit",
+        "launch-update",
+        "launch-secret",
+        "running",
+        "send-update",
+        "receive-update"
+      ]
+    },
+    {
+      "name": "354",
+      "meta-type": "enum",
       "values": [
         "hyper-v",
         "s390"
       ]
     },
     {
-      "name": "354",
+      "name": "355",
       "members": [
         {
           "name": "arg1",
@@ -18193,7 +19237,7 @@
       "meta-type": "object"
     },
     {
-      "name": "355",
+      "name": "356",
       "members": [
         {
           "name": "core",
@@ -18209,13 +19253,13 @@
         },
         {
           "name": "reason",
-          "type": "448"
+          "type": "450"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "356",
+      "name": "357",
       "meta-type": "enum",
       "values": [
         "active",
@@ -18226,12 +19270,12 @@
       ]
     },
     {
-      "name": "[357]",
-      "element-type": "357",
+      "name": "[358]",
+      "element-type": "358",
       "meta-type": "array"
     },
     {
-      "name": "357",
+      "name": "358",
       "members": [
         {
           "name": "interval_length",
@@ -18285,7 +19329,7 @@
       "meta-type": "object"
     },
     {
-      "name": "358",
+      "name": "359",
       "members": [
         {
           "name": "boundaries",
@@ -18304,32 +19348,32 @@
       "meta-type": "array"
     },
     {
-      "name": "359",
+      "name": "360",
       "tag": "type",
       "variants": [
         {
           "case": "qcow2",
-          "type": "450"
+          "type": "452"
         },
         {
           "case": "vmdk",
-          "type": "451"
+          "type": "453"
         },
         {
           "case": "luks",
-          "type": "452"
+          "type": "454"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "449"
+          "type": "451"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "360",
+      "name": "361",
       "meta-type": "enum",
       "values": [
         "block-backend",
@@ -18338,12 +19382,12 @@
       ]
     },
     {
-      "name": "[361]",
-      "element-type": "361",
+      "name": "[362]",
+      "element-type": "362",
       "meta-type": "array"
     },
     {
-      "name": "361",
+      "name": "362",
       "meta-type": "enum",
       "values": [
         "consistent-read",
@@ -18354,7 +19398,7 @@
       ]
     },
     {
-      "name": "362",
+      "name": "363",
       "members": [
         {
           "type": "45"
@@ -18366,16 +19410,16 @@
       "meta-type": "alternate"
     },
     {
-      "name": "[363]",
-      "element-type": "363",
+      "name": "[364]",
+      "element-type": "364",
       "meta-type": "array"
     },
     {
-      "name": "363",
+      "name": "364",
       "members": [
         {
           "name": "event",
-          "type": "453"
+          "type": "455"
         },
         {
           "name": "state",
@@ -18385,7 +19429,7 @@
         {
           "name": "iotype",
           "default": null,
-          "type": "454"
+          "type": "456"
         },
         {
           "name": "errno",
@@ -18411,16 +19455,16 @@
       "meta-type": "object"
     },
     {
-      "name": "[364]",
-      "element-type": "364",
+      "name": "[365]",
+      "element-type": "365",
       "meta-type": "array"
     },
     {
-      "name": "364",
+      "name": "365",
       "members": [
         {
           "name": "event",
-          "type": "453"
+          "type": "455"
         },
         {
           "name": "state",
@@ -18435,7 +19479,7 @@
       "meta-type": "object"
     },
     {
-      "name": "365",
+      "name": "366",
       "meta-type": "enum",
       "values": [
         "auto",
@@ -18444,7 +19488,7 @@
       ]
     },
     {
-      "name": "366",
+      "name": "367",
       "meta-type": "enum",
       "values": [
         "threads",
@@ -18452,7 +19496,7 @@
       ]
     },
     {
-      "name": "367",
+      "name": "368",
       "meta-type": "enum",
       "values": [
         "tcp",
@@ -18460,7 +19504,7 @@
       ]
     },
     {
-      "name": "368",
+      "name": "369",
       "meta-type": "enum",
       "values": [
         "crc32c",
@@ -18470,11 +19514,11 @@
       ]
     },
     {
-      "name": "369",
+      "name": "370",
       "members": [
         {
           "name": "type",
-          "type": "455"
+          "type": "457"
         },
         {
           "name": "host",
@@ -18484,7 +19528,7 @@
       "meta-type": "object"
     },
     {
-      "name": "370",
+      "name": "371",
       "members": [
         {
           "type": "45"
@@ -18499,79 +19543,66 @@
       "meta-type": "alternate"
     },
     {
-      "name": "371",
+      "name": "372",
       "members": [
         {
-          "type": "456"
+          "type": "458"
         },
         {
-          "type": "457"
+          "type": "459"
         }
       ],
       "meta-type": "alternate"
     },
-    {
-      "name": "372",
-      "tag": "format",
-      "variants": [
-        {
-          "case": "aes",
-          "type": "459"
-        },
-        {
-          "case": "luks",
-          "type": "460"
-        }
-      ],
-      "members": [
-        {
-          "name": "format",
-          "type": "458"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "373",
       "tag": "format",
       "variants": [
         {
           "case": "aes",
-          "type": "459"
+          "type": "461"
+        },
+        {
+          "case": "luks",
+          "type": "462"
         }
       ],
       "members": [
         {
           "name": "format",
-          "type": "461"
+          "type": "460"
         }
       ],
       "meta-type": "object"
     },
-    {
-      "name": "[362]",
-      "element-type": "362",
-      "meta-type": "array"
-    },
     {
       "name": "374",
-      "meta-type": "enum",
-      "values": [
-        "quorum",
-        "fifo"
-      ]
+      "tag": "format",
+      "variants": [
+        {
+          "case": "aes",
+          "type": "461"
+        }
+      ],
+      "members": [
+        {
+          "name": "format",
+          "type": "463"
+        }
+      ],
+      "meta-type": "object"
     },
     {
-      "name": "[375]",
-      "element-type": "375",
+      "name": "[363]",
+      "element-type": "363",
       "meta-type": "array"
     },
     {
       "name": "375",
       "meta-type": "enum",
       "values": [
-        "cephx",
-        "none"
+        "quorum",
+        "fifo"
       ]
     },
     {
@@ -18581,6 +19612,19 @@
     },
     {
       "name": "376",
+      "meta-type": "enum",
+      "values": [
+        "cephx",
+        "none"
+      ]
+    },
+    {
+      "name": "[377]",
+      "element-type": "377",
+      "meta-type": "array"
+    },
+    {
+      "name": "377",
       "members": [
         {
           "name": "host",
@@ -18594,7 +19638,7 @@
       "meta-type": "object"
     },
     {
-      "name": "377",
+      "name": "378",
       "meta-type": "enum",
       "values": [
         "primary",
@@ -18602,7 +19646,7 @@
       ]
     },
     {
-      "name": "378",
+      "name": "379",
       "members": [
         {
           "name": "host",
@@ -18636,12 +19680,12 @@
       "meta-type": "object"
     },
     {
-      "name": "379",
+      "name": "380",
       "tag": "mode",
       "variants": [
         {
           "case": "hash",
-          "type": "463"
+          "type": "465"
         },
         {
           "case": "none",
@@ -18655,13 +19699,13 @@
       "members": [
         {
           "name": "mode",
-          "type": "462"
+          "type": "464"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "380",
+      "name": "381",
       "members": [
         {
           "name": "filename",
@@ -18674,7 +19718,7 @@
         {
           "name": "preallocation",
           "default": null,
-          "type": "464"
+          "type": "466"
         },
         {
           "name": "nocow",
@@ -18685,7 +19729,7 @@
       "meta-type": "object"
     },
     {
-      "name": "381",
+      "name": "382",
       "members": [
         {
           "name": "location",
@@ -18698,13 +19742,13 @@
         {
           "name": "preallocation",
           "default": null,
-          "type": "464"
+          "type": "466"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "382",
+      "name": "383",
       "members": [
         {
           "name": "key-secret",
@@ -18714,27 +19758,27 @@
         {
           "name": "cipher-alg",
           "default": null,
-          "type": "465"
+          "type": "467"
         },
         {
           "name": "cipher-mode",
           "default": null,
-          "type": "466"
+          "type": "468"
         },
         {
           "name": "ivgen-alg",
           "default": null,
-          "type": "467"
+          "type": "469"
         },
         {
           "name": "ivgen-hash-alg",
           "default": null,
-          "type": "468"
+          "type": "470"
         },
         {
           "name": "hash-alg",
           "default": null,
-          "type": "468"
+          "type": "470"
         },
         {
           "name": "iter-time",
@@ -18743,7 +19787,7 @@
         },
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "size",
@@ -18753,7 +19797,7 @@
       "meta-type": "object"
     },
     {
-      "name": "383",
+      "name": "384",
       "members": [
         {
           "name": "location",
@@ -18767,11 +19811,11 @@
       "meta-type": "object"
     },
     {
-      "name": "384",
+      "name": "385",
       "members": [
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "size",
@@ -18786,11 +19830,11 @@
       "meta-type": "object"
     },
     {
-      "name": "385",
+      "name": "386",
       "members": [
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "size",
@@ -18804,22 +19848,22 @@
         {
           "name": "encrypt",
           "default": null,
-          "type": "469"
+          "type": "471"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "386",
+      "name": "387",
       "members": [
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "data-file",
           "default": null,
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "data-file-raw",
@@ -18833,7 +19877,7 @@
         {
           "name": "version",
           "default": null,
-          "type": "470"
+          "type": "472"
         },
         {
           "name": "backing-file",
@@ -18848,7 +19892,7 @@
         {
           "name": "encrypt",
           "default": null,
-          "type": "469"
+          "type": "471"
         },
         {
           "name": "cluster-size",
@@ -18858,7 +19902,7 @@
         {
           "name": "preallocation",
           "default": null,
-          "type": "464"
+          "type": "466"
         },
         {
           "name": "lazy-refcounts",
@@ -18874,11 +19918,11 @@
       "meta-type": "object"
     },
     {
-      "name": "387",
+      "name": "388",
       "members": [
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "size",
@@ -18908,7 +19952,7 @@
       "meta-type": "object"
     },
     {
-      "name": "388",
+      "name": "389",
       "members": [
         {
           "name": "location",
@@ -18927,7 +19971,7 @@
       "meta-type": "object"
     },
     {
-      "name": "389",
+      "name": "390",
       "members": [
         {
           "name": "location",
@@ -18945,12 +19989,12 @@
         {
           "name": "preallocation",
           "default": null,
-          "type": "464"
+          "type": "466"
         },
         {
           "name": "redundancy",
           "default": null,
-          "type": "471"
+          "type": "473"
         },
         {
           "name": "object-size",
@@ -18961,7 +20005,7 @@
       "meta-type": "object"
     },
     {
-      "name": "390",
+      "name": "391",
       "members": [
         {
           "name": "location",
@@ -18975,11 +20019,11 @@
       "meta-type": "object"
     },
     {
-      "name": "391",
+      "name": "392",
       "members": [
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "size",
@@ -18988,17 +20032,17 @@
         {
           "name": "preallocation",
           "default": null,
-          "type": "464"
+          "type": "466"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "392",
+      "name": "393",
       "members": [
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "size",
@@ -19017,7 +20061,7 @@
         {
           "name": "subformat",
           "default": null,
-          "type": "472"
+          "type": "474"
         },
         {
           "name": "block-state-zero",
@@ -19028,11 +20072,11 @@
       "meta-type": "object"
     },
     {
-      "name": "393",
+      "name": "394",
       "members": [
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "size",
@@ -19041,12 +20085,12 @@
         {
           "name": "extents",
           "default": null,
-          "type": "[362]"
+          "type": "[363]"
         },
         {
           "name": "subformat",
           "default": null,
-          "type": "473"
+          "type": "475"
         },
         {
           "name": "backing-file",
@@ -19056,7 +20100,7 @@
         {
           "name": "adapter-type",
           "default": null,
-          "type": "474"
+          "type": "476"
         },
         {
           "name": "hwversion",
@@ -19072,11 +20116,11 @@
       "meta-type": "object"
     },
     {
-      "name": "394",
+      "name": "395",
       "members": [
         {
           "name": "file",
-          "type": "362"
+          "type": "363"
         },
         {
           "name": "size",
@@ -19085,7 +20129,7 @@
         {
           "name": "subformat",
           "default": null,
-          "type": "475"
+          "type": "477"
         },
         {
           "name": "force-size",
@@ -19101,7 +20145,7 @@
       "meta-type": "builtin"
     },
     {
-      "name": "395",
+      "name": "396",
       "meta-type": "enum",
       "values": [
         "inet",
@@ -19110,22 +20154,12 @@
         "fd"
       ]
     },
-    {
-      "name": "396",
-      "members": [
-        {
-          "name": "data",
-          "type": "378"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "397",
       "members": [
         {
           "name": "data",
-          "type": "423"
+          "type": "379"
         }
       ],
       "meta-type": "object"
@@ -19152,6 +20186,16 @@
     },
     {
       "name": "400",
+      "members": [
+        {
+          "name": "data",
+          "type": "426"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "401",
       "meta-type": "enum",
       "values": [
         "file",
@@ -19176,28 +20220,8 @@
         "memory"
       ]
     },
-    {
-      "name": "401",
-      "members": [
-        {
-          "name": "data",
-          "type": "476"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "402",
-      "members": [
-        {
-          "name": "data",
-          "type": "477"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "403",
       "members": [
         {
           "name": "data",
@@ -19207,7 +20231,7 @@
       "meta-type": "object"
     },
     {
-      "name": "404",
+      "name": "403",
       "members": [
         {
           "name": "data",
@@ -19217,7 +20241,7 @@
       "meta-type": "object"
     },
     {
-      "name": "405",
+      "name": "404",
       "members": [
         {
           "name": "data",
@@ -19227,7 +20251,7 @@
       "meta-type": "object"
     },
     {
-      "name": "406",
+      "name": "405",
       "members": [
         {
           "name": "data",
@@ -19237,7 +20261,7 @@
       "meta-type": "object"
     },
     {
-      "name": "407",
+      "name": "406",
       "members": [
         {
           "name": "data",
@@ -19247,7 +20271,7 @@
       "meta-type": "object"
     },
     {
-      "name": "408",
+      "name": "407",
       "members": [
         {
           "name": "data",
@@ -19257,7 +20281,7 @@
       "meta-type": "object"
     },
     {
-      "name": "409",
+      "name": "408",
       "members": [
         {
           "name": "data",
@@ -19267,7 +20291,7 @@
       "meta-type": "object"
     },
     {
-      "name": "410",
+      "name": "409",
       "members": [
         {
           "name": "data",
@@ -19277,7 +20301,7 @@
       "meta-type": "object"
     },
     {
-      "name": "411",
+      "name": "410",
       "members": [
         {
           "name": "data",
@@ -19287,15 +20311,7 @@
       "meta-type": "object"
     },
     {
-      "name": "412",
-      "meta-type": "enum",
-      "values": [
-        "passthrough",
-        "emulator"
-      ]
-    },
-    {
-      "name": "413",
+      "name": "411",
       "members": [
         {
           "name": "data",
@@ -19305,7 +20321,7 @@
       "meta-type": "object"
     },
     {
-      "name": "414",
+      "name": "412",
       "members": [
         {
           "name": "data",
@@ -19315,25 +20331,15 @@
       "meta-type": "object"
     },
     {
-      "name": "415",
+      "name": "413",
       "meta-type": "enum",
       "values": [
-        "number",
-        "qcode"
+        "passthrough",
+        "emulator"
       ]
     },
     {
-      "name": "416",
-      "members": [
-        {
-          "name": "data",
-          "type": "int"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "417",
+      "name": "414",
       "members": [
         {
           "name": "data",
@@ -19343,17 +20349,7 @@
       "meta-type": "object"
     },
     {
-      "name": "418",
-      "meta-type": "enum",
-      "values": [
-        "key",
-        "btn",
-        "rel",
-        "abs"
-      ]
-    },
-    {
-      "name": "419",
+      "name": "415",
       "members": [
         {
           "name": "data",
@@ -19363,7 +20359,25 @@
       "meta-type": "object"
     },
     {
-      "name": "420",
+      "name": "416",
+      "meta-type": "enum",
+      "values": [
+        "number",
+        "qcode"
+      ]
+    },
+    {
+      "name": "417",
+      "members": [
+        {
+          "name": "data",
+          "type": "int"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "418",
       "members": [
         {
           "name": "data",
@@ -19373,7 +20387,17 @@
       "meta-type": "object"
     },
     {
-      "name": "421",
+      "name": "419",
+      "meta-type": "enum",
+      "values": [
+        "key",
+        "btn",
+        "rel",
+        "abs"
+      ]
+    },
+    {
+      "name": "420",
       "members": [
         {
           "name": "data",
@@ -19382,8 +20406,28 @@
       ],
       "meta-type": "object"
     },
+    {
+      "name": "421",
+      "members": [
+        {
+          "name": "data",
+          "type": "493"
+        }
+      ],
+      "meta-type": "object"
+    },
     {
       "name": "422",
+      "members": [
+        {
+          "name": "data",
+          "type": "494"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "423",
       "meta-type": "enum",
       "values": [
         "inet",
@@ -19393,7 +20437,7 @@
       ]
     },
     {
-      "name": "423",
+      "name": "424",
       "members": [
         {
           "name": "path",
@@ -19403,7 +20447,7 @@
       "meta-type": "object"
     },
     {
-      "name": "424",
+      "name": "425",
       "members": [
         {
           "name": "cid",
@@ -19417,7 +20461,7 @@
       "meta-type": "object"
     },
     {
-      "name": "425",
+      "name": "426",
       "members": [
         {
           "name": "str",
@@ -19427,7 +20471,7 @@
       "meta-type": "object"
     },
     {
-      "name": "426",
+      "name": "427",
       "meta-type": "enum",
       "values": [
         "abort",
@@ -19443,22 +20487,12 @@
         "drive-backup"
       ]
     },
-    {
-      "name": "427",
-      "members": [
-        {
-          "name": "data",
-          "type": "493"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "428",
       "members": [
         {
           "name": "data",
-          "type": "31"
+          "type": "495"
         }
       ],
       "meta-type": "object"
@@ -19468,7 +20502,7 @@
       "members": [
         {
           "name": "data",
-          "type": "32"
+          "type": "31"
         }
       ],
       "meta-type": "object"
@@ -19478,7 +20512,7 @@
       "members": [
         {
           "name": "data",
-          "type": "33"
+          "type": "32"
         }
       ],
       "meta-type": "object"
@@ -19488,7 +20522,7 @@
       "members": [
         {
           "name": "data",
-          "type": "27"
+          "type": "33"
         }
       ],
       "meta-type": "object"
@@ -19498,7 +20532,7 @@
       "members": [
         {
           "name": "data",
-          "type": "23"
+          "type": "27"
         }
       ],
       "meta-type": "object"
@@ -19508,7 +20542,7 @@
       "members": [
         {
           "name": "data",
-          "type": "65"
+          "type": "23"
         }
       ],
       "meta-type": "object"
@@ -19518,7 +20552,7 @@
       "members": [
         {
           "name": "data",
-          "type": "22"
+          "type": "65"
         }
       ],
       "meta-type": "object"
@@ -19528,13 +20562,23 @@
       "members": [
         {
           "name": "data",
-          "type": "26"
+          "type": "22"
         }
       ],
       "meta-type": "object"
     },
     {
       "name": "436",
+      "members": [
+        {
+          "name": "data",
+          "type": "26"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "437",
       "meta-type": "enum",
       "values": [
         "individual",
@@ -19542,7 +20586,7 @@
       ]
     },
     {
-      "name": "437",
+      "name": "438",
       "meta-type": "enum",
       "values": [
         "string",
@@ -19556,12 +20600,12 @@
       ]
     },
     {
-      "name": "[438]",
-      "element-type": "438",
+      "name": "[439]",
+      "element-type": "439",
       "meta-type": "array"
     },
     {
-      "name": "438",
+      "name": "439",
       "members": [
         {
           "name": "name",
@@ -19580,12 +20624,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[439]",
-      "element-type": "439",
+      "name": "[440]",
+      "element-type": "440",
       "meta-type": "array"
     },
     {
-      "name": "439",
+      "name": "440",
       "members": [
         {
           "name": "case",
@@ -19599,12 +20643,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[440]",
-      "element-type": "440",
+      "name": "[441]",
+      "element-type": "441",
       "meta-type": "array"
     },
     {
-      "name": "440",
+      "name": "441",
       "members": [
         {
           "name": "type",
@@ -19614,7 +20658,7 @@
       "meta-type": "object"
     },
     {
-      "name": "441",
+      "name": "442",
       "meta-type": "enum",
       "values": [
         "uninitialized",
@@ -19625,7 +20669,7 @@
       ]
     },
     {
-      "name": "442",
+      "name": "443",
       "members": [
         {
           "name": "desc",
@@ -19640,7 +20684,7 @@
       "meta-type": "object"
     },
     {
-      "name": "443",
+      "name": "444",
       "members": [
         {
           "name": "device",
@@ -19664,27 +20708,27 @@
       "meta-type": "object"
     },
     {
-      "name": "444",
+      "name": "445",
       "members": [
         {
           "name": "bus",
-          "type": "494"
+          "type": "496"
         },
         {
           "name": "devices",
           "default": null,
-          "type": "[336]"
+          "type": "[346]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[445]",
-      "element-type": "445",
+      "name": "[446]",
+      "element-type": "446",
       "meta-type": "array"
     },
     {
-      "name": "445",
+      "name": "446",
       "members": [
         {
           "name": "bar",
@@ -19716,7 +20760,7 @@
       "meta-type": "object"
     },
     {
-      "name": "446",
+      "name": "447",
       "meta-type": "enum",
       "values": [
         "string",
@@ -19726,7 +20770,7 @@
       ]
     },
     {
-      "name": "447",
+      "name": "448",
       "members": [
         {
           "name": "id",
@@ -19765,7 +20809,30 @@
       "meta-type": "object"
     },
     {
-      "name": "448",
+      "name": "449",
+      "members": [
+        {
+          "name": "id",
+          "default": null,
+          "type": "str"
+        },
+        {
+          "name": "memaddr",
+          "type": "int"
+        },
+        {
+          "name": "size",
+          "type": "int"
+        },
+        {
+          "name": "memdev",
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "450",
       "meta-type": "enum",
       "values": [
         "unknown",
@@ -19776,7 +20843,7 @@
       ]
     },
     {
-      "name": "449",
+      "name": "451",
       "meta-type": "enum",
       "values": [
         "qcow2",
@@ -19784,26 +20851,6 @@
         "luks"
       ]
     },
-    {
-      "name": "450",
-      "members": [
-        {
-          "name": "data",
-          "type": "495"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "451",
-      "members": [
-        {
-          "name": "data",
-          "type": "496"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "452",
       "members": [
@@ -19816,6 +20863,26 @@
     },
     {
       "name": "453",
+      "members": [
+        {
+          "name": "data",
+          "type": "498"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "454",
+      "members": [
+        {
+          "name": "data",
+          "type": "499"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "455",
       "meta-type": "enum",
       "values": [
         "l1_update",
@@ -19869,7 +20936,7 @@
       ]
     },
     {
-      "name": "454",
+      "name": "456",
       "meta-type": "enum",
       "values": [
         "read",
@@ -19881,19 +20948,19 @@
       ]
     },
     {
-      "name": "455",
+      "name": "457",
       "meta-type": "enum",
       "values": [
         "inet"
       ]
     },
     {
-      "name": "456",
+      "name": "458",
       "members": [
         {
           "name": "template",
           "default": null,
-          "type": "457"
+          "type": "459"
         },
         {
           "name": "main-header",
@@ -19944,7 +21011,7 @@
       "meta-type": "object"
     },
     {
-      "name": "457",
+      "name": "459",
       "meta-type": "enum",
       "values": [
         "none",
@@ -19954,44 +21021,44 @@
       ]
     },
     {
-      "name": "458",
+      "name": "460",
       "meta-type": "enum",
       "values": [
         "aes",
         "luks"
       ]
     },
-    {
-      "name": "459",
-      "members": [
-        {
-          "name": "key-secret",
-          "default": null,
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "460",
-      "members": [
-        {
-          "name": "key-secret",
-          "default": null,
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "461",
+      "members": [
+        {
+          "name": "key-secret",
+          "default": null,
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "462",
+      "members": [
+        {
+          "name": "key-secret",
+          "default": null,
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "463",
       "meta-type": "enum",
       "values": [
         "aes"
       ]
     },
     {
-      "name": "462",
+      "name": "464",
       "meta-type": "enum",
       "values": [
         "none",
@@ -20000,11 +21067,11 @@
       ]
     },
     {
-      "name": "463",
+      "name": "465",
       "members": [
         {
           "name": "type",
-          "type": "498"
+          "type": "500"
         },
         {
           "name": "hash",
@@ -20014,7 +21081,7 @@
       "meta-type": "object"
     },
     {
-      "name": "464",
+      "name": "466",
       "meta-type": "enum",
       "values": [
         "off",
@@ -20024,7 +21091,7 @@
       ]
     },
     {
-      "name": "465",
+      "name": "467",
       "meta-type": "enum",
       "values": [
         "aes-128",
@@ -20042,7 +21109,7 @@
       ]
     },
     {
-      "name": "466",
+      "name": "468",
       "meta-type": "enum",
       "values": [
         "ecb",
@@ -20052,7 +21119,7 @@
       ]
     },
     {
-      "name": "467",
+      "name": "469",
       "meta-type": "enum",
       "values": [
         "plain",
@@ -20061,7 +21128,7 @@
       ]
     },
     {
-      "name": "468",
+      "name": "470",
       "meta-type": "enum",
       "values": [
         "md5",
@@ -20074,50 +21141,21 @@
       ]
     },
     {
-      "name": "469",
+      "name": "471",
       "tag": "format",
       "variants": [
         {
           "case": "qcow",
-          "type": "459"
+          "type": "461"
         },
         {
           "case": "luks",
-          "type": "500"
+          "type": "502"
         }
       ],
       "members": [
         {
           "name": "format",
-          "type": "499"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "470",
-      "meta-type": "enum",
-      "values": [
-        "v2",
-        "v3"
-      ]
-    },
-    {
-      "name": "471",
-      "tag": "type",
-      "variants": [
-        {
-          "case": "full",
-          "type": "502"
-        },
-        {
-          "case": "erasure-coded",
-          "type": "503"
-        }
-      ],
-      "members": [
-        {
-          "name": "type",
           "type": "501"
         }
       ],
@@ -20126,13 +21164,42 @@
     {
       "name": "472",
       "meta-type": "enum",
+      "values": [
+        "v2",
+        "v3"
+      ]
+    },
+    {
+      "name": "473",
+      "tag": "type",
+      "variants": [
+        {
+          "case": "full",
+          "type": "504"
+        },
+        {
+          "case": "erasure-coded",
+          "type": "505"
+        }
+      ],
+      "members": [
+        {
+          "name": "type",
+          "type": "503"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "474",
+      "meta-type": "enum",
       "values": [
         "dynamic",
         "fixed"
       ]
     },
     {
-      "name": "473",
+      "name": "475",
       "meta-type": "enum",
       "values": [
         "monolithicSparse",
@@ -20143,7 +21210,7 @@
       ]
     },
     {
-      "name": "474",
+      "name": "476",
       "meta-type": "enum",
       "values": [
         "ide",
@@ -20153,7 +21220,7 @@
       ]
     },
     {
-      "name": "475",
+      "name": "477",
       "meta-type": "enum",
       "values": [
         "dynamic",
@@ -20161,7 +21228,7 @@
       ]
     },
     {
-      "name": "476",
+      "name": "478",
       "members": [
         {
           "name": "logfile",
@@ -20191,7 +21258,7 @@
       "meta-type": "object"
     },
     {
-      "name": "477",
+      "name": "479",
       "members": [
         {
           "name": "logfile",
@@ -20211,7 +21278,7 @@
       "meta-type": "object"
     },
     {
-      "name": "478",
+      "name": "480",
       "members": [
         {
           "name": "logfile",
@@ -20276,7 +21343,7 @@
       "meta-type": "object"
     },
     {
-      "name": "479",
+      "name": "481",
       "members": [
         {
           "name": "logfile",
@@ -20300,42 +21367,6 @@
       ],
       "meta-type": "object"
     },
-    {
-      "name": "480",
-      "members": [
-        {
-          "name": "logfile",
-          "default": null,
-          "type": "str"
-        },
-        {
-          "name": "logappend",
-          "default": null,
-          "type": "bool"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "481",
-      "members": [
-        {
-          "name": "logfile",
-          "default": null,
-          "type": "str"
-        },
-        {
-          "name": "logappend",
-          "default": null,
-          "type": "bool"
-        },
-        {
-          "name": "chardev",
-          "type": "str"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "482",
       "members": [
@@ -20348,11 +21379,6 @@
           "name": "logappend",
           "default": null,
           "type": "bool"
-        },
-        {
-          "name": "signal",
-          "default": null,
-          "type": "bool"
         }
       ],
       "meta-type": "object"
@@ -20371,7 +21397,7 @@
           "type": "bool"
         },
         {
-          "name": "type",
+          "name": "chardev",
           "type": "str"
         }
       ],
@@ -20379,6 +21405,47 @@
     },
     {
       "name": "484",
+      "members": [
+        {
+          "name": "logfile",
+          "default": null,
+          "type": "str"
+        },
+        {
+          "name": "logappend",
+          "default": null,
+          "type": "bool"
+        },
+        {
+          "name": "signal",
+          "default": null,
+          "type": "bool"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "485",
+      "members": [
+        {
+          "name": "logfile",
+          "default": null,
+          "type": "str"
+        },
+        {
+          "name": "logappend",
+          "default": null,
+          "type": "bool"
+        },
+        {
+          "name": "type",
+          "type": "str"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "486",
       "members": [
         {
           "name": "logfile",
@@ -20398,7 +21465,7 @@
       "meta-type": "object"
     },
     {
-      "name": "485",
+      "name": "487",
       "members": [
         {
           "name": "logfile",
@@ -20434,7 +21501,7 @@
       "meta-type": "object"
     },
     {
-      "name": "486",
+      "name": "488",
       "members": [
         {
           "name": "logfile",
@@ -20455,7 +21522,7 @@
       "meta-type": "object"
     },
     {
-      "name": "487",
+      "name": "489",
       "members": [
         {
           "name": "path",
@@ -20471,7 +21538,7 @@
       "meta-type": "object"
     },
     {
-      "name": "488",
+      "name": "490",
       "members": [
         {
           "name": "chardev",
@@ -20481,7 +21548,7 @@
       "meta-type": "object"
     },
     {
-      "name": "489",
+      "name": "491",
       "meta-type": "enum",
       "values": [
         "unmapped",
@@ -20634,40 +21701,40 @@
         "ac_bookmarks"
       ]
     },
-    {
-      "name": "490",
-      "members": [
-        {
-          "name": "key",
-          "type": "298"
-        },
-        {
-          "name": "down",
-          "type": "bool"
-        }
-      ],
-      "meta-type": "object"
-    },
-    {
-      "name": "491",
-      "members": [
-        {
-          "name": "button",
-          "type": "504"
-        },
-        {
-          "name": "down",
-          "type": "bool"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "492",
+      "members": [
+        {
+          "name": "key",
+          "type": "300"
+        },
+        {
+          "name": "down",
+          "type": "bool"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "493",
+      "members": [
+        {
+          "name": "button",
+          "type": "506"
+        },
+        {
+          "name": "down",
+          "type": "bool"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "494",
       "members": [
         {
           "name": "axis",
-          "type": "505"
+          "type": "507"
         },
         {
           "name": "value",
@@ -20677,13 +21744,13 @@
       "meta-type": "object"
     },
     {
-      "name": "493",
+      "name": "495",
       "members": [
       ],
       "meta-type": "object"
     },
     {
-      "name": "494",
+      "name": "496",
       "members": [
         {
           "name": "number",
@@ -20699,21 +21766,21 @@
         },
         {
           "name": "io_range",
-          "type": "506"
+          "type": "508"
         },
         {
           "name": "memory_range",
-          "type": "506"
+          "type": "508"
         },
         {
           "name": "prefetchable_range",
-          "type": "506"
+          "type": "508"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "495",
+      "name": "497",
       "members": [
         {
           "name": "compat",
@@ -20746,18 +21813,18 @@
         {
           "name": "encrypt",
           "default": null,
-          "type": "507"
+          "type": "509"
         },
         {
           "name": "bitmaps",
           "default": null,
-          "type": "[508]"
+          "type": "[510]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "496",
+      "name": "498",
       "members": [
         {
           "name": "create-type",
@@ -20779,28 +21846,28 @@
       "meta-type": "object"
     },
     {
-      "name": "497",
+      "name": "499",
       "members": [
         {
           "name": "cipher-alg",
-          "type": "465"
+          "type": "467"
         },
         {
           "name": "cipher-mode",
-          "type": "466"
+          "type": "468"
         },
         {
           "name": "ivgen-alg",
-          "type": "467"
+          "type": "469"
         },
         {
           "name": "ivgen-hash-alg",
           "default": null,
-          "type": "468"
+          "type": "470"
         },
         {
           "name": "hash-alg",
-          "type": "468"
+          "type": "470"
         },
         {
           "name": "payload-offset",
@@ -20816,13 +21883,13 @@
         },
         {
           "name": "slots",
-          "type": "[509]"
+          "type": "[511]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "498",
+      "name": "500",
       "meta-type": "enum",
       "values": [
         "md5",
@@ -20830,7 +21897,7 @@
       ]
     },
     {
-      "name": "499",
+      "name": "501",
       "meta-type": "enum",
       "values": [
         "qcow",
@@ -20838,7 +21905,7 @@
       ]
     },
     {
-      "name": "500",
+      "name": "502",
       "members": [
         {
           "name": "key-secret",
@@ -20848,27 +21915,27 @@
         {
           "name": "cipher-alg",
           "default": null,
-          "type": "465"
+          "type": "467"
         },
         {
           "name": "cipher-mode",
           "default": null,
-          "type": "466"
+          "type": "468"
         },
         {
           "name": "ivgen-alg",
           "default": null,
-          "type": "467"
+          "type": "469"
         },
         {
           "name": "ivgen-hash-alg",
           "default": null,
-          "type": "468"
+          "type": "470"
         },
         {
           "name": "hash-alg",
           "default": null,
-          "type": "468"
+          "type": "470"
         },
         {
           "name": "iter-time",
@@ -20879,7 +21946,7 @@
       "meta-type": "object"
     },
     {
-      "name": "501",
+      "name": "503",
       "meta-type": "enum",
       "values": [
         "full",
@@ -20887,7 +21954,7 @@
       ]
     },
     {
-      "name": "502",
+      "name": "504",
       "members": [
         {
           "name": "copies",
@@ -20897,7 +21964,7 @@
       "meta-type": "object"
     },
     {
-      "name": "503",
+      "name": "505",
       "members": [
         {
           "name": "data-strips",
@@ -20911,7 +21978,7 @@
       "meta-type": "object"
     },
     {
-      "name": "504",
+      "name": "506",
       "meta-type": "enum",
       "values": [
         "left",
@@ -20924,7 +21991,7 @@
       ]
     },
     {
-      "name": "505",
+      "name": "507",
       "meta-type": "enum",
       "values": [
         "x",
@@ -20932,7 +21999,7 @@
       ]
     },
     {
-      "name": "506",
+      "name": "508",
       "members": [
         {
           "name": "base",
@@ -20946,12 +22013,12 @@
       "meta-type": "object"
     },
     {
-      "name": "507",
+      "name": "509",
       "tag": "format",
       "variants": [
         {
           "case": "luks",
-          "type": "497"
+          "type": "499"
         },
         {
           "case": "aes",
@@ -20961,18 +22028,18 @@
       "members": [
         {
           "name": "format",
-          "type": "458"
+          "type": "460"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[508]",
-      "element-type": "508",
+      "name": "[510]",
+      "element-type": "510",
       "meta-type": "array"
     },
     {
-      "name": "508",
+      "name": "510",
       "members": [
         {
           "name": "name",
@@ -20984,7 +22051,7 @@
         },
         {
           "name": "flags",
-          "type": "[510]"
+          "type": "[512]"
         }
       ],
       "meta-type": "object"
@@ -20995,12 +22062,12 @@
       "meta-type": "array"
     },
     {
-      "name": "[509]",
-      "element-type": "509",
+      "name": "[511]",
+      "element-type": "511",
       "meta-type": "array"
     },
     {
-      "name": "509",
+      "name": "511",
       "members": [
         {
           "name": "active",
@@ -21024,12 +22091,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[510]",
-      "element-type": "510",
+      "name": "[512]",
+      "element-type": "512",
       "meta-type": "array"
     },
     {
-      "name": "510",
+      "name": "512",
       "meta-type": "enum",
       "values": [
         "in-use",
@@ -21203,6 +22270,7 @@
         "xop": false,
         "ibpb": false,
         "avx": true,
+        "core-capability": false,
         "movdiri": false,
         "acpi": false,
         "avx512bw": false,
@@ -21225,6 +22293,7 @@
         "nodeid-msr": false,
         "md-clear": true,
         "misalignsse": false,
+        "split-lock-detect": false,
         "min-xlevel": 2147483656,
         "bmi1": true,
         "bmi2": true,
@@ -21423,6 +22492,7 @@
         "xop": false,
         "ibpb": false,
         "avx": true,
+        "core-capability": false,
         "movdiri": false,
         "acpi": false,
         "avx512bw": false,
@@ -21445,6 +22515,7 @@
         "nodeid-msr": false,
         "md-clear": true,
         "misalignsse": false,
+        "split-lock-detect": false,
         "min-xlevel": 2147483656,
         "bmi1": true,
         "bmi2": true,
@@ -21533,11 +22604,28 @@
       "static": true,
       "migration-safe": true
     },
+    {
+      "name": "qemu64-v1",
+      "typename": "qemu64-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
+      "static": false,
+      "migration-safe": true
+    },
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "qemu64-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "qemu32-v1",
+      "typename": "qemu32-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21546,6 +22634,16 @@
       "typename": "qemu32-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "qemu32-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "phenom-v1",
+      "typename": "phenom-v1-x86_64-cpu",
+      "unavailable-features": [
+        "fxsr-opt"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21555,6 +22653,15 @@
       "unavailable-features": [
         "fxsr-opt"
       ],
+      "alias-of": "phenom-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium3-v1",
+      "typename": "pentium3-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21563,6 +22670,15 @@
       "typename": "pentium3-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "pentium3-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium2-v1",
+      "typename": "pentium2-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21571,6 +22687,15 @@
       "typename": "pentium2-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "pentium2-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "pentium-v1",
+      "typename": "pentium-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21579,6 +22704,15 @@
       "typename": "pentium-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "pentium-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "n270-v1",
+      "typename": "n270-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21587,6 +22721,15 @@
       "typename": "n270-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "n270-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "kvm64-v1",
+      "typename": "kvm64-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21595,6 +22738,15 @@
       "typename": "kvm64-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "kvm64-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "kvm32-v1",
+      "typename": "kvm32-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21603,6 +22755,15 @@
       "typename": "kvm32-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "kvm32-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "coreduo-v1",
+      "typename": "coreduo-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21611,6 +22772,15 @@
       "typename": "coreduo-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "coreduo-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "core2duo-v1",
+      "typename": "core2duo-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21619,6 +22789,15 @@
       "typename": "core2duo-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "core2duo-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "athlon-v1",
+      "typename": "athlon-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21627,6 +22806,24 @@
       "typename": "athlon-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "athlon-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Westmere-v2",
+      "typename": "Westmere-v2-x86_64-cpu",
+      "unavailable-features": [
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Westmere-v1",
+      "typename": "Westmere-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21636,6 +22833,7 @@
       "unavailable-features": [
         "spec-ctrl"
       ],
+      "alias-of": "Westmere-v2",
       "static": false,
       "migration-safe": true
     },
@@ -21643,6 +22841,110 @@
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
       "unavailable-features": [
+        "spec-ctrl"
+      ],
+      "alias-of": "Westmere-v2",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Snowridge-v1",
+      "typename": "Snowridge-v1-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "rdseed",
+        "sha-ni",
+        "umip",
+        "gfni",
+        "cldemote",
+        "movdiri",
+        "movdir64b",
+        "spec-ctrl",
+        "arch-capabilities",
+        "core-capability",
+        "ssbd",
+        "3dnowprefetch",
+        "xsavec",
+        "split-lock-detect"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Snowridge",
+      "typename": "Snowridge-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "rdseed",
+        "sha-ni",
+        "umip",
+        "gfni",
+        "cldemote",
+        "movdiri",
+        "movdir64b",
+        "spec-ctrl",
+        "arch-capabilities",
+        "core-capability",
+        "ssbd",
+        "3dnowprefetch",
+        "xsavec",
+        "split-lock-detect"
+      ],
+      "alias-of": "Snowridge-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Server-v2",
+      "typename": "Skylake-Server-v2-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "spec-ctrl",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Server-v1",
+      "typename": "Skylake-Server-v1-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "3dnowprefetch",
+        "xsavec"
       ],
       "static": false,
       "migration-safe": true
@@ -21671,6 +22973,7 @@
         "3dnowprefetch",
         "xsavec"
       ],
+      "alias-of": "Skylake-Server-v2",
       "static": false,
       "migration-safe": true
     },
@@ -21694,6 +22997,51 @@
         "avx512cd",
         "avx512bw",
         "avx512vl",
+        "spec-ctrl",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "alias-of": "Skylake-Server-v2",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Client-v2",
+      "typename": "Skylake-Client-v2-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "spec-ctrl",
+        "3dnowprefetch",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Skylake-Client-v1",
+      "typename": "Skylake-Client-v1-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
         "3dnowprefetch",
         "xsavec"
       ],
@@ -21719,6 +23067,7 @@
         "3dnowprefetch",
         "xsavec"
       ],
+      "alias-of": "Skylake-Client-v2",
       "static": false,
       "migration-safe": true
     },
@@ -21737,9 +23086,34 @@
         "invpcid",
         "rtm",
         "rdseed",
+        "spec-ctrl",
         "3dnowprefetch",
         "xsavec"
       ],
+      "alias-of": "Skylake-Client-v2",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "SandyBridge-v2",
+      "typename": "SandyBridge-v2-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "SandyBridge-v1",
+      "typename": "SandyBridge-v1-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21752,6 +23126,7 @@
         "avx",
         "spec-ctrl"
       ],
+      "alias-of": "SandyBridge-v2",
       "static": false,
       "migration-safe": true
     },
@@ -21761,7 +23136,17 @@
       "unavailable-features": [
         "x2apic",
         "tsc-deadline",
-        "avx"
+        "avx",
+        "spec-ctrl"
+      ],
+      "alias-of": "SandyBridge-v2",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Penryn-v1",
+      "typename": "Penryn-v1-x86_64-cpu",
+      "unavailable-features": [
       ],
       "static": false,
       "migration-safe": true
@@ -21771,6 +23156,24 @@
       "typename": "Penryn-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Penryn-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G5-v1",
+      "typename": "Opteron_G5-v1-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "misalignsse",
+        "3dnowprefetch",
+        "xop",
+        "fma4",
+        "tbm",
+        "nrip-save"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21788,6 +23191,21 @@
         "tbm",
         "nrip-save"
       ],
+      "alias-of": "Opteron_G5-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G4-v1",
+      "typename": "Opteron_G4-v1-x86_64-cpu",
+      "unavailable-features": [
+        "avx",
+        "misalignsse",
+        "3dnowprefetch",
+        "xop",
+        "fma4",
+        "nrip-save"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21802,6 +23220,16 @@
         "fma4",
         "nrip-save"
       ],
+      "alias-of": "Opteron_G4-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G3-v1",
+      "typename": "Opteron_G3-v1-x86_64-cpu",
+      "unavailable-features": [
+        "misalignsse"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21811,6 +23239,15 @@
       "unavailable-features": [
         "misalignsse"
       ],
+      "alias-of": "Opteron_G3-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G2-v1",
+      "typename": "Opteron_G2-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21819,6 +23256,15 @@
       "typename": "Opteron_G2-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Opteron_G2-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Opteron_G1-v1",
+      "typename": "Opteron_G1-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21827,6 +23273,24 @@
       "typename": "Opteron_G1-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Opteron_G1-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Nehalem-v2",
+      "typename": "Nehalem-v2-x86_64-cpu",
+      "unavailable-features": [
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Nehalem-v1",
+      "typename": "Nehalem-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21836,6 +23300,7 @@
       "unavailable-features": [
         "spec-ctrl"
       ],
+      "alias-of": "Nehalem-v2",
       "static": false,
       "migration-safe": true
     },
@@ -21843,6 +23308,31 @@
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
       "unavailable-features": [
+        "spec-ctrl"
+      ],
+      "alias-of": "Nehalem-v2",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "KnightsMill-v1",
+      "typename": "KnightsMill-v1-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "avx2",
+        "avx512f",
+        "rdseed",
+        "avx512pf",
+        "avx512er",
+        "avx512cd",
+        "avx512-vpopcntdq",
+        "avx512-4vnniw",
+        "avx512-4fmaps",
+        "3dnowprefetch"
       ],
       "static": false,
       "migration-safe": true
@@ -21867,6 +23357,32 @@
         "avx512-4fmaps",
         "3dnowprefetch"
       ],
+      "alias-of": "KnightsMill-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "IvyBridge-v2",
+      "typename": "IvyBridge-v2-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "IvyBridge-v1",
+      "typename": "IvyBridge-v1-x86_64-cpu",
+      "unavailable-features": [
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21880,6 +23396,7 @@
         "f16c",
         "spec-ctrl"
       ],
+      "alias-of": "IvyBridge-v2",
       "static": false,
       "migration-safe": true
     },
@@ -21890,7 +23407,47 @@
         "x2apic",
         "tsc-deadline",
         "avx",
-        "f16c"
+        "f16c",
+        "spec-ctrl"
+      ],
+      "alias-of": "IvyBridge-v2",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Icelake-Server-v1",
+      "typename": "Icelake-Server-v1-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "avx512vbmi",
+        "umip",
+        "avx512vbmi2",
+        "gfni",
+        "vaes",
+        "vpclmulqdq",
+        "avx512vnni",
+        "avx512bitalg",
+        "avx512-vpopcntdq",
+        "spec-ctrl",
+        "ssbd",
+        "3dnowprefetch",
+        "wbnoinvd",
+        "xsavec"
       ],
       "static": false,
       "migration-safe": true
@@ -21930,6 +23487,40 @@
         "wbnoinvd",
         "xsavec"
       ],
+      "alias-of": "Icelake-Server-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Icelake-Client-v1",
+      "typename": "Icelake-Client-v1-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "avx512vbmi",
+        "umip",
+        "avx512vbmi2",
+        "gfni",
+        "vaes",
+        "vpclmulqdq",
+        "avx512vnni",
+        "avx512bitalg",
+        "avx512-vpopcntdq",
+        "spec-ctrl",
+        "ssbd",
+        "3dnowprefetch",
+        "wbnoinvd",
+        "xsavec"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21963,6 +23554,77 @@
         "wbnoinvd",
         "xsavec"
       ],
+      "alias-of": "Icelake-Client-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-v4",
+      "typename": "Haswell-v4-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "avx2",
+        "invpcid",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-v3",
+      "typename": "Haswell-v3-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "spec-ctrl"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-v2",
+      "typename": "Haswell-v2-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "avx2",
+        "invpcid"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Haswell-v1",
+      "typename": "Haswell-v1-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm"
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -21980,6 +23642,7 @@
         "invpcid",
         "spec-ctrl"
       ],
+      "alias-of": "Haswell-v4",
       "static": false,
       "migration-safe": true
     },
@@ -21996,6 +23659,7 @@
         "avx2",
         "invpcid"
       ],
+      "alias-of": "Haswell-v2",
       "static": false,
       "migration-safe": true
     },
@@ -22015,6 +23679,7 @@
         "rtm",
         "spec-ctrl"
       ],
+      "alias-of": "Haswell-v3",
       "static": false,
       "migration-safe": true
     },
@@ -22028,10 +23693,53 @@
         "tsc-deadline",
         "avx",
         "f16c",
-        "hle",
         "avx2",
         "invpcid",
-        "rtm"
+        "spec-ctrl"
+      ],
+      "alias-of": "Haswell-v4",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "EPYC-v2",
+      "typename": "EPYC-v2-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "avx2",
+        "rdseed",
+        "sha-ni",
+        "fxsr-opt",
+        "misalignsse",
+        "3dnowprefetch",
+        "osvw",
+        "topoext",
+        "ibpb",
+        "nrip-save",
+        "xsavec"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "EPYC-v1",
+      "typename": "EPYC-v1-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "avx2",
+        "rdseed",
+        "sha-ni",
+        "fxsr-opt",
+        "misalignsse",
+        "3dnowprefetch",
+        "osvw",
+        "topoext",
+        "nrip-save",
+        "xsavec"
       ],
       "static": false,
       "migration-safe": true
@@ -22055,6 +23763,7 @@
         "nrip-save",
         "xsavec"
       ],
+      "alias-of": "EPYC-v2",
       "static": false,
       "migration-safe": true
     },
@@ -22073,6 +23782,29 @@
         "3dnowprefetch",
         "osvw",
         "topoext",
+        "ibpb",
+        "nrip-save",
+        "xsavec"
+      ],
+      "alias-of": "EPYC-v2",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Dhyana-v1",
+      "typename": "Dhyana-v1-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "avx",
+        "f16c",
+        "avx2",
+        "rdseed",
+        "fxsr-opt",
+        "misalignsse",
+        "3dnowprefetch",
+        "osvw",
+        "topoext",
+        "ibpb",
         "nrip-save",
         "xsavec"
       ],
@@ -22097,6 +23829,15 @@
         "nrip-save",
         "xsavec"
       ],
+      "alias-of": "Dhyana-v1",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Conroe-v1",
+      "typename": "Conroe-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -22105,12 +23846,47 @@
       "typename": "Conroe-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true
     },
     {
-      "name": "Cascadelake-Server",
-      "typename": "Cascadelake-Server-x86_64-cpu",
+      "name": "Cascadelake-Server-v2",
+      "typename": "Cascadelake-Server-v2-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "avx512vnni",
+        "spec-ctrl",
+        "arch-capabilities",
+        "ssbd",
+        "3dnowprefetch",
+        "xsavec",
+        "rdctl-no",
+        "ibrs-all",
+        "skip-l1dfl-vmentry",
+        "mds-no"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Cascadelake-Server-v1",
+      "typename": "Cascadelake-Server-v1-x86_64-cpu",
       "unavailable-features": [
         "fma",
         "pcid",
@@ -22137,6 +23913,119 @@
       "static": false,
       "migration-safe": true
     },
+    {
+      "name": "Cascadelake-Server",
+      "typename": "Cascadelake-Server-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "avx512f",
+        "avx512dq",
+        "rdseed",
+        "avx512cd",
+        "avx512bw",
+        "avx512vl",
+        "avx512vnni",
+        "spec-ctrl",
+        "arch-capabilities",
+        "ssbd",
+        "3dnowprefetch",
+        "xsavec",
+        "rdctl-no",
+        "ibrs-all",
+        "skip-l1dfl-vmentry",
+        "mds-no"
+      ],
+      "alias-of": "Cascadelake-Server-v2",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-v4",
+      "typename": "Broadwell-v4-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "avx2",
+        "invpcid",
+        "rdseed",
+        "spec-ctrl",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-v3",
+      "typename": "Broadwell-v3-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "spec-ctrl",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-v2",
+      "typename": "Broadwell-v2-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "avx2",
+        "invpcid",
+        "rdseed",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "Broadwell-v1",
+      "typename": "Broadwell-v1-x86_64-cpu",
+      "unavailable-features": [
+        "fma",
+        "pcid",
+        "x2apic",
+        "tsc-deadline",
+        "avx",
+        "f16c",
+        "hle",
+        "avx2",
+        "invpcid",
+        "rtm",
+        "rdseed",
+        "3dnowprefetch"
+      ],
+      "static": false,
+      "migration-safe": true
+    },
     {
       "name": "Broadwell-noTSX-IBRS",
       "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
@@ -22153,6 +24042,7 @@
         "spec-ctrl",
         "3dnowprefetch"
       ],
+      "alias-of": "Broadwell-v4",
       "static": false,
       "migration-safe": true
     },
@@ -22171,6 +24061,7 @@
         "rdseed",
         "3dnowprefetch"
       ],
+      "alias-of": "Broadwell-v2",
       "static": false,
       "migration-safe": true
     },
@@ -22192,6 +24083,7 @@
         "spec-ctrl",
         "3dnowprefetch"
       ],
+      "alias-of": "Broadwell-v3",
       "static": false,
       "migration-safe": true
     },
@@ -22205,13 +24097,21 @@
         "tsc-deadline",
         "avx",
         "f16c",
-        "hle",
         "avx2",
         "invpcid",
-        "rtm",
         "rdseed",
+        "spec-ctrl",
         "3dnowprefetch"
       ],
+      "alias-of": "Broadwell-v4",
+      "static": false,
+      "migration-safe": true
+    },
+    {
+      "name": "486-v1",
+      "typename": "486-v1-x86_64-cpu",
+      "unavailable-features": [
+      ],
       "static": false,
       "migration-safe": true
     },
@@ -22220,6 +24120,7 @@
       "typename": "486-x86_64-cpu",
       "unavailable-features": [
       ],
+      "alias-of": "486-v1",
       "static": false,
       "migration-safe": true
     }
@@ -22377,6 +24278,7 @@
         "xop": false,
         "ibpb": false,
         "avx": false,
+        "core-capability": false,
         "movdiri": false,
         "acpi": true,
         "avx512bw": false,
@@ -22399,6 +24301,7 @@
         "nodeid-msr": false,
         "md-clear": false,
         "misalignsse": false,
+        "split-lock-detect": false,
         "min-xlevel": 2147483658,
         "bmi1": true,
         "bmi2": true,
@@ -22597,6 +24500,7 @@
         "xop": false,
         "ibpb": false,
         "avx": false,
+        "core-capability": false,
         "movdiri": false,
         "acpi": true,
         "avx512bw": false,
@@ -22619,6 +24523,7 @@
         "nodeid-msr": false,
         "md-clear": false,
         "misalignsse": false,
+        "split-lock-detect": false,
         "min-xlevel": 2147483658,
         "bmi1": true,
         "bmi2": true,
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 5d4540b3f7..660ead8555 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -211,10 +211,10 @@
   <flag name='migration-file-drop-cache'/>
   <flag name='vhost-user-gpu'/>
   <flag name='vhost-user-vga'/>
-  <version>4000050</version>
+  <version>4001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100759</microcodeVersion>
-  <package>v4.0.0-1481-g33d6099906</package>
+  <package>v4.1.0</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
     <property name='cmov' type='boolean' value='true' migratable='yes'/>
@@ -351,6 +351,7 @@
     <property name='xop' type='boolean' value='false'/>
     <property name='ibpb' type='boolean' value='false'/>
     <property name='avx' type='boolean' value='true' migratable='yes'/>
+    <property name='core-capability' type='boolean' value='false'/>
     <property name='movdiri' type='boolean' value='false'/>
     <property name='acpi' type='boolean' value='false'/>
     <property name='avx512bw' type='boolean' value='false'/>
@@ -373,6 +374,7 @@
     <property name='nodeid-msr' type='boolean' value='false'/>
     <property name='md-clear' type='boolean' value='true' migratable='yes'/>
     <property name='misalignsse' type='boolean' value='false'/>
+    <property name='split-lock-detect' type='boolean' value='false'/>
     <property name='min-xlevel' type='number' value='2147483656'/>
     <property name='bmi1' type='boolean' value='true' migratable='yes'/>
     <property name='bmi2' type='boolean' value='true' migratable='yes'/>
@@ -548,6 +550,7 @@
     <property name='xop' type='boolean' value='false'/>
     <property name='ibpb' type='boolean' value='false'/>
     <property name='avx' type='boolean' value='false'/>
+    <property name='core-capability' type='boolean' value='false'/>
     <property name='movdiri' type='boolean' value='false'/>
     <property name='acpi' type='boolean' value='true' migratable='yes'/>
     <property name='avx512bw' type='boolean' value='false'/>
@@ -570,6 +573,7 @@
     <property name='nodeid-msr' type='boolean' value='false'/>
     <property name='md-clear' type='boolean' value='false'/>
     <property name='misalignsse' type='boolean' value='false'/>
+    <property name='split-lock-detect' type='boolean' value='false'/>
     <property name='min-xlevel' type='number' value='2147483658'/>
     <property name='bmi1' type='boolean' value='true' migratable='yes'/>
     <property name='bmi2' type='boolean' value='true' migratable='yes'/>
@@ -613,8 +617,18 @@
   <cpu type='kvm' name='max' usable='yes'/>
   <cpu type='kvm' name='host' usable='yes'/>
   <cpu type='kvm' name='base' usable='yes'/>
+  <cpu type='kvm' name='qemu64-v1' usable='yes'/>
   <cpu type='kvm' name='qemu64' usable='yes'/>
+  <cpu type='kvm' name='qemu32-v1' usable='yes'/>
   <cpu type='kvm' name='qemu32' usable='yes'/>
+  <cpu type='kvm' name='phenom-v1' usable='no'>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='3dnowext'/>
+    <blocker name='3dnow'/>
+    <blocker name='sse4a'/>
+    <blocker name='npt'/>
+  </cpu>
   <cpu type='kvm' name='phenom' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='fxsr-opt'/>
@@ -623,21 +637,82 @@
     <blocker name='sse4a'/>
     <blocker name='npt'/>
   </cpu>
+  <cpu type='kvm' name='pentium3-v1' usable='yes'/>
   <cpu type='kvm' name='pentium3' usable='yes'/>
+  <cpu type='kvm' name='pentium2-v1' usable='yes'/>
   <cpu type='kvm' name='pentium2' usable='yes'/>
+  <cpu type='kvm' name='pentium-v1' usable='yes'/>
   <cpu type='kvm' name='pentium' usable='yes'/>
+  <cpu type='kvm' name='n270-v1' usable='yes'/>
   <cpu type='kvm' name='n270' usable='yes'/>
+  <cpu type='kvm' name='kvm64-v1' usable='yes'/>
   <cpu type='kvm' name='kvm64' usable='yes'/>
+  <cpu type='kvm' name='kvm32-v1' usable='yes'/>
   <cpu type='kvm' name='kvm32' usable='yes'/>
+  <cpu type='kvm' name='coreduo-v1' usable='yes'/>
   <cpu type='kvm' name='coreduo' usable='yes'/>
+  <cpu type='kvm' name='core2duo-v1' usable='yes'/>
   <cpu type='kvm' name='core2duo' usable='yes'/>
+  <cpu type='kvm' name='athlon-v1' usable='no'>
+    <blocker name='mmxext'/>
+    <blocker name='3dnowext'/>
+    <blocker name='3dnow'/>
+  </cpu>
   <cpu type='kvm' name='athlon' usable='no'>
     <blocker name='mmxext'/>
     <blocker name='3dnowext'/>
     <blocker name='3dnow'/>
   </cpu>
+  <cpu type='kvm' name='Westmere-v2' usable='yes'/>
+  <cpu type='kvm' name='Westmere-v1' usable='yes'/>
   <cpu type='kvm' name='Westmere-IBRS' usable='yes'/>
   <cpu type='kvm' name='Westmere' usable='yes'/>
+  <cpu type='kvm' name='Snowridge-v1' usable='no'>
+    <blocker name='clwb'/>
+    <blocker name='sha-ni'/>
+    <blocker name='gfni'/>
+    <blocker name='cldemote'/>
+    <blocker name='movdiri'/>
+    <blocker name='movdir64b'/>
+    <blocker name='core-capability'/>
+    <blocker name='split-lock-detect'/>
+  </cpu>
+  <cpu type='kvm' name='Snowridge' usable='no'>
+    <blocker name='clwb'/>
+    <blocker name='sha-ni'/>
+    <blocker name='gfni'/>
+    <blocker name='cldemote'/>
+    <blocker name='movdiri'/>
+    <blocker name='movdir64b'/>
+    <blocker name='core-capability'/>
+    <blocker name='split-lock-detect'/>
+  </cpu>
+  <cpu type='kvm' name='Skylake-Server-v2' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='clwb'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='pku'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='pku'/>
+  </cpu>
+  <cpu type='kvm' name='Skylake-Server-v1' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='clwb'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='pku'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='pku'/>
+  </cpu>
   <cpu type='kvm' name='Skylake-Server-IBRS' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
@@ -664,11 +739,25 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
+  <cpu type='kvm' name='Skylake-Client-v2' usable='yes'/>
+  <cpu type='kvm' name='Skylake-Client-v1' usable='yes'/>
   <cpu type='kvm' name='Skylake-Client-IBRS' usable='yes'/>
   <cpu type='kvm' name='Skylake-Client' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge-v2' usable='yes'/>
+  <cpu type='kvm' name='SandyBridge-v1' usable='yes'/>
   <cpu type='kvm' name='SandyBridge-IBRS' usable='yes'/>
   <cpu type='kvm' name='SandyBridge' usable='yes'/>
+  <cpu type='kvm' name='Penryn-v1' usable='yes'/>
   <cpu type='kvm' name='Penryn' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G5-v1' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+    <blocker name='tbm'/>
+    <blocker name='npt'/>
+    <blocker name='nrip-save'/>
+  </cpu>
   <cpu type='kvm' name='Opteron_G5' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
@@ -678,6 +767,14 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
+  <cpu type='kvm' name='Opteron_G4-v1' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+    <blocker name='npt'/>
+    <blocker name='nrip-save'/>
+  </cpu>
   <cpu type='kvm' name='Opteron_G4' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
@@ -686,14 +783,34 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
+  <cpu type='kvm' name='Opteron_G3-v1' usable='no'>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+  </cpu>
   <cpu type='kvm' name='Opteron_G3' usable='no'>
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
   </cpu>
+  <cpu type='kvm' name='Opteron_G2-v1' usable='yes'/>
   <cpu type='kvm' name='Opteron_G2' usable='yes'/>
+  <cpu type='kvm' name='Opteron_G1-v1' usable='yes'/>
   <cpu type='kvm' name='Opteron_G1' usable='yes'/>
+  <cpu type='kvm' name='Nehalem-v2' usable='yes'/>
+  <cpu type='kvm' name='Nehalem-v1' usable='yes'/>
   <cpu type='kvm' name='Nehalem-IBRS' usable='yes'/>
   <cpu type='kvm' name='Nehalem' usable='yes'/>
+  <cpu type='kvm' name='KnightsMill-v1' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512pf'/>
+    <blocker name='avx512er'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512-vpopcntdq'/>
+    <blocker name='avx512-4vnniw'/>
+    <blocker name='avx512-4fmaps'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+  </cpu>
   <cpu type='kvm' name='KnightsMill' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512pf'/>
@@ -706,8 +823,33 @@
     <blocker name='avx512f'/>
     <blocker name='avx512f'/>
   </cpu>
+  <cpu type='kvm' name='IvyBridge-v2' usable='yes'/>
+  <cpu type='kvm' name='IvyBridge-v1' usable='yes'/>
   <cpu type='kvm' name='IvyBridge-IBRS' usable='yes'/>
   <cpu type='kvm' name='IvyBridge' usable='yes'/>
+  <cpu type='kvm' name='Icelake-Server-v1' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='clwb'/>
+    <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='wbnoinvd'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='pku'/>
+  </cpu>
   <cpu type='kvm' name='Icelake-Server' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
@@ -731,6 +873,19 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
+  <cpu type='kvm' name='Icelake-Client-v1' usable='no'>
+    <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='wbnoinvd'/>
+    <blocker name='pku'/>
+  </cpu>
   <cpu type='kvm' name='Icelake-Client' usable='no'>
     <blocker name='avx512vbmi'/>
     <blocker name='pku'/>
@@ -744,10 +899,37 @@
     <blocker name='wbnoinvd'/>
     <blocker name='pku'/>
   </cpu>
+  <cpu type='kvm' name='Haswell-v4' usable='yes'/>
+  <cpu type='kvm' name='Haswell-v3' usable='yes'/>
+  <cpu type='kvm' name='Haswell-v2' usable='yes'/>
+  <cpu type='kvm' name='Haswell-v1' usable='yes'/>
   <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='yes'/>
   <cpu type='kvm' name='Haswell-noTSX' usable='yes'/>
   <cpu type='kvm' name='Haswell-IBRS' usable='yes'/>
   <cpu type='kvm' name='Haswell' usable='yes'/>
+  <cpu type='kvm' name='EPYC-v2' usable='no'>
+    <blocker name='sha-ni'/>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='cr8legacy'/>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='osvw'/>
+    <blocker name='ibpb'/>
+    <blocker name='npt'/>
+    <blocker name='nrip-save'/>
+  </cpu>
+  <cpu type='kvm' name='EPYC-v1' usable='no'>
+    <blocker name='sha-ni'/>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='cr8legacy'/>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='osvw'/>
+    <blocker name='npt'/>
+    <blocker name='nrip-save'/>
+  </cpu>
   <cpu type='kvm' name='EPYC-IBPB' usable='no'>
     <blocker name='sha-ni'/>
     <blocker name='mmxext'/>
@@ -768,6 +950,18 @@
     <blocker name='sse4a'/>
     <blocker name='misalignsse'/>
     <blocker name='osvw'/>
+    <blocker name='ibpb'/>
+    <blocker name='npt'/>
+    <blocker name='nrip-save'/>
+  </cpu>
+  <cpu type='kvm' name='Dhyana-v1' usable='no'>
+    <blocker name='mmxext'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='cr8legacy'/>
+    <blocker name='sse4a'/>
+    <blocker name='misalignsse'/>
+    <blocker name='osvw'/>
+    <blocker name='ibpb'/>
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
@@ -782,8 +976,26 @@
     <blocker name='npt'/>
     <blocker name='nrip-save'/>
   </cpu>
+  <cpu type='kvm' name='Conroe-v1' usable='yes'/>
   <cpu type='kvm' name='Conroe' usable='yes'/>
-  <cpu type='kvm' name='Cascadelake-Server' usable='no'>
+  <cpu type='kvm' name='Cascadelake-Server-v2' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='clwb'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='pku'/>
+    <blocker name='avx512vnni'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='pku'/>
+    <blocker name='rdctl-no'/>
+    <blocker name='ibrs-all'/>
+    <blocker name='mds-no'/>
+  </cpu>
+  <cpu type='kvm' name='Cascadelake-Server-v1' usable='no'>
     <blocker name='avx512f'/>
     <blocker name='avx512dq'/>
     <blocker name='clwb'/>
@@ -797,34 +1009,153 @@
     <blocker name='avx512f'/>
     <blocker name='pku'/>
   </cpu>
+  <cpu type='kvm' name='Cascadelake-Server' usable='no'>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='clwb'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='pku'/>
+    <blocker name='avx512vnni'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512f'/>
+    <blocker name='pku'/>
+    <blocker name='rdctl-no'/>
+    <blocker name='ibrs-all'/>
+    <blocker name='mds-no'/>
+  </cpu>
+  <cpu type='kvm' name='Broadwell-v4' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-v3' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-v2' usable='yes'/>
+  <cpu type='kvm' name='Broadwell-v1' usable='yes'/>
   <cpu type='kvm' name='Broadwell-noTSX-IBRS' usable='yes'/>
   <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/>
   <cpu type='kvm' name='Broadwell-IBRS' usable='yes'/>
   <cpu type='kvm' name='Broadwell' usable='yes'/>
+  <cpu type='kvm' name='486-v1' usable='yes'/>
   <cpu type='kvm' name='486' usable='yes'/>
   <cpu type='tcg' name='max' usable='yes'/>
   <cpu type='tcg' name='host' usable='no'>
     <blocker name='kvm'/>
   </cpu>
   <cpu type='tcg' name='base' usable='yes'/>
+  <cpu type='tcg' name='qemu64-v1' usable='yes'/>
   <cpu type='tcg' name='qemu64' usable='yes'/>
+  <cpu type='tcg' name='qemu32-v1' usable='yes'/>
   <cpu type='tcg' name='qemu32' usable='yes'/>
+  <cpu type='tcg' name='phenom-v1' usable='no'>
+    <blocker name='fxsr-opt'/>
+  </cpu>
   <cpu type='tcg' name='phenom' usable='no'>
     <blocker name='fxsr-opt'/>
   </cpu>
+  <cpu type='tcg' name='pentium3-v1' usable='yes'/>
   <cpu type='tcg' name='pentium3' usable='yes'/>
+  <cpu type='tcg' name='pentium2-v1' usable='yes'/>
   <cpu type='tcg' name='pentium2' usable='yes'/>
+  <cpu type='tcg' name='pentium-v1' usable='yes'/>
   <cpu type='tcg' name='pentium' usable='yes'/>
+  <cpu type='tcg' name='n270-v1' usable='yes'/>
   <cpu type='tcg' name='n270' usable='yes'/>
+  <cpu type='tcg' name='kvm64-v1' usable='yes'/>
   <cpu type='tcg' name='kvm64' usable='yes'/>
+  <cpu type='tcg' name='kvm32-v1' usable='yes'/>
   <cpu type='tcg' name='kvm32' usable='yes'/>
+  <cpu type='tcg' name='coreduo-v1' usable='yes'/>
   <cpu type='tcg' name='coreduo' usable='yes'/>
+  <cpu type='tcg' name='core2duo-v1' usable='yes'/>
   <cpu type='tcg' name='core2duo' usable='yes'/>
+  <cpu type='tcg' name='athlon-v1' usable='yes'/>
   <cpu type='tcg' name='athlon' usable='yes'/>
+  <cpu type='tcg' name='Westmere-v2' usable='no'>
+    <blocker name='spec-ctrl'/>
+  </cpu>
+  <cpu type='tcg' name='Westmere-v1' usable='yes'/>
   <cpu type='tcg' name='Westmere-IBRS' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Westmere' usable='yes'/>
+  <cpu type='tcg' name='Westmere' usable='no'>
+    <blocker name='spec-ctrl'/>
+  </cpu>
+  <cpu type='tcg' name='Snowridge-v1' usable='no'>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='rdseed'/>
+    <blocker name='sha-ni'/>
+    <blocker name='umip'/>
+    <blocker name='gfni'/>
+    <blocker name='cldemote'/>
+    <blocker name='movdiri'/>
+    <blocker name='movdir64b'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='arch-capabilities'/>
+    <blocker name='core-capability'/>
+    <blocker name='ssbd'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xsavec'/>
+    <blocker name='split-lock-detect'/>
+  </cpu>
+  <cpu type='tcg' name='Snowridge' usable='no'>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='rdseed'/>
+    <blocker name='sha-ni'/>
+    <blocker name='umip'/>
+    <blocker name='gfni'/>
+    <blocker name='cldemote'/>
+    <blocker name='movdiri'/>
+    <blocker name='movdir64b'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='arch-capabilities'/>
+    <blocker name='core-capability'/>
+    <blocker name='ssbd'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xsavec'/>
+    <blocker name='split-lock-detect'/>
+  </cpu>
+  <cpu type='tcg' name='Skylake-Server-v2' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='pcid'/>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='hle'/>
+    <blocker name='avx2'/>
+    <blocker name='invpcid'/>
+    <blocker name='rtm'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='rdseed'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xsavec'/>
+  </cpu>
+  <cpu type='tcg' name='Skylake-Server-v1' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='pcid'/>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='hle'/>
+    <blocker name='avx2'/>
+    <blocker name='invpcid'/>
+    <blocker name='rtm'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='rdseed'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xsavec'/>
+  </cpu>
   <cpu type='tcg' name='Skylake-Server-IBRS' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
@@ -863,6 +1194,38 @@
     <blocker name='avx512cd'/>
     <blocker name='avx512bw'/>
     <blocker name='avx512vl'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xsavec'/>
+  </cpu>
+  <cpu type='tcg' name='Skylake-Client-v2' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='pcid'/>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='hle'/>
+    <blocker name='avx2'/>
+    <blocker name='invpcid'/>
+    <blocker name='rtm'/>
+    <blocker name='rdseed'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xsavec'/>
+  </cpu>
+  <cpu type='tcg' name='Skylake-Client-v1' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='pcid'/>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='hle'/>
+    <blocker name='avx2'/>
+    <blocker name='invpcid'/>
+    <blocker name='rtm'/>
+    <blocker name='rdseed'/>
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
@@ -894,9 +1257,21 @@
     <blocker name='invpcid'/>
     <blocker name='rtm'/>
     <blocker name='rdseed'/>
+    <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
+  <cpu type='tcg' name='SandyBridge-v2' usable='no'>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='spec-ctrl'/>
+  </cpu>
+  <cpu type='tcg' name='SandyBridge-v1' usable='no'>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+  </cpu>
   <cpu type='tcg' name='SandyBridge-IBRS' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
@@ -907,8 +1282,21 @@
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
+    <blocker name='spec-ctrl'/>
   </cpu>
+  <cpu type='tcg' name='Penryn-v1' usable='yes'/>
   <cpu type='tcg' name='Penryn' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G5-v1' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='misalignsse'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+    <blocker name='tbm'/>
+    <blocker name='nrip-save'/>
+  </cpu>
   <cpu type='tcg' name='Opteron_G5' usable='no'>
     <blocker name='fma'/>
     <blocker name='avx'/>
@@ -920,6 +1308,14 @@
     <blocker name='tbm'/>
     <blocker name='nrip-save'/>
   </cpu>
+  <cpu type='tcg' name='Opteron_G4-v1' usable='no'>
+    <blocker name='avx'/>
+    <blocker name='misalignsse'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xop'/>
+    <blocker name='fma4'/>
+    <blocker name='nrip-save'/>
+  </cpu>
   <cpu type='tcg' name='Opteron_G4' usable='no'>
     <blocker name='avx'/>
     <blocker name='misalignsse'/>
@@ -928,15 +1324,43 @@
     <blocker name='fma4'/>
     <blocker name='nrip-save'/>
   </cpu>
+  <cpu type='tcg' name='Opteron_G3-v1' usable='no'>
+    <blocker name='misalignsse'/>
+  </cpu>
   <cpu type='tcg' name='Opteron_G3' usable='no'>
     <blocker name='misalignsse'/>
   </cpu>
+  <cpu type='tcg' name='Opteron_G2-v1' usable='yes'/>
   <cpu type='tcg' name='Opteron_G2' usable='yes'/>
+  <cpu type='tcg' name='Opteron_G1-v1' usable='yes'/>
   <cpu type='tcg' name='Opteron_G1' usable='yes'/>
+  <cpu type='tcg' name='Nehalem-v2' usable='no'>
+    <blocker name='spec-ctrl'/>
+  </cpu>
+  <cpu type='tcg' name='Nehalem-v1' usable='yes'/>
   <cpu type='tcg' name='Nehalem-IBRS' usable='no'>
     <blocker name='spec-ctrl'/>
   </cpu>
-  <cpu type='tcg' name='Nehalem' usable='yes'/>
+  <cpu type='tcg' name='Nehalem' usable='no'>
+    <blocker name='spec-ctrl'/>
+  </cpu>
+  <cpu type='tcg' name='KnightsMill-v1' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='avx2'/>
+    <blocker name='avx512f'/>
+    <blocker name='rdseed'/>
+    <blocker name='avx512pf'/>
+    <blocker name='avx512er'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512-vpopcntdq'/>
+    <blocker name='avx512-4vnniw'/>
+    <blocker name='avx512-4fmaps'/>
+    <blocker name='3dnowprefetch'/>
+  </cpu>
   <cpu type='tcg' name='KnightsMill' usable='no'>
     <blocker name='fma'/>
     <blocker name='x2apic'/>
@@ -954,6 +1378,19 @@
     <blocker name='avx512-4fmaps'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
+  <cpu type='tcg' name='IvyBridge-v2' usable='no'>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='spec-ctrl'/>
+  </cpu>
+  <cpu type='tcg' name='IvyBridge-v1' usable='no'>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+  </cpu>
   <cpu type='tcg' name='IvyBridge-IBRS' usable='no'>
     <blocker name='x2apic'/>
     <blocker name='tsc-deadline'/>
@@ -966,6 +1403,39 @@
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
+    <blocker name='spec-ctrl'/>
+  </cpu>
+  <cpu type='tcg' name='Icelake-Server-v1' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='pcid'/>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='hle'/>
+    <blocker name='avx2'/>
+    <blocker name='invpcid'/>
+    <blocker name='rtm'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='rdseed'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='avx512vbmi'/>
+    <blocker name='umip'/>
+    <blocker name='avx512vbmi2'/>
+    <blocker name='gfni'/>
+    <blocker name='vaes'/>
+    <blocker name='vpclmulqdq'/>
+    <blocker name='avx512vnni'/>
+    <blocker name='avx512bitalg'/>
+    <blocker name='avx512-vpopcntdq'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='ssbd'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='wbnoinvd'/>
+    <blocker name='xsavec'/>
   </cpu>
   <cpu type='tcg' name='Icelake-Server' usable='no'>
     <blocker name='fma'/>
@@ -999,6 +1469,33 @@
     <blocker name='wbnoinvd'/>
     <blocker name='xsavec'/>
   </cpu>
+  <cpu type='tcg' name='Icelake-Client-v1' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='pcid'/>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='hle'/>
+    <blocker name='avx2'/>
+    <blocker name='invpcid'/>
+    <blocker name='rtm'/>
+    <blocker name='rdseed'/>
+    <blocker name='avx512vbmi'/>
+    <blocker name='umip'/>
+    <blocker name='avx512vbmi2'/>
+    <blocker name='gfni'/>
+    <blocker name='vaes'/>
+    <blocker name='vpclmulqdq'/>
+    <blocker name='avx512vnni'/>
+    <blocker name='avx512bitalg'/>
+    <blocker name='avx512-vpopcntdq'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='ssbd'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='wbnoinvd'/>
+    <blocker name='xsavec'/>
+  </cpu>
   <cpu type='tcg' name='Icelake-Client' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
@@ -1026,6 +1523,52 @@
     <blocker name='wbnoinvd'/>
     <blocker name='xsavec'/>
   </cpu>
+  <cpu type='tcg' name='Haswell-v4' 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='spec-ctrl'/>
+  </cpu>
+  <cpu type='tcg' name='Haswell-v3' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='pcid'/>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='hle'/>
+    <blocker name='avx2'/>
+    <blocker name='invpcid'/>
+    <blocker name='rtm'/>
+    <blocker name='spec-ctrl'/>
+  </cpu>
+  <cpu type='tcg' name='Haswell-v2' 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'/>
+  </cpu>
+  <cpu type='tcg' name='Haswell-v1' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='pcid'/>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='hle'/>
+    <blocker name='avx2'/>
+    <blocker name='invpcid'/>
+    <blocker name='rtm'/>
+  </cpu>
   <cpu type='tcg' name='Haswell-noTSX-IBRS' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
@@ -1067,10 +1610,40 @@
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
-    <blocker name='hle'/>
     <blocker name='avx2'/>
     <blocker name='invpcid'/>
-    <blocker name='rtm'/>
+    <blocker name='spec-ctrl'/>
+  </cpu>
+  <cpu type='tcg' name='EPYC-v2' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='avx2'/>
+    <blocker name='rdseed'/>
+    <blocker name='sha-ni'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='misalignsse'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='osvw'/>
+    <blocker name='topoext'/>
+    <blocker name='ibpb'/>
+    <blocker name='nrip-save'/>
+    <blocker name='xsavec'/>
+  </cpu>
+  <cpu type='tcg' name='EPYC-v1' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='avx2'/>
+    <blocker name='rdseed'/>
+    <blocker name='sha-ni'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='misalignsse'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='osvw'/>
+    <blocker name='topoext'/>
+    <blocker name='nrip-save'/>
+    <blocker name='xsavec'/>
   </cpu>
   <cpu type='tcg' name='EPYC-IBPB' usable='no'>
     <blocker name='fma'/>
@@ -1100,6 +1673,22 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='osvw'/>
     <blocker name='topoext'/>
+    <blocker name='ibpb'/>
+    <blocker name='nrip-save'/>
+    <blocker name='xsavec'/>
+  </cpu>
+  <cpu type='tcg' name='Dhyana-v1' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='avx2'/>
+    <blocker name='rdseed'/>
+    <blocker name='fxsr-opt'/>
+    <blocker name='misalignsse'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='osvw'/>
+    <blocker name='topoext'/>
+    <blocker name='ibpb'/>
     <blocker name='nrip-save'/>
     <blocker name='xsavec'/>
   </cpu>
@@ -1118,8 +1707,37 @@
     <blocker name='nrip-save'/>
     <blocker name='xsavec'/>
   </cpu>
+  <cpu type='tcg' name='Conroe-v1' usable='yes'/>
   <cpu type='tcg' name='Conroe' usable='yes'/>
-  <cpu type='tcg' name='Cascadelake-Server' usable='no'>
+  <cpu type='tcg' name='Cascadelake-Server-v2' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='pcid'/>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='hle'/>
+    <blocker name='avx2'/>
+    <blocker name='invpcid'/>
+    <blocker name='rtm'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='rdseed'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='avx512vnni'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='arch-capabilities'/>
+    <blocker name='ssbd'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xsavec'/>
+    <blocker name='rdctl-no'/>
+    <blocker name='ibrs-all'/>
+    <blocker name='skip-l1dfl-vmentry'/>
+    <blocker name='mds-no'/>
+  </cpu>
+  <cpu type='tcg' name='Cascadelake-Server-v1' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
     <blocker name='x2apic'/>
@@ -1142,6 +1760,88 @@
     <blocker name='3dnowprefetch'/>
     <blocker name='xsavec'/>
   </cpu>
+  <cpu type='tcg' name='Cascadelake-Server' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='pcid'/>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='hle'/>
+    <blocker name='avx2'/>
+    <blocker name='invpcid'/>
+    <blocker name='rtm'/>
+    <blocker name='avx512f'/>
+    <blocker name='avx512dq'/>
+    <blocker name='rdseed'/>
+    <blocker name='avx512cd'/>
+    <blocker name='avx512bw'/>
+    <blocker name='avx512vl'/>
+    <blocker name='avx512vnni'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='arch-capabilities'/>
+    <blocker name='ssbd'/>
+    <blocker name='3dnowprefetch'/>
+    <blocker name='xsavec'/>
+    <blocker name='rdctl-no'/>
+    <blocker name='ibrs-all'/>
+    <blocker name='skip-l1dfl-vmentry'/>
+    <blocker name='mds-no'/>
+  </cpu>
+  <cpu type='tcg' name='Broadwell-v4' 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='rdseed'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='3dnowprefetch'/>
+  </cpu>
+  <cpu type='tcg' name='Broadwell-v3' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='pcid'/>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='hle'/>
+    <blocker name='avx2'/>
+    <blocker name='invpcid'/>
+    <blocker name='rtm'/>
+    <blocker name='rdseed'/>
+    <blocker name='spec-ctrl'/>
+    <blocker name='3dnowprefetch'/>
+  </cpu>
+  <cpu type='tcg' name='Broadwell-v2' 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='rdseed'/>
+    <blocker name='3dnowprefetch'/>
+  </cpu>
+  <cpu type='tcg' name='Broadwell-v1' usable='no'>
+    <blocker name='fma'/>
+    <blocker name='pcid'/>
+    <blocker name='x2apic'/>
+    <blocker name='tsc-deadline'/>
+    <blocker name='avx'/>
+    <blocker name='f16c'/>
+    <blocker name='hle'/>
+    <blocker name='avx2'/>
+    <blocker name='invpcid'/>
+    <blocker name='rtm'/>
+    <blocker name='rdseed'/>
+    <blocker name='3dnowprefetch'/>
+  </cpu>
   <cpu type='tcg' name='Broadwell-noTSX-IBRS' usable='no'>
     <blocker name='fma'/>
     <blocker name='pcid'/>
@@ -1189,13 +1889,13 @@
     <blocker name='tsc-deadline'/>
     <blocker name='avx'/>
     <blocker name='f16c'/>
-    <blocker name='hle'/>
     <blocker name='avx2'/>
     <blocker name='invpcid'/>
-    <blocker name='rtm'/>
     <blocker name='rdseed'/>
+    <blocker name='spec-ctrl'/>
     <blocker name='3dnowprefetch'/>
   </cpu>
+  <cpu type='tcg' name='486-v1' usable='yes'/>
   <cpu type='tcg' name='486' usable='yes'/>
   <machine name='pc-i440fx-4.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
   <machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>