From c49af8d2bd515bf3b107e4411352cfa794aa1b96 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 10 Feb 2021 16:31:59 +0100
Subject: [PATCH] qemucapabilitiesdata: Update test data for qemu-6.0 on x86_64

Include the 'transform' member of 'block-bitmap-mapping'. This is based
on qemu commit v5.2.0-2208-gc79f01c945

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---
 .../caps_6.0.0.x86_64.replies                 | 751 ++++++++++--------
 .../caps_6.0.0.x86_64.xml                     |  22 +-
 2 files changed, 446 insertions(+), 327 deletions(-)

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
index a1e3850b59..04ebd04583 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
@@ -21,7 +21,7 @@
       "minor": 2,
       "major": 5
     },
-    "package": "v5.2.0-1810-g2436651b26"
+    "package": "v5.2.0-2208-gc79f01c945"
   },
   "id": "libvirt-2"
 }
@@ -811,6 +811,10 @@
       "name": "usb-hub",
       "parent": "usb-device"
     },
+    {
+      "name": "chardev-serial",
+      "parent": "chardev-fd"
+    },
     {
       "name": "virtio-blk-device",
       "parent": "virtio-device"
@@ -852,8 +856,8 @@
       "parent": "accel"
     },
     {
-      "name": "chardev-serial",
-      "parent": "chardev-fd"
+      "name": "Cooperlake-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "vhost-user-vsock-pci",
@@ -907,10 +911,6 @@
       "name": "pxb-host",
       "parent": "pci-host-bridge"
     },
-    {
-      "name": "Cooperlake-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "scsi-disk",
       "parent": "scsi-disk-base"
@@ -1143,6 +1143,10 @@
       "name": "i82557c",
       "parent": "pci-device"
     },
+    {
+      "name": "i82557b",
+      "parent": "pci-device"
+    },
     {
       "name": "virtio-scsi-device",
       "parent": "virtio-scsi-common"
@@ -1151,10 +1155,6 @@
       "name": "pxb-pcie",
       "parent": "pci-device"
     },
-    {
-      "name": "i82557b",
-      "parent": "pci-device"
-    },
     {
       "name": "Haswell-IBRS-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -1172,12 +1172,8 @@
       "parent": "sys-bus-device"
     },
     {
-      "name": "chardev-memory",
-      "parent": "chardev-ringbuf"
-    },
-    {
-      "name": "pc-q35-2.8-machine",
-      "parent": "generic-pc-machine"
+      "name": "i82557a",
+      "parent": "pci-device"
     },
     {
       "name": "vhost-user-scsi-pci-non-transitional",
@@ -1188,12 +1184,16 @@
       "parent": "isa-device"
     },
     {
-      "name": "generic-sdhci",
-      "parent": "sys-bus-device"
+      "name": "chardev-udp",
+      "parent": "chardev"
     },
     {
-      "name": "i82557a",
-      "parent": "pci-device"
+      "name": "pc-q35-2.8-machine",
+      "parent": "generic-pc-machine"
+    },
+    {
+      "name": "generic-sdhci",
+      "parent": "sys-bus-device"
     },
     {
       "name": "virtio-scsi-pci-non-transitional",
@@ -1212,8 +1212,8 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "chardev-udp",
-      "parent": "chardev"
+      "name": "chardev-memory",
+      "parent": "chardev-ringbuf"
     },
     {
       "name": "EPYC-Rome-v1-x86_64-cpu",
@@ -1311,14 +1311,14 @@
       "name": "isabus-bridge",
       "parent": "sys-bus-device"
     },
-    {
-      "name": "ne2k_pci",
-      "parent": "pci-device"
-    },
     {
       "name": "IvyBridge-v2-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "ne2k_pci",
+      "parent": "pci-device"
+    },
     {
       "name": "usb-bus",
       "parent": "bus"
@@ -1328,29 +1328,25 @@
       "parent": "ide-device"
     },
     {
-      "name": "tcg-accel",
-      "parent": "accel"
+      "name": "qemu:memory-region",
+      "parent": "object"
     },
     {
-      "name": "piix4-ide",
-      "parent": "pci-ide"
+      "name": "tcg-accel",
+      "parent": "accel"
     },
     {
       "name": "virtio-balloon-pci",
       "parent": "virtio-balloon-pci-base"
     },
