[PATCH 01/31] 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(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 17 ----------------- src/qemu/qemu_capabilities.h | 1 - .../qemucapabilitiesdata/caps_4.2.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0_x86_64.xml | 1 - .../qemucapabilitiesdata/caps_5.0.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 1 - .../qemucapabilitiesdata/caps_5.0.0_riscv64.xml | 1 - .../qemucapabilitiesdata/caps_5.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml | 1 - .../qemucapabilitiesdata/caps_5.1.0_x86_64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0_riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 1 - .../qemucapabilitiesdata/caps_6.0.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml | 1 - .../qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 1 - .../qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 1 - .../qemucapabilitiesdata/caps_6.2.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 - .../qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 - .../caps_7.0.0_aarch64+hvf.xml | 1 - .../qemucapabilitiesdata/caps_7.0.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 - .../qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 - .../qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 - .../caps_7.2.0_x86_64+hvf.xml | 1 - .../qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 - .../qemucapabilitiesdata/caps_8.0.0_riscv64.xml | 1 - .../qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 - 35 files changed, 51 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f37a81bfe7..6355c80f30 100644 --- 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; @@ -4706,12 +4698,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", @@ -5049,9 +5035,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 15f0df5317..4881f41253 100644 --- 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 e0cc16e730..f87962a379 100644 --- 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 de9c102caa..1cc145cf58 100644 --- 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 08d0993ba3..b440d9d538 100644 --- 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 e36983da58..b45d4a6293 100644 --- 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 52529690c3..09619133c4 100644 --- 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 9e1147e302..3b49aee40a 100644 --- 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 f306bc83cd..fb460c9300 100644 --- 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 89a083dda8..5331cf0113 100644 --- 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 68728321eb..bc5b3e6fac 100644 --- 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 f02e843248..1c3d3ea2a9 100644 --- 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 8657478d86..effcf4e96a 100644 --- 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 9a571817c6..d02441420d 100644 --- 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 ff3a4a7168..fe4757a12e 100644 --- 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 3ec0bd4c32..38a3f70a5e 100644 --- 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 293447644e..654fec58fe 100644 --- 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 a71b955266..651cdc8095 100644 --- 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 89420c1e9b..a63263e7e5 100644 --- 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 fc6a3ffd4a..b1bf3caecf 100644 --- 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 da8478cefa..13d909e382 100644 --- 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 ca7ab8bbc7..fd3d1602a1 100644 --- 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 7759599e67..97ebca47eb 100644 --- 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 db33c30341..e1758396b0 100644 --- 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 836932b95d..2e8495dcdd 100644 --- 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 fd428a8afd..1420cc844d 100644 --- 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 f4d161b7b4..a00ed4ef68 100644 --- 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 1487630078..b7446435a6 100644 --- 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 e7fd3efca6..ccae1b1d2b 100644 --- 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 17b2286a68..6492695705 100644 --- 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 717debd9b1..f190be552a 100644 --- 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 941823892c..c08a99e734 100644 --- 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 6a4ac5dcfa..37933c0848 100644 --- 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 a75e80120d..361c5fb811 100644 --- 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 74128be904..73924e1163 100644 --- 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> -- 2.39.2