External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Drop 'kvmVersion' field

Browse Source 
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>
This commit is contained in:
Peter Krempa 2023-03-17 08:37:46 +01:00
parent 1485f9c17d
commit 6861964704
35 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/qemu/qemu_capabilities.c
View File

@ -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",

1
src/qemu/qemu_capabilities.h
View File

@ -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,

1
tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
View File

@ -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>

1
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
View File

@ -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>