-    {
-      "name": "Cascadelake-Server-v2-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
-    {
-      "name": "qemu:memory-region",
-      "parent": "object"
-    },
     {
       "name": "virtio-gpu-device",
       "parent": "virtio-gpu-base"
     },
+    {
+      "name": "Cascadelake-Server-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "e1000",
       "parent": "e1000-base"
@@ -1367,6 +1363,10 @@
       "name": "ES1370",
       "parent": "pci-device"
     },
+    {
+      "name": "pc-i440fx-2.6-machine",
+      "parent": "generic-pc-machine"
+    },
     {
       "name": "i82551",
       "parent": "pci-device"
@@ -1384,8 +1384,8 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "pc-i440fx-2.6-machine",
-      "parent": "generic-pc-machine"
+      "name": "piix4-ide",
+      "parent": "pci-ide"
     },
     {
       "name": "SandyBridge-x86_64-cpu",
@@ -1403,14 +1403,14 @@
       "name": "pc-q35-6.0-machine",
       "parent": "generic-pc-machine"
     },
-    {
-      "name": "vhost-user-backend",
-      "parent": "object"
-    },
     {
       "name": "mioe3680_pci",
       "parent": "pci-device"
     },
+    {
+      "name": "vhost-user-backend",
+      "parent": "object"
+    },
     {
       "name": "vmxnet3",
       "parent": "pci-device"
@@ -1479,14 +1479,14 @@
       "name": "ati-vga",
       "parent": "pci-device"
     },
-    {
-      "name": "pentium3-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "kvm-i8259",
       "parent": "pic-common"
     },
+    {
+      "name": "pentium3-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "isa-serial",
       "parent": "isa-device"
@@ -1495,6 +1495,10 @@
       "name": "imx.usbphy",
       "parent": "sys-bus-device"
     },
+    {
+      "name": "x-remote-object",
+      "parent": "object"
+    },
     {
       "name": "core2duo-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -1527,6 +1531,10 @@
       "name": "i82559er",
       "parent": "pci-device"
     },
+    {
+      "name": "remote-pcihost",
+      "parent": "pcie-host-bridge"
+    },
     {
       "name": "virtio-serial-pci",
       "parent": "virtio-serial-pci-base"
@@ -1679,14 +1687,14 @@
       "name": "pci-ohci",
       "parent": "pci-device"
     },
-    {
-      "name": "virtio-tablet-device",
-      "parent": "virtio-input-hid-device"
-    },
     {
       "name": "Haswell-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "virtio-tablet-device",
+      "parent": "virtio-input-hid-device"
+    },
     {
       "name": "ccid-card-passthru",
       "parent": "ccid-card"
@@ -1844,8 +1852,8 @@
       "parent": "chardev-spice"
     },
     {
-      "name": "tls-creds-x509",
-      "parent": "tls-creds"
+      "name": "qio-channel-command",
+      "parent": "qio-channel"
     },
     {
       "name": "Opteron_G3-v1-x86_64-cpu",
@@ -1860,8 +1868,8 @@
       "parent": "virtio-blk-pci-base"
     },
     {
-      "name": "qio-channel-command",
-      "parent": "qio-channel"
+      "name": "tls-creds-x509",
+      "parent": "tls-creds"
     },
     {
       "name": "pc-i440fx-2.4-machine",
@@ -1932,21 +1940,21 @@
       "parent": "virtio-iommu-device-base"
     },
     {
-      "name": "chardev-braille",
-      "parent": "chardev"
+      "name": "vmcoreinfo",
+      "parent": "device"
     },
     {
       "name": "Icelake-Client-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
-    {
-      "name": "vmcoreinfo",
-      "parent": "device"
-    },
     {
       "name": "tpci200",
       "parent": "pci-device"
     },
+    {
+      "name": "chardev-braille",
+      "parent": "chardev"
+    },
     {
       "name": "rocker",
       "parent": "pci-device"
@@ -1963,10 +1971,6 @@
       "name": "qio-channel-socket",
       "parent": "qio-channel"
     },
-    {
-      "name": "chardev-socket",
-      "parent": "chardev"
-    },
     {
       "name": "coreduo-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -1984,17 +1988,13 @@
       "parent": "object"
     },
     {
-      "name": "hyperv-testdev",
-      "parent": "isa-device"
+      "name": "chardev-socket",
+      "parent": "chardev"
     },
     {
       "name": "clock",
       "parent": "object"
     },
-    {
-      "name": "virtio-net-device",
-      "parent": "virtio-device"
-    },
     {
       "name": "Haswell-v2-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -2003,18 +2003,22 @@
       "name": "host-x86_64-cpu",
       "parent": "max-x86_64-cpu"
     },
+    {
+      "name": "secret",
+      "parent": "secret_common"
+    },
     {
       "name": "usb-ehci",
       "parent": "pci-ehci-usb"
     },
-    {
-      "name": "pc-i440fx-2.11-machine",
-      "parent": "generic-pc-machine"
-    },
     {
       "name": "pxb",
       "parent": "pci-device"
     },
+    {
+      "name": "pc-i440fx-2.11-machine",
+      "parent": "generic-pc-machine"
+    },
     {
       "name": "AC97",
       "parent": "pci-device"
@@ -2023,6 +2027,10 @@
       "name": "vmgenid",
       "parent": "device"
     },
+    {
+      "name": "Westmere-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "virtio-pmem",
       "parent": "virtio-device"
@@ -2031,6 +2039,10 @@
       "name": "nvme-bus",
       "parent": "bus"
     },
+    {
+      "name": "virtconsole",
+      "parent": "virtserialport"
+    },
     {
       "name": "virtio-net-pci-non-transitional",
       "parent": "virtio-net-pci-base"
@@ -2048,8 +2060,8 @@
       "parent": "scsi-disk-base"
     },
     {
-      "name": "secret",
-      "parent": "secret_common"
+      "name": "Cascadelake-Server-noTSX-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "usb-kbd",
@@ -2064,21 +2076,25 @@
       "parent": "device"
     },
     {
-      "name": "usb-mtp",
-      "parent": "usb-device"
+      "name": "virtio-net-device",
+      "parent": "virtio-device"
     },
     {
       "name": "filter-replay",
       "parent": "netfilter"
     },
     {
-      "name": "Cascadelake-Server-noTSX-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "usb-mtp",
+      "parent": "usb-device"
     },
     {
       "name": "input-linux",
       "parent": "object"
     },
+    {
+      "name": "ccid-card-emulated",
+      "parent": "ccid-card"
+    },
     {
       "name": "pc-q35-2.9-machine",
       "parent": "generic-pc-machine"
@@ -2088,37 +2104,37 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "pc-q35-5.1-machine",
-      "parent": "generic-pc-machine"
+      "name": "hyperv-testdev",
+      "parent": "isa-device"
     },
     {
       "name": "s3c-sdhci",
       "parent": "generic-sdhci"
     },
     {
-      "name": "tpm-tis",
-      "parent": "isa-device"
+      "name": "filter-mirror",
+      "parent": "netfilter"
     },
     {
       "name": "fw_cfg_mem",
       "parent": "fw_cfg"
     },
-    {
-      "name": "Westmere-v2-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
-    {
-      "name": "ccid-card-emulated",
-      "parent": "ccid-card"
-    },
-    {
-      "name": "virtconsole",
-      "parent": "virtserialport"
-    },
     {
       "name": "pc-i440fx-1.7-machine",
       "parent": "generic-pc-machine"
     },
+    {
+      "name": "tpm-tis",
+      "parent": "isa-device"
+    },
+    {
+      "name": "pc-q35-5.1-machine",
+      "parent": "generic-pc-machine"
+    },
+    {
+      "name": "x-pci-proxy-dev",
+      "parent": "pci-device"
+    },
     {
       "name": "virtio-mouse-device",
       "parent": "virtio-input-hid-device"
@@ -2131,14 +2147,14 @@
       "name": "ioh3420",
       "parent": "pcie-root-port-base"
     },
-    {
-      "name": "filter-mirror",
-      "parent": "netfilter"
-    },
     {
       "name": "Skylake-Client-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "x-remote-machine",
+      "parent": "machine"
+    },
     {
       "name": "throttle-group",
       "parent": "object"
@@ -2547,6 +2563,10 @@
       "name": "pvpanic-pci",
       "parent": "pci-device"
     },
+    {
+      "name": "virtio-balloon-device",
+      "parent": "virtio-device"
+    },
     {
       "name": "Cooperlake-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -2555,29 +2575,25 @@
       "name": "Cascadelake-Server-v3-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
-    {
-      "name": "Nehalem-IBRS-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
-    {
-      "name": "virtio-balloon-device",
-      "parent": "virtio-device"
-    },
     {
       "name": "cfi.pflash01",
       "parent": "sys-bus-device"
     },
     {
-      "name": "Skylake-Server-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "isa-parallel",
+      "parent": "isa-device"
     },
     {
       "name": "pc-q35-2.7-machine",
       "parent": "generic-pc-machine"
     },
     {
-      "name": "isa-parallel",
-      "parent": "isa-device"
+      "name": "Skylake-Server-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
+    {
+      "name": "Nehalem-IBRS-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "pentium2-v1-x86_64-cpu",
@@ -2675,14 +2691,14 @@
       "name": "virtio-pmem-pci",
       "parent": "virtio-pmem-pci-base"
     },
-    {
-      "name": "virtio-tablet-pci",
-      "parent": "virtio-tablet-pci-base-type"
-    },
     {
       "name": "accel",
       "parent": "object"
     },
+    {
+      "name": "virtio-tablet-pci",
+      "parent": "virtio-tablet-pci-base-type"
+    },
     {
       "name": "dc390",
       "parent": "am53c974"
@@ -2796,8 +2812,8 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "kvm64-v1-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "pcie-root-port",
+      "parent": "pcie-root-port-base"
     },
     {
       "name": "IDE",
@@ -2808,8 +2824,8 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "pcie-root-port",
-      "parent": "pcie-root-port-base"
+      "name": "kvm64-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "mptsas1068",
@@ -7314,6 +7330,10 @@
       "name": "xsaves",
       "type": "bool"
     },
+    {
+      "name": "vgif",
+      "type": "bool"
+    },
     {
       "name": "mce",
       "type": "bool"
@@ -7443,6 +7463,10 @@
       "name": "tcg-cpuid",
       "type": "bool"
     },
+    {
+      "name": "vmx-entry-load-pkrs",
+      "type": "bool"
+    },
     {
       "name": "x-hv-max-vps",
       "type": "int32"
@@ -7700,6 +7724,10 @@
       "name": "kvm-pv-tlb-flush",
       "type": "bool"
     },
+    {
+      "name": "vmx-rdtsc-exit",
+      "type": "bool"
+    },
     {
       "name": "vmx-cr8-load-exit",
       "type": "bool"
@@ -7713,7 +7741,11 @@
       "type": "bool"
     },
     {
-      "name": "vmx-rdtsc-exit",
+      "name": "svme-addr-chk",
+      "type": "bool"
+    },
+    {
+      "name": "vmx-exit-load-pkrs",
       "type": "bool"
     },
     {
@@ -7855,6 +7887,14 @@
       "description": "on/off",
       "type": "bool"
     },
+    {
+      "name": "avic",
+      "type": "bool"
+    },
+    {
+      "name": "ds",
+      "type": "bool"
+    },
     {
       "name": "legacy-cache",
       "type": "bool"
@@ -7873,11 +7913,11 @@
       "type": "bool"
     },
     {
-      "name": "ds",
+      "name": "osvw",
       "type": "bool"
     },
     {
-      "name": "osvw",
+      "name": "pks",
       "type": "bool"
     },
     {
@@ -7904,6 +7944,10 @@
       "name": "vmx-cr8-store-exit",
       "type": "bool"
     },
+    {
+      "name": "vmx-ept-1gb",
+      "type": "bool"
+    },
     {
       "name": "nrip-save",
       "type": "bool"
@@ -7917,7 +7961,7 @@
       "type": "bool"
     },
     {
-      "name": "lmce",
+      "name": "vmx-ept-2mb",
       "type": "bool"
     },
     {
@@ -7937,7 +7981,7 @@
       "type": "bool"
     },
     {
-      "name": "sse2",
+      "name": "lmce",
       "type": "bool"
     },
     {
@@ -7964,10 +8008,6 @@
       "name": "kvm-msi-ext-dest-id",
       "type": "bool"
     },
-    {
-      "name": "vmx-ept-1gb",
-      "type": "bool"
-    },
     {
       "name": "avx",
       "type": "bool"
@@ -7976,6 +8016,10 @@
       "name": "topoext",
       "type": "bool"
     },
+    {
+      "name": "sse2",
+      "type": "bool"
+    },
     {
       "name": "rdctl-no",
       "type": "bool"
@@ -8171,7 +8215,7 @@
       "type": "bool"
     },
     {
-      "name": "vmx-ept-2mb",
+      "name": "vmx-page-walk-4",
       "type": "bool"
     },
     {
@@ -8239,7 +8283,7 @@
       "type": "bool"
     },
     {
-      "name": "vmx-page-walk-4",
+      "name": "v-vmsave-vmload",
       "type": "bool"
     },
     {
@@ -8647,13 +8691,11 @@
       "default-ram-id": "pc.ram"
     },
     {
-      "hotpluggable-cpus": true,
-      "name": "pc-i440fx-1.7",
-      "numa-mem-supported": true,
-      "default-cpu-type": "qemu64-x86_64-cpu",
-      "cpu-max": 255,
-      "deprecated": false,
-      "default-ram-id": "pc.ram"
+      "hotpluggable-cpus": false,
+      "name": "x-remote",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
@@ -8664,6 +8706,15 @@
       "deprecated": false,
       "default-ram-id": "pc.ram"
     },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.7",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false,
+      "default-ram-id": "pc.ram"
+    },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-2.9",
@@ -10859,132 +10910,8 @@
     },
     {
       "parameters": [
-        {
-          "name": "rendernode",
-          "type": "string"
-        },
-        {
-          "name": "gl",
-          "type": "boolean"
-        },
-        {
-          "name": "head",
-          "type": "number"
-        },
-        {
-          "name": "display",
-          "type": "string"
-        },
-        {
-          "name": "seamless-migration",
-          "type": "boolean"
-        },
-        {
-          "name": "playback-compression",
-          "type": "boolean"
-        },
-        {
-          "name": "agent-mouse",
-          "type": "boolean"
-        },
-        {
-          "name": "streaming-video",
-          "type": "string"
-        },
-        {
-          "name": "zlib-glz-wan-compression",
-          "type": "string"
-        },
-        {
-          "name": "jpeg-wan-compression",
-          "type": "string"
-        },
-        {
-          "name": "image-compression",
-          "type": "string"
-        },
-        {
-          "name": "plaintext-channel",
-          "type": "string"
-        },
-        {
-          "name": "tls-channel",
-          "type": "string"
-        },
-        {
-          "name": "tls-ciphers",
-          "type": "string"
-        },
-        {
-          "name": "x509-dh-key-file",
-          "type": "string"
-        },
-        {
-          "name": "x509-cacert-file",
-          "type": "string"
-        },
-        {
-          "name": "x509-cert-file",
-          "type": "string"
-        },
-        {
-          "name": "x509-key-password",
-          "type": "string"
-        },
-        {
-          "name": "x509-key-file",
-          "type": "string"
-        },
-        {
-          "name": "x509-dir",
-          "type": "string"
-        },
-        {
-          "name": "sasl",
-          "type": "boolean"
-        },
-        {
-          "name": "disable-agent-file-xfer",
-          "type": "boolean"
-        },
-        {
-          "name": "disable-copy-paste",
-          "type": "boolean"
-        },
-        {
-          "name": "disable-ticketing",
-          "type": "boolean"
-        },
-        {
-          "name": "password",
-          "type": "string"
-        },
-        {
-          "name": "unix",
-          "type": "boolean"
-        },
-        {
-          "name": "ipv6",
-          "type": "boolean"
-        },
-        {
-          "name": "ipv4",
-          "type": "boolean"
-        },
-        {
-          "name": "addr",
-          "type": "string"
-        },
-        {
-          "name": "tls-port",
-          "type": "number"
-        },
-        {
-          "name": "port",
-          "type": "number"
-        }
       ],
-      "option": "spice"
+      "option": "acpi"
     },
     {
       "parameters": [
@@ -11205,6 +11132,135 @@
       ],
       "option": "smbios"
     },
+    {
+      "parameters": [
+        {
+          "name": "rendernode",
+          "type": "string"
+        },
+        {
+          "name": "gl",
+          "type": "boolean"
+        },
+        {
+          "name": "head",
+          "type": "number"
+        },
+        {
+          "name": "display",
+          "type": "string"
+        },
+        {
+          "name": "seamless-migration",
+          "type": "boolean"
+        },
+        {
+          "name": "playback-compression",
+          "type": "boolean"
+        },
+        {
+          "name": "agent-mouse",
+          "type": "boolean"
+        },
+        {
+          "name": "streaming-video",
+          "type": "string"
+        },
+        {
+          "name": "zlib-glz-wan-compression",
+          "type": "string"
+        },
+        {
+          "name": "jpeg-wan-compression",
+          "type": "string"
+        },
+        {
+          "name": "image-compression",
+          "type": "string"
+        },
+        {
+          "name": "plaintext-channel",
+          "type": "string"
+        },
+        {
+          "name": "tls-channel",
+          "type": "string"
+        },
+        {
+          "name": "tls-ciphers",
+          "type": "string"
+        },
+        {
+          "name": "x509-dh-key-file",
+          "type": "string"
+        },
+        {
+          "name": "x509-cacert-file",
+          "type": "string"
+        },
+        {
+          "name": "x509-cert-file",
+          "type": "string"
+        },
+        {
+          "name": "x509-key-password",
+          "type": "string"
+        },
+        {
+          "name": "x509-key-file",
+          "type": "string"
+        },
+        {
+          "name": "x509-dir",
+          "type": "string"
+        },
+        {
+          "name": "sasl",
+          "type": "boolean"
+        },
+        {
+          "name": "disable-agent-file-xfer",
+          "type": "boolean"
+        },
+        {
+          "name": "disable-copy-paste",
+          "type": "boolean"
+        },
+        {
+          "name": "disable-ticketing",
+          "type": "boolean"
+        },
+        {
+          "name": "password",
+          "type": "string"
+        },
+        {
+          "name": "unix",
+          "type": "boolean"
+        },
+        {
+          "name": "ipv6",
+          "type": "boolean"
+        },
+        {
+          "name": "ipv4",
+          "type": "boolean"
+        },
+        {
+          "name": "addr",
+          "type": "string"
+        },
+        {
+          "name": "tls-port",
+          "type": "number"
+        },
+        {
+          "name": "port",
+          "type": "number"
+        }
+      ],
+      "option": "spice"
+    },
     {
       "parameters": [
         {
@@ -11298,11 +11354,6 @@
       ],
       "option": "vnc"
     },
-    {
-      "parameters": [
-      ],
-      "option": "acpi"
-    },
     {
       "parameters": [
         {
@@ -19431,6 +19482,7 @@
         },
         {
           "name": "gpa",
+          "default": null,
           "type": "int"
         }
       ],
@@ -25357,6 +25409,11 @@
         {
           "name": "alias",
           "type": "str"
+        },
+        {
+          "name": "transform",
+          "default": null,
+          "type": "568"
         }
       ],
       "meta-type": "object"
@@ -25384,7 +25441,7 @@
       "members": [
         {
           "name": "data",
-          "type": "568"
+          "type": "569"
         }
       ],
       "meta-type": "object"
@@ -25760,7 +25817,7 @@
       "members": [
         {
           "name": "bus",
-          "type": "569"
+          "type": "570"
         },
         {
           "name": "devices",
@@ -25832,7 +25889,7 @@
       "members": [
         {
           "name": "data",
-          "type": "570"
+          "type": "571"
         }
       ],
       "meta-type": "object"
@@ -25842,7 +25899,7 @@
       "members": [
         {
           "name": "data",
-          "type": "571"
+          "type": "572"
         }
       ],
       "meta-type": "object"
@@ -25852,7 +25909,7 @@
       "members": [
         {
           "name": "data",
-          "type": "572"
+          "type": "573"
         }
       ],
       "meta-type": "object"
@@ -26047,7 +26104,7 @@
       "members": [
         {
           "name": "type",
-          "type": "573"
+          "type": "574"
         },
         {
           "name": "hash",
@@ -26126,13 +26183,13 @@
         },
         {
           "case": "luks",
-          "type": "575"
+          "type": "576"
         }
       ],
       "members": [
         {
           "name": "format",
-          "type": "574"
+          "type": "575"
         }
       ],
       "meta-type": "object"
@@ -26158,17 +26215,17 @@
       "variants": [
         {
           "case": "full",
-          "type": "577"
+          "type": "578"
         },
         {
           "case": "erasure-coded",
-          "type": "578"
+          "type": "579"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "576"
+          "type": "577"
         }
       ],
       "meta-type": "object"
@@ -26224,7 +26281,7 @@
       "variants": [
         {
           "case": "luks",
-          "type": "579"
+          "type": "580"
         },
         {
           "case": "qcow",
@@ -26234,7 +26291,7 @@
       "members": [
         {
           "name": "format",
-          "type": "574"
+          "type": "575"
         }
       ],
       "meta-type": "object"
@@ -26732,7 +26789,7 @@
       "members": [
         {
           "name": "button",
-          "type": "580"
+          "type": "581"
         },
         {
           "name": "down",
@@ -26746,7 +26803,7 @@
       "members": [
         {
           "name": "axis",
-          "type": "581"
+          "type": "582"
         },
         {
           "name": "value",
@@ -26758,11 +26815,22 @@
     {
       "name": "568",
       "members": [
+        {
+          "name": "persistent",
+          "default": null,
+          "type": "bool"
+        }
       ],
       "meta-type": "object"
     },
     {
       "name": "569",
+      "members": [
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "570",
       "members": [
         {
           "name": "number",
@@ -26778,21 +26846,21 @@
         },
         {
           "name": "io_range",
-          "type": "582"
+          "type": "583"
         },
         {
           "name": "memory_range",
-          "type": "582"
+          "type": "583"
         },
         {
           "name": "prefetchable_range",
-          "type": "582"
+          "type": "583"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "570",
+      "name": "571",
       "members": [
         {
           "name": "compat",
@@ -26830,12 +26898,12 @@
         {
           "name": "encrypt",
           "default": null,
-          "type": "583"
+          "type": "584"
         },
         {
           "name": "bitmaps",
           "default": null,
-          "type": "[584]"
+          "type": "[585]"
         },
         {
           "name": "compression-type",
@@ -26845,7 +26913,7 @@
       "meta-type": "object"
     },
     {
-      "name": "571",
+      "name": "572",
       "members": [
         {
           "name": "create-type",
@@ -26867,7 +26935,7 @@
       "meta-type": "object"
     },
     {
-      "name": "572",
+      "name": "573",
       "members": [
         {
           "name": "cipher-alg",
@@ -26904,13 +26972,13 @@
         },
         {
           "name": "slots",
-          "type": "[585]"
+          "type": "[586]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "573",
+      "name": "574",
       "meta-type": "enum",
       "values": [
         "md5",
@@ -26918,7 +26986,7 @@
       ]
     },
     {
-      "name": "574",
+      "name": "575",
       "meta-type": "enum",
       "values": [
         "qcow",
@@ -26926,7 +26994,7 @@
       ]
     },
     {
-      "name": "575",
+      "name": "576",
       "members": [
         {
           "name": "key-secret",
@@ -26967,7 +27035,7 @@
       "meta-type": "object"
     },
     {
-      "name": "576",
+      "name": "577",
       "meta-type": "enum",
       "values": [
         "full",
@@ -26975,7 +27043,7 @@
       ]
     },
     {
-      "name": "577",
+      "name": "578",
       "members": [
         {
           "name": "copies",
@@ -26985,7 +27053,7 @@
       "meta-type": "object"
     },
     {
-      "name": "578",
+      "name": "579",
       "members": [
         {
           "name": "data-strips",
@@ -26999,7 +27067,7 @@
       "meta-type": "object"
     },
     {
-      "name": "579",
+      "name": "580",
       "members": [
         {
           "name": "state",
@@ -27034,7 +27102,7 @@
       "meta-type": "object"
     },
     {
-      "name": "580",
+      "name": "581",
       "meta-type": "enum",
       "values": [
         "left",
@@ -27047,7 +27115,7 @@
       ]
     },
     {
-      "name": "581",
+      "name": "582",
       "meta-type": "enum",
       "values": [
         "x",
@@ -27055,7 +27123,7 @@
       ]
     },
     {
-      "name": "582",
+      "name": "583",
       "members": [
         {
           "name": "base",
@@ -27069,12 +27137,12 @@
       "meta-type": "object"
     },
     {
-      "name": "583",
+      "name": "584",
       "tag": "format",
       "variants": [
         {
           "case": "luks",
-          "type": "572"
+          "type": "573"
         },
         {
           "case": "aes",
@@ -27090,12 +27158,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[584]",
-      "element-type": "584",
+      "name": "[585]",
+      "element-type": "585",
       "meta-type": "array"
     },
     {
-      "name": "584",
+      "name": "585",
       "members": [
         {
           "name": "name",
@@ -27107,7 +27175,7 @@
         },
         {
           "name": "flags",
-          "type": "[586]"
+          "type": "[587]"
         }
       ],
       "meta-type": "object"
@@ -27118,12 +27186,12 @@
       "meta-type": "array"
     },
     {
-      "name": "[585]",
-      "element-type": "585",
+      "name": "[586]",
+      "element-type": "586",
       "meta-type": "array"
     },
     {
-      "name": "585",
+      "name": "586",
       "members": [
         {
           "name": "active",
@@ -27147,12 +27215,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[586]",
-      "element-type": "586",
+      "name": "[587]",
+      "element-type": "587",
       "meta-type": "array"
     },
     {
-      "name": "586",
+      "name": "587",
       "meta-type": "enum",
       "values": [
         "in-use",
@@ -27193,6 +27261,7 @@
       "name": "base",
       "props": {
         "vmx-entry-load-rtit-ctl": false,
+        "svme-addr-chk": false,
         "cmov": true,
         "ia64": false,
         "ssb-no": false,
@@ -27277,6 +27346,7 @@
         "vmx-unrestricted-guest": false,
         "vmx-cr3-store-noexit": false,
         "pku": false,
+        "pks": false,
         "smx": false,
         "cmp-legacy": true,
         "avx512-4fmaps": false,
@@ -27392,6 +27462,7 @@
         "kvmclock": true,
         "vmx-zero-len-inject": false,
         "pschange-mc-no": true,
+        "v-vmsave-vmload": false,
         "vmx-rdrand-exit": false,
         "lwp": false,
         "amd-ssbd": true,
@@ -27429,6 +27500,7 @@
         "vmx-movdr-exit": false,
         "pse": true,
         "avx2": true,
+        "avic": false,
         "sep": true,
         "virt-ssbd": true,
         "vmx-cr3-load-noexit": false,
@@ -27445,6 +27517,7 @@
         "amd-stibp": true,
         "vmx-preemption-timer": false,
         "clflushopt": true,
+        "vmx-entry-load-pkrs": false,
         "vmx-vnmi-pending": false,
         "monitor": false,
         "vmx-vintr-pending": false,
@@ -27454,6 +27527,7 @@
         "pcid": false,
         "taa-no": false,
         "arch-capabilities": true,
+        "vgif": false,
         "vmx-secondary-ctls": false,
         "vmx-xsaves": false,
         "clzero": true,
@@ -27488,6 +27562,7 @@
         "vmx-entry-load-efer": false,
         "model-id": "AMD Ryzen 9 3900X 12-Core Processor            ",
         "sha-ni": true,
+        "vmx-exit-load-pkrs": false,
         "abm": true,
         "vmx-ept-advanced-exitinfo": false,
         "avx512pf": false,
@@ -27519,6 +27594,7 @@
       "name": "base",
       "props": {
         "vmx-entry-load-rtit-ctl": false,
+        "svme-addr-chk": false,
         "cmov": true,
         "ia64": false,
         "ssb-no": false,
@@ -27603,6 +27679,7 @@
         "vmx-unrestricted-guest": false,
         "vmx-cr3-store-noexit": false,
         "pku": false,
+        "pks": false,
         "smx": false,
         "cmp-legacy": true,
         "avx512-4fmaps": false,
@@ -27718,6 +27795,7 @@
         "kvmclock": true,
         "vmx-zero-len-inject": false,
         "pschange-mc-no": true,
+        "v-vmsave-vmload": false,
         "vmx-rdrand-exit": false,
         "lwp": false,
         "amd-ssbd": true,
@@ -27755,6 +27833,7 @@
         "vmx-movdr-exit": false,
         "pse": true,
         "avx2": true,
+        "avic": false,
         "sep": true,
         "virt-ssbd": true,
         "vmx-cr3-load-noexit": false,
@@ -27771,6 +27850,7 @@
         "amd-stibp": true,
         "vmx-preemption-timer": false,
         "clflushopt": true,
+        "vmx-entry-load-pkrs": false,
         "vmx-vnmi-pending": false,
         "monitor": false,
         "vmx-vintr-pending": false,
@@ -27780,6 +27860,7 @@
         "pcid": false,
         "taa-no": false,
         "arch-capabilities": true,
+        "vgif": false,
         "vmx-secondary-ctls": false,
         "vmx-xsaves": false,
         "clzero": true,
@@ -27814,6 +27895,7 @@
         "vmx-entry-load-efer": false,
         "model-id": "AMD Ryzen 9 3900X 12-Core Processor            ",
         "sha-ni": true,
+        "vmx-exit-load-pkrs": false,
         "abm": true,
         "vmx-ept-advanced-exitinfo": false,
         "avx512pf": false,
@@ -30208,6 +30290,7 @@
       "name": "base",
       "props": {
         "vmx-entry-load-rtit-ctl": false,
+        "svme-addr-chk": false,
         "cmov": true,
         "ia64": false,
         "ssb-no": false,
@@ -30292,6 +30375,7 @@
         "vmx-unrestricted-guest": false,
         "vmx-cr3-store-noexit": false,
         "pku": true,
+        "pks": true,
         "smx": false,
         "cmp-legacy": false,
         "avx512-4fmaps": false,
@@ -30407,6 +30491,7 @@
         "kvmclock": false,
         "vmx-zero-len-inject": false,
         "pschange-mc-no": false,
+        "v-vmsave-vmload": false,
         "vmx-rdrand-exit": false,
         "lwp": false,
         "amd-ssbd": false,
@@ -30444,6 +30529,7 @@
         "vmx-movdr-exit": false,
         "pse": true,
         "avx2": false,
+        "avic": false,
         "sep": true,
         "virt-ssbd": false,
         "vmx-cr3-load-noexit": false,
@@ -30460,6 +30546,7 @@
         "amd-stibp": false,
         "vmx-preemption-timer": false,
         "clflushopt": true,
+        "vmx-entry-load-pkrs": false,
         "vmx-vnmi-pending": false,
         "monitor": true,
         "vmx-vintr-pending": false,
@@ -30469,6 +30556,7 @@
         "pcid": false,
         "taa-no": false,
         "arch-capabilities": false,
+        "vgif": false,
         "vmx-secondary-ctls": false,
         "vmx-xsaves": false,
         "clzero": false,
@@ -30503,6 +30591,7 @@
         "vmx-entry-load-efer": false,
         "model-id": "QEMU TCG CPU version 2.5+",
         "sha-ni": false,
+        "vmx-exit-load-pkrs": false,
         "abm": true,
         "vmx-ept-advanced-exitinfo": false,
         "avx512pf": false,
@@ -30534,6 +30623,7 @@
       "name": "base",
       "props": {
         "vmx-entry-load-rtit-ctl": false,
+        "svme-addr-chk": false,
         "cmov": true,
         "ia64": false,
         "ssb-no": false,
@@ -30618,6 +30708,7 @@
         "vmx-unrestricted-guest": false,
         "vmx-cr3-store-noexit": false,
         "pku": true,
+        "pks": true,
         "smx": false,
         "cmp-legacy": false,
         "avx512-4fmaps": false,
@@ -30733,6 +30824,7 @@
         "kvmclock": false,
         "vmx-zero-len-inject": false,
         "pschange-mc-no": false,
+        "v-vmsave-vmload": false,
         "vmx-rdrand-exit": false,
         "lwp": false,
         "amd-ssbd": false,
@@ -30770,6 +30862,7 @@
         "vmx-movdr-exit": false,
         "pse": true,
         "avx2": false,
+        "avic": false,
         "sep": true,
         "virt-ssbd": false,
         "vmx-cr3-load-noexit": false,
@@ -30786,6 +30879,7 @@
         "amd-stibp": false,
         "vmx-preemption-timer": false,
         "clflushopt": true,
+        "vmx-entry-load-pkrs": false,
         "vmx-vnmi-pending": false,
         "monitor": true,
         "vmx-vintr-pending": false,
@@ -30795,6 +30889,7 @@
         "pcid": false,
         "taa-no": false,
         "arch-capabilities": false,
+        "vgif": false,
         "vmx-secondary-ctls": false,
         "vmx-xsaves": false,
         "clzero": false,
@@ -30829,6 +30924,7 @@
         "vmx-entry-load-efer": false,
         "model-id": "QEMU TCG CPU version 2.5+",
         "sha-ni": false,
+        "vmx-exit-load-pkrs": false,
         "abm": true,
         "vmx-ept-advanced-exitinfo": false,
         "avx512pf": false,
@@ -30973,13 +31069,11 @@
       "default-ram-id": "pc.ram"
     },
     {
-      "hotpluggable-cpus": true,
-      "name": "pc-i440fx-1.7",
-      "numa-mem-supported": true,
-      "default-cpu-type": "qemu64-x86_64-cpu",
-      "cpu-max": 255,
-      "deprecated": false,
-      "default-ram-id": "pc.ram"
+      "hotpluggable-cpus": false,
+      "name": "x-remote",
+      "numa-mem-supported": false,
+      "cpu-max": 1,
+      "deprecated": false
     },
     {
       "hotpluggable-cpus": true,
@@ -30990,6 +31084,15 @@
       "deprecated": false,
       "default-ram-id": "pc.ram"
     },
+    {
+      "hotpluggable-cpus": true,
+      "name": "pc-i440fx-1.7",
+      "numa-mem-supported": true,
+      "default-cpu-type": "qemu64-x86_64-cpu",
+      "cpu-max": 255,
+      "deprecated": false,
+      "default-ram-id": "pc.ram"
+    },
     {
       "hotpluggable-cpus": true,
       "name": "pc-q35-2.9",
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 23fb5b7393..e68df54071 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -259,10 +259,11 @@
   <version>5002050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
-  <package>v5.2.0-1810-g2436651b26</package>
+  <package>v5.2.0-2208-gc79f01c945</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
     <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/>
+    <property name='svme-addr-chk' type='boolean' value='false'/>
     <property name='cmov' type='boolean' value='true' migratable='yes'/>
     <property name='ia64' type='boolean' value='false'/>
     <property name='ssb-no' type='boolean' value='false'/>
@@ -347,6 +348,7 @@
     <property name='vmx-unrestricted-guest' type='boolean' value='false'/>
     <property name='vmx-cr3-store-noexit' type='boolean' value='false'/>
     <property name='pku' type='boolean' value='false'/>
+    <property name='pks' type='boolean' value='false'/>
     <property name='smx' type='boolean' value='false'/>
     <property name='cmp-legacy' type='boolean' value='true' migratable='yes'/>
     <property name='avx512-4fmaps' type='boolean' value='false'/>
@@ -462,6 +464,7 @@
     <property name='kvmclock' type='boolean' value='true' migratable='yes'/>
     <property name='vmx-zero-len-inject' type='boolean' value='false'/>
     <property name='pschange-mc-no' type='boolean' value='true' migratable='yes'/>
+    <property name='v-vmsave-vmload' type='boolean' value='false'/>
     <property name='vmx-rdrand-exit' type='boolean' value='false'/>
     <property name='lwp' type='boolean' value='false'/>
     <property name='amd-ssbd' type='boolean' value='true' migratable='yes'/>
@@ -499,6 +502,7 @@
     <property name='vmx-movdr-exit' type='boolean' value='false'/>
     <property name='pse' type='boolean' value='true' migratable='yes'/>
     <property name='avx2' type='boolean' value='true' migratable='yes'/>
+    <property name='avic' type='boolean' value='false'/>
     <property name='sep' type='boolean' value='true' migratable='yes'/>
     <property name='virt-ssbd' type='boolean' value='true' migratable='yes'/>
     <property name='vmx-cr3-load-noexit' type='boolean' value='false'/>
@@ -515,6 +519,7 @@
     <property name='amd-stibp' type='boolean' value='true' migratable='yes'/>
     <property name='vmx-preemption-timer' type='boolean' value='false'/>
     <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
+    <property name='vmx-entry-load-pkrs' type='boolean' value='false'/>
     <property name='vmx-vnmi-pending' type='boolean' value='false'/>
     <property name='monitor' type='boolean' value='false'/>
     <property name='vmx-vintr-pending' type='boolean' value='false'/>
@@ -524,6 +529,7 @@
     <property name='pcid' type='boolean' value='false'/>
     <property name='taa-no' type='boolean' value='false'/>
     <property name='arch-capabilities' type='boolean' value='true' migratable='yes'/>
+    <property name='vgif' type='boolean' value='false'/>
     <property name='vmx-secondary-ctls' type='boolean' value='false'/>
     <property name='vmx-xsaves' type='boolean' value='false'/>
     <property name='clzero' type='boolean' value='true' migratable='yes'/>
@@ -558,6 +564,7 @@
     <property name='vmx-entry-load-efer' type='boolean' value='false'/>
     <property name='model-id' type='string' value='AMD Ryzen 9 3900X 12-Core Processor            '/>
     <property name='sha-ni' type='boolean' value='true' migratable='yes'/>
+    <property name='vmx-exit-load-pkrs' type='boolean' value='false'/>
     <property name='abm' type='boolean' value='true' migratable='yes'/>
     <property name='vmx-ept-advanced-exitinfo' type='boolean' value='false'/>
     <property name='avx512pf' type='boolean' value='false'/>
@@ -1436,8 +1443,9 @@
   <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
-  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <machine type='kvm' name='x-remote' maxCpus='1'/>
   <machine type='kvm' name='pc-q35-5.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/>
+  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
@@ -1471,6 +1479,7 @@
   <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <hostCPU type='tcg' model='base' migratability='yes'>
     <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/>
+    <property name='svme-addr-chk' type='boolean' value='false'/>
     <property name='cmov' type='boolean' value='true' migratable='yes'/>
     <property name='ia64' type='boolean' value='false'/>
     <property name='ssb-no' type='boolean' value='false'/>
@@ -1555,6 +1564,7 @@
     <property name='vmx-unrestricted-guest' type='boolean' value='false'/>
     <property name='vmx-cr3-store-noexit' type='boolean' value='false'/>
     <property name='pku' type='boolean' value='true' migratable='yes'/>
+    <property name='pks' type='boolean' value='true' migratable='yes'/>
     <property name='smx' type='boolean' value='false'/>
     <property name='cmp-legacy' type='boolean' value='false'/>
     <property name='avx512-4fmaps' type='boolean' value='false'/>
@@ -1670,6 +1680,7 @@
     <property name='kvmclock' type='boolean' value='false'/>
     <property name='vmx-zero-len-inject' type='boolean' value='false'/>
     <property name='pschange-mc-no' type='boolean' value='false'/>
+    <property name='v-vmsave-vmload' type='boolean' value='false'/>
     <property name='vmx-rdrand-exit' type='boolean' value='false'/>
     <property name='lwp' type='boolean' value='false'/>
     <property name='amd-ssbd' type='boolean' value='false'/>
@@ -1707,6 +1718,7 @@
     <property name='vmx-movdr-exit' type='boolean' value='false'/>
     <property name='pse' type='boolean' value='true' migratable='yes'/>
     <property name='avx2' type='boolean' value='false'/>
+    <property name='avic' type='boolean' value='false'/>
     <property name='sep' type='boolean' value='true' migratable='yes'/>
     <property name='virt-ssbd' type='boolean' value='false'/>
     <property name='vmx-cr3-load-noexit' type='boolean' value='false'/>
@@ -1723,6 +1735,7 @@
     <property name='amd-stibp' type='boolean' value='false'/>
     <property name='vmx-preemption-timer' type='boolean' value='false'/>
     <property name='clflushopt' type='boolean' value='true' migratable='yes'/>
+    <property name='vmx-entry-load-pkrs' type='boolean' value='false'/>
     <property name='vmx-vnmi-pending' type='boolean' value='false'/>
     <property name='monitor' type='boolean' value='true' migratable='yes'/>
     <property name='vmx-vintr-pending' type='boolean' value='false'/>
@@ -1732,6 +1745,7 @@
     <property name='pcid' type='boolean' value='false'/>
     <property name='taa-no' type='boolean' value='false'/>
     <property name='arch-capabilities' type='boolean' value='false'/>
+    <property name='vgif' type='boolean' value='false'/>
     <property name='vmx-secondary-ctls' type='boolean' value='false'/>
     <property name='vmx-xsaves' type='boolean' value='false'/>
     <property name='clzero' type='boolean' value='false'/>
@@ -1766,6 +1780,7 @@
     <property name='vmx-entry-load-efer' type='boolean' value='false'/>
     <property name='model-id' type='string' value='QEMU TCG CPU version 2.5+'/>
     <property name='sha-ni' type='boolean' value='false'/>
+    <property name='vmx-exit-load-pkrs' type='boolean' value='false'/>
     <property name='abm' type='boolean' value='true' migratable='yes'/>
     <property name='vmx-ept-advanced-exitinfo' type='boolean' value='false'/>
     <property name='avx512pf' type='boolean' value='false'/>
@@ -3175,8 +3190,9 @@
   <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
-  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <machine type='tcg' name='x-remote' maxCpus='1'/>
   <machine type='tcg' name='pc-q35-5.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/>
+  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>