qemu: capabilities: Drop 'kvmVersion' field

It's never set to any real value. Remove it along with the caching code.

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

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 6244dca6dc3180a98c378dab37694037f82a47f7..25efd25a6a9c654a31e0f62c19f1a3b49eaadc64 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -760,7 +760,6 @@ struct _virQEMUCaps {
     virBitmap *flags;
 
     unsigned int version;
-    unsigned int kvmVersion;
     unsigned int libvirtVersion;
     unsigned int microcodeVersion;
     char *hostCPUSignature;
@@ -1992,7 +1991,6 @@ virQEMUCaps *virQEMUCapsNewCopy(virQEMUCaps *qemuCaps)
     ret->flags = virBitmapNewCopy(qemuCaps->flags);
 
     ret->version = qemuCaps->version;
-    ret->kvmVersion = qemuCaps->kvmVersion;
     ret->microcodeVersion = qemuCaps->microcodeVersion;
     ret->hostCPUSignature = g_strdup(qemuCaps->hostCPUSignature);
 
@@ -2145,12 +2143,6 @@ unsigned int virQEMUCapsGetVersion(virQEMUCaps *qemuCaps)
 }
 
 
-unsigned int virQEMUCapsGetKVMVersion(virQEMUCaps *qemuCaps)
-{
-    return qemuCaps->kvmVersion;
-}
-
-
 const char *virQEMUCapsGetPackage(virQEMUCaps *qemuCaps)
 {
     return qemuCaps->package;
@@ -4703,12 +4695,6 @@ virQEMUCapsLoadCache(virArch hostArch,
         return -1;
     }
 
-    if (virXPathUInt("string(./kvmVersion)", ctxt, &qemuCaps->kvmVersion) < 0) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("missing version in QEMU capabilities cache"));
-        return -1;
-    }
-
     if (virXPathUInt("string(./microcodeVersion)", ctxt,
                      &qemuCaps->microcodeVersion) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -5046,9 +5032,6 @@ virQEMUCapsFormatCache(virQEMUCaps *qemuCaps)
     virBufferAsprintf(&buf, "<version>%d</version>\n",
                       qemuCaps->version);
 
-    virBufferAsprintf(&buf, "<kvmVersion>%d</kvmVersion>\n",
-                      qemuCaps->kvmVersion);
-
     virBufferAsprintf(&buf, "<microcodeVersion>%u</microcodeVersion>\n",
                       qemuCaps->microcodeVersion);
     virBufferEscapeString(&buf, "<hostCPUSignature>%s</hostCPUSignature>\n",

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 15f0df531716092a0f862ebc65c4427874586480..4881f412538f01c2124e499fbccce452d5be97c5 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -704,7 +704,6 @@ virArch virQEMUCapsGetArch(virQEMUCaps *qemuCaps);
 unsigned int virQEMUCapsGetVersion(virQEMUCaps *qemuCaps);
 const char *virQEMUCapsGetPackage(virQEMUCaps *qemuCaps);
 
-unsigned int virQEMUCapsGetKVMVersion(virQEMUCaps *qemuCaps);
 int virQEMUCapsAddCPUDefinitions(virQEMUCaps *qemuCaps,
                                  virDomainVirtType type,
                                  const char **name,

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
index e0cc16e7304ce186ea33c1f719fe4e1e1ec58e55..f87962a379fe91761da3c642615b2aee8ab45a65 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
@@ -112,7 +112,6 @@
   <flag name='usb-host.guest-resets-all'/>
   <flag name='virtio-crypto'/>
   <version>4002000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700242</microcodeVersion>
   <package>v4.1.0-2221-g36609b4fa3</package>
   <arch>aarch64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
index de9c102caa92ea84ff603a0ad15ac5f9a4bae4e5..1cc145cf588c91aa19eb464d18af774ea5bdce07 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
@@ -118,7 +118,6 @@
   <flag name='usb-host.guest-resets-all'/>
   <flag name='virtio-crypto'/>
   <version>4002000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900242</microcodeVersion>
   <package>v4.1.0-2198-g9e583f2</package>
   <arch>ppc64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
index 08d0993ba3d9efa9dea87c261c99986ce61b90f6..b440d9d5389f13cc6fce7a1048fca4c12ea9bd8b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
@@ -76,7 +76,6 @@
   <flag name='usb-host.guest-resets-all'/>
   <flag name='virtio-crypto'/>
   <version>4002000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100242</microcodeVersion>
   <package>qemu-4.2.0-20200115.0.1e4aa2da.fc31</package>
   <arch>s390x</arch>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
index e36983da58698989333fe77d62929dab87dbe122..b45d4a629328f6176b1b6b96af2f3d49c61f1ff6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
@@ -154,7 +154,6 @@
   <flag name='usb-host.guest-resets-all'/>
   <flag name='virtio-crypto'/>
   <version>4002000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
   <package>v4.2.0</package>
   <arch>x86_64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
index 52529690c352e69c02d0babb6b0e6e4bff5d8156..09619133c4d2b3d57487c04e51c2f2e18e920773 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
@@ -124,7 +124,6 @@
   <flag name='usb-host.guest-resets-all'/>
   <flag name='virtio-crypto'/>
   <version>5000000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700241</microcodeVersion>
   <package>v5.0.0</package>
   <arch>aarch64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
index 9e1147e302c69a8f61044fe5359872d9c6c66f8c..3b49aee40afa58debf05cc738eebee83d3df4bb7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
@@ -133,7 +133,6 @@
   <flag name='usb-host.guest-resets-all'/>
   <flag name='virtio-crypto'/>
   <version>5000000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900241</microcodeVersion>
   <package>v5.0.0</package>
   <arch>ppc64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
index f306bc83cd3b3081204d5a3db157f98e671bbc4f..fb460c9300e64248c9e73a2a241e55c4944c8905 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
@@ -119,7 +119,6 @@
   <flag name='usb-host.guest-resets-all'/>
   <flag name='virtio-crypto'/>
   <version>5000000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
   <package>v5.0.0</package>
   <arch>riscv64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
index 89a083dda80ca6e1de7bbfb424a821baedcbf132..5331cf0113aaab0763c6ebe6f1df1d8043329691 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
@@ -163,7 +163,6 @@
   <flag name='usb-host.guest-resets-all'/>
   <flag name='virtio-crypto'/>
   <version>5000000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100241</microcodeVersion>
   <package>v5.0.0</package>
   <arch>x86_64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml
index 68728321eb05798041ef91cf71db471483df5abf..bc5b3e6fac208a90163b866740a8c341b20314ea 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml
@@ -48,7 +48,6 @@
   <flag name='input-linux'/>
   <flag name='memory-backend-file.prealloc-threads'/>
   <version>5001000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
   <package>qemu-5.1.0-5.fc33</package>
   <arch>sparc</arch>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
index f02e8432481c0c0eaf973290a33fba66db43d7a6..1c3d3ea2a9a2acdd487a5e07ea15d1a5aebdf606 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
@@ -167,7 +167,6 @@
   <flag name='usb-host.guest-resets-all'/>
   <flag name='virtio-crypto'/>
   <version>5001000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
   <package>v5.1.0</package>
   <arch>x86_64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
index 8657478d86a53dce0d99ddeec9aac4beca01fde1..effcf4e96a832e0f3559b5df72e60cfc819e1195 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
@@ -131,7 +131,6 @@
   <flag name='usb-host.guest-resets-all'/>
   <flag name='virtio-crypto'/>
   <version>5002000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700243</microcodeVersion>
   <package>v5.2.0</package>
   <arch>aarch64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
index 9a571817c6ae3fda96ebcc9e923a6a505426e5aa..d02441420d03ba231d2335e5f8ccd0ede21761fa 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
@@ -138,7 +138,6 @@
   <flag name='usb-host.guest-resets-all'/>
   <flag name='virtio-crypto'/>
   <version>5002000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900243</microcodeVersion>
   <package>v5.2.0</package>
   <arch>ppc64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
index ff3a4a7168aa1f279f05bc22787bc0dbd485b5e8..fe4757a12e7dc2d0c2bfc5e4bffec6fbcfd28ecf 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
@@ -124,7 +124,6 @@
   <flag name='usb-host.guest-resets-all'/>
   <flag name='virtio-crypto'/>
   <version>5002000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
   <package>v5.2.0</package>
   <arch>riscv64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
index 3ec0bd4c32df77c7c3b7bed60309359663c9f719..38a3f70a5e24dd43dde83ad7cd897c5ca9456933 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
@@ -87,7 +87,6 @@
   <flag name='virtio-net.rss'/>
   <flag name='virtio-crypto'/>
   <version>5002000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100243</microcodeVersion>
   <package>qemu-5.2.0-20201215.0.ba93e22c.fc32</package>
   <arch>s390x</arch>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
index 293447644e9d015409bff9a495c3fc370bc6fd9d..654fec58fe0d96c6d7cd63ce6cfa10cf8a9a652a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
@@ -171,7 +171,6 @@
   <flag name='usb-host.guest-resets-all'/>
   <flag name='virtio-crypto'/>
   <version>5002000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
   <package>v5.2.0</package>
   <arch>x86_64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
index a71b955266af203e7553e3309b5bd2743ebff35a..651cdc8095169ac18245e7506934cd067e906efa 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
@@ -141,7 +141,6 @@
   <flag name='virtio-crypto'/>
   <flag name='pvpanic-pci'/>
   <version>6000000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700242</microcodeVersion>
   <package>v6.0.0</package>
   <arch>aarch64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
index 89420c1e9bd2312fee835951c166d3c55fa51844..a63263e7e5a224affe64c81fe58c21f467048fe6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
@@ -96,7 +96,6 @@
   <flag name='migration.blocked-reasons'/>
   <flag name='virtio-crypto'/>
   <version>6000000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100242</microcodeVersion>
   <package>qemu-6.0.0-20210517.1.4ff77070.fc33</package>
   <arch>s390x</arch>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
index fc6a3ffd4a074ad8719fe09b32e2daad26fdd442..b1bf3caecf155108109889d9aba072febffd432b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
@@ -182,7 +182,6 @@
   <flag name='virtio-crypto'/>
   <flag name='pvpanic-pci'/>
   <version>6000000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
   <package>v6.0.0</package>
   <arch>x86_64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
index da8478cefa161763b60bfc0da13641717ff8de2b..13d909e382239a3152beb405cd2553dfdf2a89ef 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
@@ -188,7 +188,6 @@
   <flag name='pvpanic-pci'/>
   <flag name='virtio-gpu.blob'/>
   <version>6001000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
   <package>v6.1.0</package>
   <arch>x86_64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
index ca7ab8bbc75f2d5e9d0c37e56f90f465fd127735..fd3d1602a1f11a52715956a717ffea1379b093e7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
@@ -154,7 +154,6 @@
   <flag name='pvpanic-pci'/>
   <flag name='virtio-gpu.blob'/>
   <version>6001050</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700244</microcodeVersion>
   <package></package>
   <arch>aarch64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
index 7759599e677fccb05a1be1726fb916dc42890985..97ebca47eb211516eae2e97ac0afbd08d778485b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
@@ -151,7 +151,6 @@
   <flag name='pvpanic-pci'/>
   <flag name='virtio-gpu.blob'/>
   <version>6002000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900244</microcodeVersion>
   <package>v6.2.0</package>
   <arch>ppc64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
index db33c3034148529a7677d7cb2f89f31cf4f0c11c..e1758396b0de9bbacc80ea1d9ea4b6b5c172ecb7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@@ -190,7 +190,6 @@
   <flag name='pvpanic-pci'/>
   <flag name='virtio-gpu.blob'/>
   <version>6002000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
   <package>v6.2.0</package>
   <arch>x86_64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
index 836932b95d4be07e4989ae0abc9caa3657c0e893..2e8495dcdd4c7e96561aa64c47de5754b2d5a563 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
@@ -162,7 +162,6 @@
   <flag name='pvpanic-pci'/>
   <flag name='virtio-gpu.blob'/>
   <version>6002092</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700243</microcodeVersion>
   <package>v7.0.0-rc2</package>
   <arch>aarch64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
index fd428a8afd2d34039372947001aa65fe11862bba..1420cc844d7c9ac40c74f23bebda806d148d2e0f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
@@ -162,7 +162,6 @@
   <flag name='pvpanic-pci'/>
   <flag name='virtio-gpu.blob'/>
   <version>6002092</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700243</microcodeVersion>
   <package>v7.0.0-rc2</package>
   <arch>aarch64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
index f4d161b7b45d369860a0258cd3f23c5146775069..a00ed4ef68b8c4e8fee6050297a2bd68703515b7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
@@ -169,7 +169,6 @@
   <flag name='pvpanic-pci'/>
   <flag name='virtio-gpu.blob'/>
   <version>7000000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900243</microcodeVersion>
   <package>v7.0.0</package>
   <arch>ppc64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
index 148763007867089ebfdbf1ad4669a58aeb1c313d..b7446435a6f7a3ba6635b61c95685db89effbe51 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@@ -196,7 +196,6 @@
   <flag name='pvpanic-pci'/>
   <flag name='virtio-gpu.blob'/>
   <version>7000000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
   <package>v7.0.0</package>
   <arch>x86_64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
index e7fd3efca663cf06da2b75869d5f482e3d91ea32..ccae1b1d2b36edd3331bb75612d199c21764d562 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
@@ -169,7 +169,6 @@
   <flag name='pvpanic-pci'/>
   <flag name='virtio-gpu.blob'/>
   <version>7001000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900244</microcodeVersion>
   <package>v7.1.0</package>
   <arch>ppc64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
index 17b2286a68b254dc0104456315604761cda4c479..649269570520cd707c6a656655a57b92ad62841d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@@ -199,7 +199,6 @@
   <flag name='pvpanic-pci'/>
   <flag name='virtio-gpu.blob'/>
   <version>7001000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
   <package>v7.1.0</package>
   <arch>x86_64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
index 717debd9b1fb4f855743c929148b45a1f5ae4b4e..f190be552a99d130f49680334e74f3c00337794b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
@@ -157,7 +157,6 @@
   <flag name='pvpanic-pci'/>
   <flag name='virtio-gpu.blob'/>
   <version>7002000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
   <package>qemu-7.2.0-6.fc37</package>
   <arch>ppc</arch>

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
index 941823892c083356c23204e68f14694e17ed3d5d..c08a99e7348c631c1a790a7466069f6ce2123159 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@@ -203,7 +203,6 @@
   <flag name='pvpanic-pci'/>
   <flag name='virtio-gpu.blob'/>
   <version>7002000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100245</microcodeVersion>
   <package>v7.2.0</package>
   <arch>x86_64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
index 6a4ac5dcfae7dc289d20b9df1ddaa7257b6df622..37933c08483566a642abd3ac1a09d7a0bd61d1f2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@@ -203,7 +203,6 @@
   <flag name='pvpanic-pci'/>
   <flag name='virtio-gpu.blob'/>
   <version>7002000</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100245</microcodeVersion>
   <package>v7.2.0</package>
   <arch>x86_64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
index a75e80120dce7788a51bdfd559cf266c41220f1d..361c5fb81114453569d6a31179c268f887f8d9cf 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
@@ -144,7 +144,6 @@
   <flag name='pvpanic-pci'/>
   <flag name='virtio-gpu.blob'/>
   <version>7002050</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
   <package>v7.2.0-333-g222059a0fc</package>
   <arch>riscv64</arch>

diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
index 74128be9045915b26ebe33da38fc6aa2e9ab17d0..73924e1163b746c30d279a3da623cf79418d0e43 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@@ -207,7 +207,6 @@
   <flag name='rbd-encryption-layering'/>
   <flag name='rbd-encryption-luks-any'/>
   <version>7002050</version>
-  <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
   <package>v7.2.0-2146-g2946e1af27</package>
   <arch>x86_64</arch>