From: Peter Krempa <[email protected]>

Notable changes:
 - 'wdat' machine added
 - 'virtio-rtc-pci' device added
 - 'virtio-shared-memory-mapping' QOM object added
 - 'intel-iommu' device stabilized options: 'fsts', 'pasid-bits', 
'scalable-mode'
 - 'eraps' CPU feature became migratable
 - changes in unstable commands regarding virtio backend data

Signed-off-by: Peter Krempa <[email protected]>
---
 .../qemu_11.1.0-q35.x86_64-expanded.xml       |  1 +
 .../qemu_11.1.0-q35.x86_64-supported.xml      |  1 +
 .../domaincapsdata/qemu_11.1.0-q35.x86_64.xml |  1 +
 tests/domaincapsdata/qemu_11.1.0.x86_64.xml   |  1 +
 .../caps_11.1.0_x86_64.replies                | 82 +++++++++----------
 .../caps_11.1.0_x86_64.xml                    |  4 +-
 ...host-model-fallback-kvm.x86_64-latest.args |  2 +-
 ...cpu-host-model-features.x86_64-latest.args |  2 +-
 .../cpu-host-model-kvm.x86_64-latest.args     |  2 +-
 ...st-model-nofallback-kvm.x86_64-latest.args |  2 +-
 10 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/tests/domaincapsdata/qemu_11.1.0-q35.x86_64-expanded.xml 
b/tests/domaincapsdata/qemu_11.1.0-q35.x86_64-expanded.xml
index beacd21192..535ac0a320 100644
--- a/tests/domaincapsdata/qemu_11.1.0-q35.x86_64-expanded.xml
+++ b/tests/domaincapsdata/qemu_11.1.0-q35.x86_64-expanded.xml
@@ -94,6 +94,7 @@
       <feature policy='require' name='cx16'/>
       <feature policy='require' name='cx8'/>
       <feature policy='require' name='de'/>
+      <feature policy='require' name='eraps'/>
       <feature policy='require' name='erms'/>
       <feature policy='require' name='f16c'/>
       <feature policy='require' name='flush-l1d'/>
diff --git a/tests/domaincapsdata/qemu_11.1.0-q35.x86_64-supported.xml 
b/tests/domaincapsdata/qemu_11.1.0-q35.x86_64-supported.xml
index 4f91f86b00..3df21c2446 100644
--- a/tests/domaincapsdata/qemu_11.1.0-q35.x86_64-supported.xml
+++ b/tests/domaincapsdata/qemu_11.1.0-q35.x86_64-supported.xml
@@ -58,6 +58,7 @@
       <feature policy='require' name='arch-capabilities'/>
       <feature policy='require' name='cet-ss'/>
       <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='eraps'/>
       <feature policy='require' name='flush-l1d'/>
       <feature policy='require' name='gds-no'/>
       <feature policy='require' name='hypervisor'/>
diff --git a/tests/domaincapsdata/qemu_11.1.0-q35.x86_64.xml 
b/tests/domaincapsdata/qemu_11.1.0-q35.x86_64.xml
index ff9b2454f1..927ec41047 100644
--- a/tests/domaincapsdata/qemu_11.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_11.1.0-q35.x86_64.xml
@@ -57,6 +57,7 @@
       <maxphysaddr mode='passthrough' limit='64'/>
       <feature policy='require' name='cet-ss'/>
       <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='eraps'/>
       <feature policy='require' name='flush-l1d'/>
       <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='invtsc'/>
diff --git a/tests/domaincapsdata/qemu_11.1.0.x86_64.xml 
b/tests/domaincapsdata/qemu_11.1.0.x86_64.xml
index 5e8545526b..d97006e9cd 100644
--- a/tests/domaincapsdata/qemu_11.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_11.1.0.x86_64.xml
@@ -54,6 +54,7 @@
       <maxphysaddr mode='passthrough' limit='64'/>
       <feature policy='require' name='cet-ss'/>
       <feature policy='require' name='cmp_legacy'/>
+      <feature policy='require' name='eraps'/>
       <feature policy='require' name='flush-l1d'/>
       <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='invtsc'/>
diff --git a/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.replies 
b/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.replies
index 4e3c2fefcc..89276a870c 100644
--- a/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.replies
@@ -20,7 +20,7 @@
       "minor": 0,
       "major": 11
     },
-    "package": "v11.0.0-1600-g5611a9268d"
+    "package": "v11.0.0-2279-gb833716681"
   },
   "id": "libvirt-2"
 }
