From cc82b6a0959a964fdf2661b1be7e4a3e671158fa Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 18 Aug 2021 11:31:48 +0200
Subject: [PATCH] qemucapabilitiesdata: Update qemu caps dump for 6.1.0 release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml  |   4 +-
 tests/domaincapsdata/qemu_6.1.0.x86_64.xml    |   4 +-
 .../caps_6.1.0.x86_64.replies                 | 582 +++++++++---------
 .../caps_6.1.0.x86_64.xml                     |  12 +-
 .../cpu-host-model.x86_64-6.1.0.args          |   2 +-
 5 files changed, 300 insertions(+), 304 deletions(-)

diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
index 98b9c06cd1..bae2187aa2 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -56,13 +56,11 @@
       <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
       <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='svme-addr-chk'/>
       <feature policy='require' name='rdctl-no'/>
       <feature policy='require' name='skip-l1dfl-vmentry'/>
       <feature policy='require' name='mds-no'/>
       <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='disable' name='svm'/>
-      <feature policy='disable' name='npt'/>
-      <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes'>qemu64</model>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 91a845204b..5a261f2d0e 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -55,13 +55,11 @@
       <feature policy='require' name='invtsc'/>
       <feature policy='require' name='amd-ssbd'/>
       <feature policy='require' name='virt-ssbd'/>
+      <feature policy='require' name='svme-addr-chk'/>
       <feature policy='require' name='rdctl-no'/>
       <feature policy='require' name='skip-l1dfl-vmentry'/>
       <feature policy='require' name='mds-no'/>
       <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='disable' name='svm'/>
-      <feature policy='disable' name='npt'/>
-      <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes'>qemu64</model>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies
index 17bd3dd21b..92feb723e6 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies
@@ -17,11 +17,11 @@
 {
   "return": {
     "qemu": {
-      "micro": 90,
-      "minor": 0,
+      "micro": 0,
+      "minor": 1,
       "major": 6
     },
-    "package": "v6.1.0-rc0-48-g7b7ca8ebde"
+    "package": "v6.1.0"
   },
   "id": "libvirt-2"
 }
