[PATCH 1/9] qemucapabilitiesdata: Rename sparc capabilities

Michal Privoznik posted 9 patches 2 months, 2 weeks ago
[PATCH 1/9] qemucapabilitiesdata: Rename sparc capabilities
Posted by Michal Privoznik 2 months, 2 weeks ago
Soon, the minimal required version for QEMU is going to be bumped
to 5.2.0. Unfortunately, the latest capabilities for SPARC we
have are of 5.1.0 version. To avoid losing them, just rename them
and pretend they were created with qemu-5.2.0. That'll just do.

The 'enable-fips' capability (QEMU_CAPS_ENABLE_FIPS) is removed
because of a version check in virQEMUCapsInitQMPVersionCaps().
But that's okay.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 .../{qemu_5.1.0.sparc.xml => qemu_5.2.0.sparc.xml}           | 0
 .../{caps_5.1.0_sparc.replies => caps_5.2.0_sparc.replies}   | 4 ++--
 .../{caps_5.1.0_sparc.xml => caps_5.2.0_sparc.xml}           | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename tests/domaincapsdata/{qemu_5.1.0.sparc.xml => qemu_5.2.0.sparc.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.1.0_sparc.replies => caps_5.2.0_sparc.replies} (99%)
 rename tests/qemucapabilitiesdata/{caps_5.1.0_sparc.xml => caps_5.2.0_sparc.xml} (96%)

diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml b/tests/domaincapsdata/qemu_5.2.0.sparc.xml
similarity index 100%
rename from tests/domaincapsdata/qemu_5.1.0.sparc.xml
rename to tests/domaincapsdata/qemu_5.2.0.sparc.xml
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.replies b/tests/qemucapabilitiesdata/caps_5.2.0_sparc.replies
similarity index 99%
rename from tests/qemucapabilitiesdata/caps_5.1.0_sparc.replies
rename to tests/qemucapabilitiesdata/caps_5.2.0_sparc.replies
index 7650f09233..5edec29cf6 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_sparc.replies
@@ -17,10 +17,10 @@
   "return": {
     "qemu": {
       "micro": 0,
-      "minor": 1,
+      "minor": 2,
       "major": 5
     },
-    "package": "qemu-5.1.0-5.fc33"
+    "package": "qemu-5.2.0-5.fc33"
   },
   "id": "libvirt-2"
 }
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml b/tests/qemucapabilitiesdata/caps_5.2.0_sparc.xml
similarity index 96%
rename from tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml
rename to tests/qemucapabilitiesdata/caps_5.2.0_sparc.xml
index ffa167508e..7d36c1d853 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_sparc.xml
@@ -13,7 +13,6 @@
   <flag name='vnc'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='enable-fips'/>
   <flag name='migrate-rdma'/>
   <flag name='spice-gl'/>
   <flag name='spice-rendernode'/>
@@ -46,9 +45,9 @@
   <flag name='input-linux'/>
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='netdev.user'/>
-  <version>5001000</version>
+  <version>5002000</version>
   <microcodeVersion>0</microcodeVersion>
-  <package>qemu-5.1.0-5.fc33</package>
+  <package>qemu-5.2.0-5.fc33</package>
   <arch>sparc</arch>
   <machine type='tcg' name='SS-5' maxCpus='1' default='yes' defaultCPU='Fujitsu-MB86904-sparc-cpu'/>
   <machine type='tcg' name='SS-20' maxCpus='4' defaultCPU='TI-SuperSparc-II-sparc-cpu'/>
-- 
2.44.2
Re: [PATCH 1/9] qemucapabilitiesdata: Rename sparc capabilities
Posted by Peter Krempa 2 months, 2 weeks ago
On Mon, Jul 01, 2024 at 13:41:35 +0200, Michal Privoznik wrote:
> Soon, the minimal required version for QEMU is going to be bumped
> to 5.2.0. Unfortunately, the latest capabilities for SPARC we
> have are of 5.1.0 version. To avoid losing them, just rename them
> and pretend they were created with qemu-5.2.0. That'll just do.
> 
> The 'enable-fips' capability (QEMU_CAPS_ENABLE_FIPS) is removed
> because of a version check in virQEMUCapsInitQMPVersionCaps().
> But that's okay.

I've posted a patch dumping caps from TCG-based qemu_9.0.0, which IMO
would make more sense than just renaming the old file.