@@ -8929,18 +8929,6 @@
           "name": "call",
           "type": "int"
         },
-        {
-          "name": "desc",
-          "type": "int"
-        },
-        {
-          "name": "avail",
-          "type": "int"
-        },
-        {
-          "name": "used",
-          "type": "int"
-        },
         {
           "name": "num",
           "type": "int"
@@ -18447,10 +18435,6 @@
           "name": "acked-features",
           "type": "573"
         },
-        {
-          "name": "backend-features",
-          "type": "573"
-        },
         {
           "name": "protocol-features",
           "type": "731"
@@ -25320,8 +25304,8 @@
       "parent": "pci-device"
     },
     {
-      "name": "audio-none",
-      "parent": "audio-mixeng-backend"
+      "name": "virtio-rtc-pci",
+      "parent": "virtio-rtc-pci-base"
     },
     {
       "name": "chardev-wctablet",
@@ -25960,8 +25944,8 @@
       "parent": "accel"
     },
     {
-      "name": "virtio-gpu-device",
-      "parent": "virtio-gpu-base"
+      "name": "ES1370",
+      "parent": "pci-device"
     },
     {
       "name": "virtio-balloon-pci",
@@ -25988,7 +25972,7 @@
       "parent": "generic-pc-machine"
     },
     {
-      "name": "ES1370",
+      "name": "cxl-type3",
       "parent": "pci-device"
     },
     {
@@ -26020,8 +26004,8 @@
       "parent": "generic-pc-machine"
     },
     {
-      "name": "cxl-type3",
-      "parent": "pci-device"
+      "name": "virtio-shared-memory-mapping",
+      "parent": "object"
     },
     {
       "name": "i2c-echo",
@@ -26679,6 +26663,10 @@
       "name": "Skylake-Server-v2-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
+    {
+      "name": "uefi-vars-sysbus",
+      "parent": "sys-bus-device"
+    },
     {
       "name": "virtio-multitouch-device",
       "parent": "virtio-input-hid-device"
@@ -27723,6 +27711,10 @@
       "name": "authz-list",
       "parent": "authz"
     },
+    {
+      "name": "base-x86_64-cpu",
+      "parent": "x86_64-cpu"
+    },
     {
       "name": "chardev-qemu-vdagent",
       "parent": "chardev"
@@ -27764,8 +27756,8 @@
       "parent": "vhost-user-scsi-pci-base"
     },
     {
-      "name": "uefi-vars-sysbus",
-      "parent": "sys-bus-device"
+      "name": "audio-none",
+      "parent": "audio-mixeng-backend"
     },
     {
       "name": "vmbus",
@@ -27831,6 +27823,10 @@
       "name": "qio-channel-block",
       "parent": "qio-channel"
     },
+    {
+      "name": "virtio-gpu-device",
+      "parent": "virtio-gpu-base"
+    },
     {
       "name": "pc-i440fx-6.2-machine",
       "parent": "generic-pc-machine"
@@ -27852,7 +27848,7 @@
       "parent": "x86_64-cpu"
     },
     {
-      "name": "base-x86_64-cpu",
+      "name": "kvm64-v1-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
     {
@@ -27867,10 +27863,6 @@
       "name": "486-x86_64-cpu",
       "parent": "x86_64-cpu"
     },
-    {
-      "name": "kvm64-v1-x86_64-cpu",
-      "parent": "x86_64-cpu"
-    },
     {
       "name": "IDE",
       "parent": "bus"
@@ -27879,6 +27871,10 @@
       "name": "pcie-root-port",
       "parent": "pcie-root-port-base"
     },
+    {
+      "name": "virtio-rtc-device",
+      "parent": "virtio-device"
+    },
     {
       "name": "scsi-block",
       "parent": "scsi-disk-base"
@@ -31901,7 +31897,7 @@
     },
     {
       "default-value": false,
-      "name": "x-scalable-mode",
+      "name": "scalable-mode",
       "description": "on/off",
       "type": "bool"
     },
@@ -31935,15 +31931,14 @@
     },
     {
       "default-value": false,
-      "name": "x-pasid-mode",
+      "name": "fsts",
       "description": "on/off",
       "type": "bool"
     },
     {
-      "default-value": false,
-      "name": "x-flts",
-      "description": "on/off",
-      "type": "bool"
+      "default-value": 0,
+      "name": "pasid-bits",
+      "type": "uint8"
     },
     {
       "default-value": false,
@@ -39526,6 +39521,11 @@
           "help": "Set off to disable the instantiation an ISA serial port",
           "type": "boolean"
         },
+        {
+          "name": "wdat",
+          "help": "Enable WDAT watchdog support. Default: off",
+          "type": "boolean"
+        },
         {
           "name": "kernel",
           "help": "Linux kernel image file",
@@ -41468,7 +41468,7 @@
         "vmx-rdpmc-exit": false,
         "vmx-mtf": false,
         "vmx-entry-load-efer": false,
-        "eraps": false,
+        "eraps": true,
         "wrmsrns": false,
         "model-id": "AMD Ryzen 9 9950X 16-Core Processor            ",
         "sha-ni": true,
@@ -41908,7 +41908,7 @@
         "vmx-rdpmc-exit": false,
         "vmx-mtf": false,
         "vmx-entry-load-efer": false,
-        "eraps": false,
+        "eraps": true,
         "wrmsrns": false,
         "model-id": "AMD Ryzen 9 9950X 16-Core Processor            ",
         "sha-ni": true,
@@ -42458,7 +42458,7 @@
         "vmx-entry-load-efer": false,
         "level-func7": 1,
         "hv-tlbflush-ext": false,
-        "eraps": false,
+        "eraps": true,
         "pause_filter": true,
         "wrmsrns": false,
         "model-id": "AMD Ryzen 9 9950X 16-Core Processor            ",
@@ -43013,7 +43013,7 @@
         "vmx-entry-load-efer": false,
         "level-func7": 1,
         "hv-tlbflush-ext": true,
-        "eraps": false,
+        "eraps": true,
         "pause_filter": true,
         "wrmsrns": false,
         "model-id": "AMD Ryzen 9 9950X 16-Core Processor            ",
diff --git a/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml 
b/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml
index 0c020702b4..2852af7ab8 100644
--- a/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml
@@ -224,7 +224,7 @@
   <flag name='blockdev-mirror.target-is-zero'/>
   <version>11000050</version>
   <microcodeVersion>43100287</microcodeVersion>
-  <package>v11.0.0-1600-g5611a9268d</package>
+  <package>v11.0.0-2279-gb833716681</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
     <property name='avx-ne-convert' type='boolean' value='false'/>
@@ -628,7 +628,7 @@
     <property name='vmx-rdpmc-exit' type='boolean' value='false'/>
     <property name='vmx-mtf' type='boolean' value='false'/>
     <property name='vmx-entry-load-efer' type='boolean' value='false'/>
-    <property name='eraps' type='boolean' value='false'/>
+    <property name='eraps' type='boolean' value='true' migratable='yes'/>
     <property name='wrmsrns' type='boolean' value='false'/>
     <property name='model-id' type='string' value='AMD Ryzen 9 9950X 16-Core 
Processor            '/>
     <property name='sha-ni' type='boolean' value='true' migratable='yes'/>
diff --git 
a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args 
b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args
index 6156109c24..df0decb6f1 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args
@@ -12,7 +12,7 @@ 
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
 \
 -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel kvm \
--cpu 
EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,cet-ss=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=off
 \
+-cpu 
EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,cet-ss=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,eraps=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=off
 \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args 
b/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args
index 3f0ba42245..cd61b6aa6c 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args
@@ -12,7 +12,7 @@ 
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
 \
 -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel kvm \
--cpu 
EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,cet-ss=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=off,abm=on,ds=on,invtsc=off
 \
+-cpu 
EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,cet-ss=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,eraps=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=off,abm=on,ds=on,invtsc=off
 \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args 
b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args
index 03a50ad684..95eb6ed5d4 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args
@@ -12,7 +12,7 @@ 
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
 \
 -machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel kvm \
--cpu 
EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,cet-ss=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=off
 \
+-cpu 
EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,cet-ss=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,eraps=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=off
 \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \
diff --git 
a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args 
b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args
index 6156109c24..df0decb6f1 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args
@@ -12,7 +12,7 @@ 
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object 
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
 \
 -machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel kvm \
--cpu 
EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,cet-ss=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=off
 \
+-cpu 
EPYC-Turin,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,cet-ss=on,spec-ctrl=on,stibp=on,flush-l1d=on,ssbd=on,virt-ssbd=on,eraps=on,tsa-sq-no=on,tsa-l1-no=on,pcid=off,rdseed=off,la57=off
 \
 -m size=219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \
-- 
2.54.0

Reply via email to