@@ -16941,10 +16941,6 @@
 
 {
   "return": [
-    {
-      "name": "chardev-pty",
-      "parent": "chardev"
-    },
     {
       "name": "vhost-user-vsock-device",
       "parent": "vhost-vsock-common"
@@ -16994,7 +16990,7 @@
       "parent": "confidential-guest-support"
     },
     {
-      "name": "usb-redir",
+      "name": "usb-wacom-tablet",
       "parent": "usb-device"
     },
     {
@@ -17002,7 +16998,7 @@
       "parent": "netfilter"
     },
     {
-      "name": "usb-wacom-tablet",
+      "name": "usb-redir",
       "parent": "usb-device"
     },
     {
@@ -17041,14 +17037,14 @@
       "name": "kvm-pit",
       "parent": "pit-common"
     },
-    {
-      "name": "core2duo-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "ich9-usb-uhci5",
       "parent": "pci-uhci-usb"
     },
+    {
+      "name": "core2duo-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "pcm3680_pci",
       "parent": "pci-device"
@@ -17094,8 +17090,12 @@
       "parent": "usb-device"
     },
     {
-      "name": "chardev-serial",
-      "parent": "chardev-fd"
+      "name": "virtio-9p-pci-transitional",
+      "parent": "virtio-9p-pci-base"
+    },
+    {
+      "name": "chardev-pty",
+      "parent": "chardev"
     },
     {
       "name": "virtio-blk-device",
@@ -17113,6 +17113,10 @@
       "name": "Icelake-Client-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "qtest-accel",
+      "parent": "accel"
+    },
     {
       "name": "chardev-wctablet",
       "parent": "chardev"
@@ -17121,10 +17125,6 @@
       "name": "Westmere-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
-    {
-      "name": "vhost-user-vsock-pci",
-      "parent": "vhost-user-vsock-pci-base"
-    },
     {
       "name": "ich9-usb-uhci2",
       "parent": "pci-uhci-usb"
@@ -17134,20 +17134,20 @@
       "parent": "generic-pc-machine"
     },
     {
-      "name": "Cooperlake-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "chardev-serial",
+      "parent": "chardev-fd"
     },
     {
       "name": "virtio-gpu-gl-device",
       "parent": "virtio-gpu-device"
     },
     {
-      "name": "qtest-accel",
-      "parent": "accel"
+      "name": "vhost-user-vsock-pci",
+      "parent": "vhost-user-vsock-pci-base"
     },
     {
-      "name": "kvmclock",
-      "parent": "sys-bus-device"
+      "name": "Cooperlake-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "ich9-usb-uhci1",
@@ -17170,17 +17170,17 @@
       "parent": "pci-device"
     },
     {
-      "name": "e1000e",
-      "parent": "pci-device"
-    },
-    {
-      "name": "x3130-upstream",
-      "parent": "pcie-port"
+      "name": "kvmclock",
+      "parent": "sys-bus-device"
     },
     {
       "name": "virtio-serial-pci-transitional",
       "parent": "virtio-serial-pci-base"
     },
+    {
+      "name": "x3130-upstream",
+      "parent": "pcie-port"
+    },
     {
       "name": "memory-backend-ram",
       "parent": "memory-backend"
@@ -17189,6 +17189,10 @@
       "name": "PCIE",
       "parent": "PCI"
     },
+    {
+      "name": "e1000e",
+      "parent": "pci-device"
+    },
     {
       "name": "n270-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -17198,8 +17202,8 @@
       "parent": "pci-host-bridge"
     },
     {
-      "name": "virtio-9p-pci-transitional",
-      "parent": "virtio-9p-pci-base"
+      "name": "virtio-input-host-pci",
+      "parent": "virtio-input-host-pci-base-type"
     },
     {
       "name": "chardev-file",
@@ -17381,10 +17385,6 @@
       "name": "i2c-bus",
       "parent": "bus"
     },
-    {
-      "name": "memory-region",
-      "parent": "object"
-    },
     {
       "name": "Skylake-Server-v3-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -17402,8 +17402,8 @@
       "parent": "pci-device"
     },
     {
-      "name": "virtio-input-host-pci",
-      "parent": "virtio-input-host-pci-base-type"
+      "name": "memory-region",
+      "parent": "object"
     },
     {
       "name": "nvdimm",
@@ -17474,29 +17474,29 @@
       "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",
       "parent": "vhost-user-scsi-pci-base"
     },
     {
-      "name": "i82557a",
-      "parent": "pci-device"
+      "name": "vmmouse",
+      "parent": "isa-device"
+    },
+    {
+      "name": "chardev-udp",
+      "parent": "chardev"
+    },
+    {
+      "name": "pc-q35-2.8-machine",
+      "parent": "generic-pc-machine"
     },
     {
       "name": "generic-sdhci",
       "parent": "sys-bus-device"
     },
-    {
-      "name": "vmmouse",
-      "parent": "isa-device"
-    },
     {
       "name": "virtio-scsi-pci-non-transitional",
       "parent": "virtio-scsi-pci-base"
@@ -17514,8 +17514,8 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "chardev-udp",
-      "parent": "chardev"
+      "name": "chardev-memory",
+      "parent": "chardev-ringbuf"
     },
     {
       "name": "EPYC-Rome-v1-x86_64-cpu",
@@ -17573,14 +17573,14 @@
       "name": "virtio-9p-pci-non-transitional",
       "parent": "virtio-9p-pci-base"
     },
-    {
-      "name": "memory-backend-file",
-      "parent": "memory-backend"
-    },
     {
       "name": "Nehalem-v2-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "memory-backend-file",
+      "parent": "memory-backend"
+    },
     {
       "name": "vhost-vsock-device",
       "parent": "vhost-vsock-common"
@@ -17618,16 +17618,16 @@
       "parent": "device"
     },
     {
-      "name": "isabus-bridge",
-      "parent": "sys-bus-device"
+      "name": "IvyBridge-v2-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "ne2k_pci",
       "parent": "pci-device"
     },
     {
-      "name": "IvyBridge-v2-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "isabus-bridge",
+      "parent": "sys-bus-device"
     },
     {
       "name": "usb-bus",
@@ -17641,10 +17641,6 @@
       "name": "qtest",
       "parent": "object"
     },
-    {
-      "name": "EPYC-v1-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "tcg-accel",
       "parent": "accel"
@@ -17681,14 +17677,18 @@
       "name": "pc-i440fx-2.6-machine",
       "parent": "generic-pc-machine"
     },
-    {
-      "name": "isa-ipmi-kcs",
-      "parent": "isa-device"
-    },
     {
       "name": "i82551",
       "parent": "pci-device"
     },
+    {
+      "name": "EPYC-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
+    {
+      "name": "isa-ipmi-kcs",
+      "parent": "isa-device"
+    },
     {
       "name": "Icelake-Server-noTSX-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -17713,14 +17713,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"
@@ -17761,6 +17761,10 @@
       "name": "virtio-serial-device",
       "parent": "virtio-device"
     },
+    {
+      "name": "virtio-serial-pci",
+      "parent": "virtio-serial-pci-base"
+    },
     {
       "name": "Denverton-v2-x86_64-cpu",
       "parent": "x86_64-cpu"
@@ -17814,8 +17818,8 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "virtio-rng-pci-non-transitional",
-      "parent": "virtio-rng-pci-base"
+      "name": "vhost-user-blk-pci-non-transitional",
+      "parent": "vhost-user-blk-pci-base"
     },
     {
       "name": "cirrus-vga",
@@ -17842,8 +17846,8 @@
       "parent": "pcie-host-bridge"
     },
     {
-      "name": "virtio-serial-pci",
-      "parent": "virtio-serial-pci-base"
+      "name": "virtio-rng-pci-non-transitional",
+      "parent": "virtio-rng-pci-base"
     },
     {
       "name": "Skylake-Client-x86_64-cpu",
@@ -17857,10 +17861,6 @@
       "name": "Cooperlake-v2-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
-    {
-      "name": "vhost-user-blk-pci-non-transitional",
-      "parent": "vhost-user-blk-pci-base"
-    },
     {
       "name": "container",
       "parent": "object"
@@ -17905,14 +17905,14 @@
       "name": "e1000-82545em",
       "parent": "e1000-base"
     },
-    {
-      "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"
@@ -18158,8 +18158,8 @@
       "parent": "chardev-spice"
     },
     {
-      "name": "qio-channel-command",
-      "parent": "qio-channel"
+      "name": "tls-creds-x509",
+      "parent": "tls-creds"
     },
     {
       "name": "Opteron_G3-v1-x86_64-cpu",
@@ -18174,8 +18174,8 @@
       "parent": "virtio-blk-pci-base"
     },
     {
-      "name": "tls-creds-x509",
-      "parent": "tls-creds"
+      "name": "qio-channel-command",
+      "parent": "qio-channel"
     },
     {
       "name": "pc-i440fx-2.4-machine",
@@ -18253,14 +18253,14 @@
       "name": "Icelake-Client-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
-    {
-      "name": "chardev-braille",
-      "parent": "chardev"
-    },
     {
       "name": "tpci200",
       "parent": "pci-device"
     },
+    {
+      "name": "chardev-braille",
+      "parent": "chardev"
+    },
     {
       "name": "rocker",
       "parent": "pci-device"
@@ -18273,10 +18273,6 @@
       "name": "gpio_i2c",
       "parent": "sys-bus-device"
     },
-    {
-      "name": "secret",
-      "parent": "secret_common"
-    },
     {
       "name": "qio-channel-socket",
       "parent": "qio-channel"
@@ -18297,38 +18293,34 @@
       "name": "qemu-console",
       "parent": "object"
     },
-    {
-      "name": "chardev-socket",
-      "parent": "chardev"
-    },
     {
       "name": "clock",
       "parent": "object"
     },
-    {
-      "name": "ioh3420",
-      "parent": "pcie-root-port-base"
-    },
     {
       "name": "Haswell-v2-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
-    {
-      "name": "usb-ehci",
-      "parent": "pci-ehci-usb"
-    },
     {
       "name": "host-x86_64-cpu",
       "parent": "max-x86_64-cpu"
     },
     {
-      "name": "pc-i440fx-2.11-machine",
-      "parent": "generic-pc-machine"
+      "name": "secret",
+      "parent": "secret_common"
+    },
+    {
+      "name": "usb-ehci",
+      "parent": "pci-ehci-usb"
     },
     {
       "name": "pxb",
       "parent": "pci-device"
     },
+    {
+      "name": "pc-i440fx-2.11-machine",
+      "parent": "generic-pc-machine"
+    },
     {
       "name": "AC97",
       "parent": "pci-device"
@@ -18338,13 +18330,21 @@
       "parent": "device"
     },
     {
-      "name": "virtio-pmem",
-      "parent": "virtio-device"
+      "name": "Cascadelake-Server-noTSX-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
+    {
+      "name": "chardev-socket",
+      "parent": "chardev"
     },
     {
       "name": "nvme-bus",
       "parent": "bus"
     },
+    {
+      "name": "virtconsole",
+      "parent": "virtserialport"
+    },
     {
       "name": "virtio-net-pci-non-transitional",
       "parent": "virtio-net-pci-base"
@@ -18354,21 +18354,21 @@
       "parent": "isa-device"
     },
     {
-      "name": "hyperv-testdev",
-      "parent": "isa-device"
+      "name": "virtio-iommu-pci-non-transitional",
+      "parent": "virtio-iommu-device-base"
     },
     {
       "name": "scsi-hd",
       "parent": "scsi-disk-base"
     },
-    {
-      "name": "Cascadelake-Server-noTSX-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "usb-kbd",
       "parent": "usb-hid"
     },
+    {
+      "name": "lsi53c810",
+      "parent": "lsi53c895a"
+    },
     {
       "name": "isa-fdc",
       "parent": "isa-device"
@@ -18402,28 +18402,28 @@
       "parent": "generic-pc-machine"
     },
     {
-      "name": "Skylake-Client-v1-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "virtio-pmem",
+      "parent": "virtio-device"
+    },
+    {
+      "name": "tpm-tis",
+      "parent": "isa-device"
     },
     {
       "name": "Skylake-Server-IBRS-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
     {
-      "name": "lsi53c810",
-      "parent": "lsi53c895a"
-    },
-    {
-      "name": "virtio-iommu-pci-non-transitional",
-      "parent": "virtio-iommu-device-base"
+      "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",
@@ -18450,17 +18450,17 @@
       "parent": "virtio-input-hid-device"
     },
     {
-      "name": "virtconsole",
-      "parent": "virtserialport"
+      "name": "Skylake-Client-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
+    {
+      "name": "ioh3420",
+      "parent": "pcie-root-port-base"
     },
     {
       "name": "guest-loader",
       "parent": "device"
     },
-    {
-      "name": "filter-mirror",
-      "parent": "netfilter"
-    },
     {
       "name": "x-remote-machine",
       "parent": "machine"
@@ -18673,14 +18673,14 @@
       "name": "Skylake-Server-v4-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
-    {
-      "name": "Nehalem-v1-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "kvmvapic",
       "parent": "sys-bus-device"
     },
+    {
+      "name": "Nehalem-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "nvme-ns",
       "parent": "device"
@@ -18869,14 +18869,14 @@
       "name": "vhost-user-gpu",
       "parent": "virtio-gpu-base"
     },
-    {
-      "name": "hda-duplex",
-      "parent": "hda-audio"
-    },
     {
       "name": "pentium-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "hda-duplex",
+      "parent": "hda-audio"
+    },
     {
       "name": "amd-iommu-iommu-memory-region",
       "parent": "iommu-memory-region"
@@ -18889,24 +18889,28 @@
       "name": "pvpanic-pci",
       "parent": "pci-device"
     },
+    {
+      "name": "Cooperlake-v1-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "Cascadelake-Server-v3-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
     {
-      "name": "Cooperlake-v1-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "cfi.pflash01",
+      "parent": "sys-bus-device"
     },
     {
       "name": "virtio-balloon-device",
       "parent": "virtio-device"
     },
     {
-      "name": "Skylake-Server-x86_64-cpu",
-      "parent": "x86_64-cpu"
+      "name": "isa-parallel",
+      "parent": "isa-device"
     },
     {
-      "name": "Nehalem-IBRS-x86_64-cpu",
+      "name": "Skylake-Server-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
     {
@@ -18914,12 +18918,8 @@
       "parent": "generic-pc-machine"
     },
     {
-      "name": "isa-parallel",
-      "parent": "isa-device"
-    },
-    {
-      "name": "cfi.pflash01",
-      "parent": "sys-bus-device"
+      "name": "Nehalem-IBRS-x86_64-cpu",
+      "parent": "x86_64-cpu"
     },
     {
       "name": "pentium2-v1-x86_64-cpu",
@@ -19029,10 +19029,6 @@
       "name": "accel",
       "parent": "object"
     },
-    {
-      "name": "EPYC-Milan-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "virtio-tablet-pci",
       "parent": "virtio-tablet-pci-base-type"
@@ -19041,6 +19037,10 @@
       "name": "dc390",
       "parent": "am53c974"
     },
+    {
+      "name": "EPYC-Milan-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "i6300esb",
       "parent": "pci-device"
@@ -19158,8 +19158,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",
@@ -19170,8 +19170,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",
@@ -27875,104 +27875,6 @@
       ],
       "option": "iscsi"
     },
-    {
-      "parameters": [
-        {
-          "name": "power-control",
-          "type": "boolean"
-        },
-        {
-          "name": "audiodev",
-          "type": "string"
-        },
-        {
-          "name": "non-adaptive",
-          "type": "boolean"
-        },
-        {
-          "name": "lossy",
-          "type": "boolean"
-        },
-        {
-          "name": "sasl-authz",
-          "type": "string"
-        },
-        {
-          "name": "tls-authz",
-          "type": "string"
-        },
-        {
-          "name": "sasl",
-          "type": "boolean"
-        },
-        {
-          "name": "key-delay-ms",
-          "type": "number"
-        },
-        {
-          "name": "lock-key-sync",
-          "type": "boolean"
-        },
-        {
-          "name": "reverse",
-          "type": "boolean"
-        },
-        {
-          "name": "password-secret",
-          "type": "string"
-        },
-        {
-          "name": "password",
-          "type": "boolean"
-        },
-        {
-          "name": "ipv6",
-          "type": "boolean"
-        },
-        {
-          "name": "ipv4",
-          "type": "boolean"
-        },
-        {
-          "name": "to",
-          "type": "number"
-        },
-        {
-          "name": "connections",
-          "type": "number"
-        },
-        {
-          "name": "head",
-          "type": "number"
-        },
-        {
-          "name": "display",
-          "type": "string"
-        },
-        {
-          "name": "share",
-          "type": "string"
-        },
-        {
-          "name": "tls-creds",
-          "type": "string"
-        },
-        {
-          "name": "websocket",
-          "type": "string"
-        },
-        {
-          "name": "vnc",
-          "type": "string"
-        }
-      ],
-      "option": "vnc"
-    },
-    {
-      "parameters": [
-      ],
-      "option": "smbios"
-    },
     {
       "parameters": [
         {
@@ -28106,6 +28008,41 @@
       ],
       "option": "spice"
     },
+    {
+      "parameters": [
+      ],
+      "option": "smbios"
+    },
+    {
+      "parameters": [
+      ],
+      "option": "acpi"
+    },
+    {
+      "parameters": [
+        {
+          "name": "resourcecontrol",
+          "type": "string"
+        },
+        {
+          "name": "spawn",
+          "type": "string"
+        },
+        {
+          "name": "elevateprivileges",
+          "type": "string"
+        },
+        {
+          "name": "obsolete",
+          "type": "string"
+        },
+        {
+          "name": "enable",
+          "type": "boolean"
+        }
+      ],
+      "option": "sandbox"
+    },
     {
       "parameters": [
         {
@@ -28295,35 +28232,98 @@
       ],
       "option": "fsdev"
     },
-    {
-      "parameters": [
-      ],
-      "option": "acpi"
-    },
     {
       "parameters": [
         {
-          "name": "resourcecontrol",
-          "type": "string"
-        },
-        {
-          "name": "spawn",
-          "type": "string"
-        },
-        {
-          "name": "elevateprivileges",
-          "type": "string"
-        },
-        {
-          "name": "obsolete",
-          "type": "string"
-        },
-        {
-          "name": "enable",
+          "name": "power-control",
           "type": "boolean"
+        },
+        {
+          "name": "audiodev",
+          "type": "string"
+        },
+        {
+          "name": "non-adaptive",
+          "type": "boolean"
+        },
+        {
+          "name": "lossy",
+          "type": "boolean"
+        },
+        {
+          "name": "sasl-authz",
+          "type": "string"
+        },
+        {
+          "name": "tls-authz",
+          "type": "string"
+        },
+        {
+          "name": "sasl",
+          "type": "boolean"
+        },
+        {
+          "name": "key-delay-ms",
+          "type": "number"
+        },
+        {
+          "name": "lock-key-sync",
+          "type": "boolean"
+        },
+        {
+          "name": "reverse",
+          "type": "boolean"
+        },
+        {
+          "name": "password-secret",
+          "type": "string"
+        },
+        {
+          "name": "password",
+          "type": "boolean"
+        },
+        {
+          "name": "ipv6",
+          "type": "boolean"
+        },
+        {
+          "name": "ipv4",
+          "type": "boolean"
+        },
+        {
+          "name": "to",
+          "type": "number"
+        },
+        {
+          "name": "connections",
+          "type": "number"
+        },
+        {
+          "name": "head",
+          "type": "number"
+        },
+        {
+          "name": "display",
+          "type": "string"
+        },
+        {
+          "name": "share",
+          "type": "string"
+        },
+        {
+          "name": "tls-creds",
+          "type": "string"
+        },
+        {
+          "name": "websocket",
+          "type": "string"
+        },
+        {
+          "name": "vnc",
+          "type": "string"
         }
       ],
-      "option": "sandbox"
+      "option": "vnc"
     },
     {
       "parameters": [
@@ -29182,7 +29182,7 @@
       "name": "base",
       "props": {
         "vmx-entry-load-rtit-ctl": false,
-        "svme-addr-chk": false,
+        "svme-addr-chk": true,
         "cmov": true,
         "ia64": false,
         "ssb-no": false,
@@ -29278,7 +29278,7 @@
         "avx-vnni": false,
         "3dnowext": false,
         "amd-no-ssb": false,
-        "npt": false,
+        "npt": true,
         "rdctl-no": true,
         "vmx-invvpid": false,
         "clwb": true,
@@ -29320,7 +29320,7 @@
         "vmx-vpid": false,
         "syscall": true,
         "avx512dq": false,
-        "svm": false,
+        "svm": true,
         "invtsc": false,
         "vmx-monitor-exit": false,
         "sse2": true,
@@ -29346,7 +29346,7 @@
         "vmx-exit-clear-rtit-ctl": false,
         "model": 113,
         "movbe": true,
-        "nrip-save": false,
+        "nrip-save": true,
         "ssse3": true,
         "sse4a": true,
         "kvm-msi-ext-dest-id": false,
@@ -29519,7 +29519,7 @@
       "name": "base",
       "props": {
         "vmx-entry-load-rtit-ctl": false,
-        "svme-addr-chk": false,
+        "svme-addr-chk": true,
         "cmov": true,
         "ia64": false,
         "ssb-no": false,
@@ -29615,7 +29615,7 @@
         "avx-vnni": false,
         "3dnowext": false,
         "amd-no-ssb": false,
-        "npt": false,
+        "npt": true,
         "rdctl-no": true,
         "vmx-invvpid": false,
         "clwb": true,
@@ -29657,7 +29657,7 @@
         "vmx-vpid": false,
         "syscall": true,
         "avx512dq": false,
-        "svm": false,
+        "svm": true,
         "invtsc": true,
         "vmx-monitor-exit": false,
         "sse2": true,
@@ -29683,7 +29683,7 @@
         "vmx-exit-clear-rtit-ctl": false,
         "model": 113,
         "movbe": true,
-        "nrip-save": false,
+        "nrip-save": true,
         "ssse3": true,
         "sse4a": true,
         "kvm-msi-ext-dest-id": false,
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 1fad52ba90..8a42f5a1ff 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -256,14 +256,14 @@
   <flag name='virtio-vga-gl'/>
   <flag name='confidential-guest-support'/>
   <flag name='query-display-options'/>
-  <version>6000090</version>
+  <version>6001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
-  <package>v6.1.0-rc0-48-g7b7ca8ebde</package>
+  <package>v6.1.0</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='svme-addr-chk' type='boolean' value='true' migratable='yes'/>
     <property name='cmov' type='boolean' value='true' migratable='yes'/>
     <property name='ia64' type='boolean' value='false'/>
     <property name='ssb-no' type='boolean' value='false'/>
@@ -359,7 +359,7 @@
     <property name='avx-vnni' type='boolean' value='false'/>
     <property name='3dnowext' type='boolean' value='false'/>
     <property name='amd-no-ssb' type='boolean' value='false'/>
-    <property name='npt' type='boolean' value='false'/>
+    <property name='npt' type='boolean' value='true' migratable='yes'/>
     <property name='rdctl-no' type='boolean' value='true' migratable='yes'/>
     <property name='vmx-invvpid' type='boolean' value='false'/>
     <property name='clwb' type='boolean' value='true' migratable='yes'/>
@@ -401,7 +401,7 @@
     <property name='vmx-vpid' type='boolean' value='false'/>
     <property name='syscall' type='boolean' value='true' migratable='yes'/>
     <property name='avx512dq' type='boolean' value='false'/>
-    <property name='svm' type='boolean' value='false'/>
+    <property name='svm' type='boolean' value='true' migratable='yes'/>
     <property name='invtsc' type='boolean' value='true' migratable='no'/>
     <property name='vmx-monitor-exit' type='boolean' value='false'/>
     <property name='sse2' type='boolean' value='true' migratable='yes'/>
@@ -427,7 +427,7 @@
     <property name='vmx-exit-clear-rtit-ctl' type='boolean' value='false'/>
     <property name='model' type='number' value='113'/>
     <property name='movbe' type='boolean' value='true' migratable='yes'/>
-    <property name='nrip-save' type='boolean' value='false'/>
+    <property name='nrip-save' type='boolean' value='true' migratable='yes'/>
     <property name='ssse3' type='boolean' value='true' migratable='yes'/>
     <property name='sse4a' type='boolean' value='true' migratable='yes'/>
     <property name='kvm-msi-ext-dest-id' type='boolean' value='false'/>
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args
index 4cd3392b55..fee116de1e 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args
@@ -11,7 +11,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-q35-6.1,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \
--cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,svm=off,npt=off,nrip-save=off \
+-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,svme-addr-chk=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
 -m 214 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \