From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 3 Feb 2022 12:23:33 +0000 (+0100)
Subject: qemucapabilitiestest: Hack/fix version in qemu-3.1 tests
X-Git-Tag: v8.1.0-rc1~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a273072b63cb84b06e8d6f43cbabdb79cb77e4b;p=thirdparty%2Flibvirt.git

qemucapabilitiestest: Hack/fix version in qemu-3.1 tests

The test dumps for x86_64 and ppc64 were generated from pre-release
qemu-3.0-rc1/rc2 and thus wouldn't pass our minimum version check.

As these are very old, fix the version info we use for our check to 3.1
without re-generating them and keep the version tag intact.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
index 64080b52ad..5663253798 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
@@ -17,8 +17,8 @@
 {
   "return": {
     "qemu": {
-      "micro": 91,
-      "minor": 0,
+      "micro": 0,
+      "minor": 1,
       "major": 3
     },
     "package": "v3.1.0-rc1-74-g3c035a41dc"
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index ca2ce49684..08ae7072d5 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -143,7 +143,7 @@
   <flag name='cpu-max'/>
   <flag name='input-linux'/>
   <flag name='virtio-blk.queue-size'/>
-  <version>3000091</version>
+  <version>3001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900240</microcodeVersion>
   <package>v3.1.0-rc1-74-g3c035a41dc</package>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
index d021745a06..144448783a 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
@@ -17,8 +17,8 @@
 {
   "return": {
     "qemu": {
-      "micro": 92,
-      "minor": 0,
+      "micro": 0,
+      "minor": 1,
       "major": 3
     },
     "package": "v3.1.0-rc2-48-g039d4e3df0"
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 654e9acca4..c342862b9a 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -186,7 +186,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
-  <version>3000092</version>
+  <version>3001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100240</microcodeVersion>
   <package>v3.1.0-rc2-48-g039d4e3df0</package>