From 387c900de9ef4aae17b4b9634a9a54c64eb475e6 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 15 Oct 2021 11:40:05 +0200
Subject: [PATCH] qemucapabilitiestest: Update qemu-6.2 cycle capability test
 data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update to v6.1.0-1510-gc148a05721 which most notably adds the 'json-cli'
feature for 'device_add' QMP command meaning that -device accepts JSON.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 .../caps_6.2.0.x86_64.replies                 | 155 +++++++++---------
 .../caps_6.2.0.x86_64.xml                     |   2 +-
 2 files changed, 80 insertions(+), 77 deletions(-)

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
index bfa327e102..aa7a779a68 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
@@ -21,7 +21,7 @@
       "minor": 1,
       "major": 6
     },
-    "package": "v6.1.0-1313-gc09124dcb8"
+    "package": "v6.1.0-1510-gc148a05721"
   },
   "id": "libvirt-2"
 }
@@ -1122,7 +1122,10 @@
       "name": "device_add",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "180"
+      "arg-type": "180",
+      "features": [
+        "json-cli"
+      ]
     },
     {
       "name": "device_del",
@@ -1446,9 +1449,9 @@
     },
     {
       "name": "query-sev-attestation-report",
-      "ret-type": "235",
+      "ret-type": "233",
       "meta-type": "command",
-      "arg-type": "234"
+      "arg-type": "232"
     },
     {
       "name": "query-sgx",
@@ -6126,19 +6129,19 @@
           "type": "401"
         },
         {
-          "case": "memory-backend-file",
+          "case": "memory-backend-epc",
           "type": "402"
         },
         {
-          "case": "memory-backend-memfd",
+          "case": "memory-backend-file",
           "type": "403"
         },
         {
-          "case": "memory-backend-ram",
+          "case": "memory-backend-memfd",
           "type": "404"
         },
         {
-          "case": "memory-backend-epc",
+          "case": "memory-backend-ram",
           "type": "405"
         },
         {
@@ -7269,7 +7272,7 @@
       "meta-type": "object"
     },
     {
-      "name": "234",
+      "name": "232",
       "members": [
         {
           "name": "mnonce",
@@ -7279,7 +7282,7 @@
       "meta-type": "object"
     },
     {
-      "name": "235",
+      "name": "233",
       "members": [
         {
           "name": "data",
@@ -11313,10 +11316,10 @@
         "input-barrier",
         "input-linux",
         "iothread",
+        "memory-backend-epc",
         "memory-backend-file",
         "memory-backend-memfd",
         "memory-backend-ram",
-        "memory-backend-epc",
         "pef-guest",
         "pr-manager-helper",
         "qtest",
@@ -11803,6 +11806,61 @@
     },
     {
       "name": "402",
+      "members": [
+        {
+          "name": "dump",
+          "default": null,
+          "type": "bool"
+        },
+        {
+          "name": "host-nodes",
+          "default": null,
+          "type": "[int]"
+        },
+        {
+          "name": "merge",
+          "default": null,
+          "type": "bool"
+        },
+        {
+          "name": "policy",
+          "default": null,
+          "type": "423"
+        },
+        {
+          "name": "prealloc",
+          "default": null,
+          "type": "bool"
+        },
+        {
+          "name": "prealloc-threads",
+          "default": null,
+          "type": "int"
+        },
+        {
+          "name": "share",
+          "default": null,
+          "type": "bool"
+        },
+        {
+          "name": "reserve",
+          "default": null,
+          "type": "bool"
+        },
+        {
+          "name": "size",
+          "type": "int"
+        },
+        {
+          "name": "x-use-canonical-path-for-ramblock-id",
+          "default": null,
+          "type": "bool"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "403",
       "members": [
         {
           "name": "dump",
@@ -11881,7 +11939,7 @@
       "meta-type": "object"
     },
     {
-      "name": "403",
+      "name": "404",
       "members": [
         {
           "name": "dump",
@@ -11950,61 +12008,6 @@
       ],
       "meta-type": "object"
     },
-    {
-      "name": "404",
-      "members": [
-        {
-          "name": "dump",
-          "default": null,
-          "type": "bool"
-        },
-        {
-          "name": "host-nodes",
-          "default": null,
-          "type": "[int]"
-        },
-        {
-          "name": "merge",
-          "default": null,
-          "type": "bool"
-        },
-        {
-          "name": "policy",
-          "default": null,
-          "type": "423"
-        },
-        {
-          "name": "prealloc",
-          "default": null,
-          "type": "bool"
-        },
-        {
-          "name": "prealloc-threads",
-          "default": null,
-          "type": "int"
-        },
-        {
-          "name": "share",
-          "default": null,
-          "type": "bool"
-        },
-        {
-          "name": "reserve",
-          "default": null,
-          "type": "bool"
-        },
-        {
-          "name": "size",
-          "type": "int"
-        },
-        {
-          "name": "x-use-canonical-path-for-ramblock-id",
-          "default": null,
-          "type": "bool"
-        }
-      ],
-      "meta-type": "object"
-    },
     {
       "name": "405",
       "members": [
@@ -17168,8 +17171,8 @@
       "parent": "pci-device"
     },
     {
-      "name": "sev-guest",
-      "parent": "confidential-guest-support"
+      "name": "chardev-stdio",
+      "parent": "chardev-fd"
     },
     {
       "name": "usb-wacom-tablet",
@@ -17192,8 +17195,8 @@
       "parent": "pci-vga"
     },
     {
-      "name": "virtio-blk-pci-transitional",
-      "parent": "virtio-blk-pci-base"
+      "name": "kvm-pit",
+      "parent": "pit-common"
     },
     {
       "name": "Haswell-v1-x86_64-cpu",
@@ -17216,8 +17219,8 @@
       "parent": "generic-pc-machine"
     },
     {
-      "name": "kvm-pit",
-      "parent": "pit-common"
+      "name": "sev-guest",
+      "parent": "confidential-guest-support"
     },
     {
       "name": "ich9-usb-uhci5",
@@ -19472,8 +19475,8 @@
       "parent": "qio-channel"
     },
     {
-      "name": "chardev-stdio",
-      "parent": "chardev-fd"
+      "name": "virtio-blk-pci-transitional",
+      "parent": "virtio-blk-pci-base"
     },
     {
       "name": "virtio-vga",
@@ -29472,7 +29475,7 @@
   "id": "libvirt-48",
   "error": {
     "class": "GenericError",
-    "desc": "Failed to open /dev/sev: No such file or directory"
+    "desc": "SEV: Failed to open /dev/sev: No such file or directory"
   }
 }
 
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index d8060225eb..1e3a4c0aeb 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -243,7 +243,7 @@
   <version>6001050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
-  <package>v6.1.0-1313-gc09124dcb8</package>
+  <package>v6.1.0-1510-gc148a05721</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
     <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/>