External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-07 18:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Retire QEMU_CAPS_CPU_CACHE

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-09-04 16:30:44 +02:00
parent 917cf3e164
commit aaec42dbdf
15 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qemu/qemu_capabilities.c
View File

@ -417,7 +417,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 250 */ /* 250 */
"query-named-block-nodes", /* X_QEMU_CAPS_QUERY_NAMED_BLOCK_NODES */ "query-named-block-nodes", /* X_QEMU_CAPS_QUERY_NAMED_BLOCK_NODES */
"cpu-cache", /* QEMU_CAPS_CPU_CACHE */ "cpu-cache", /* X_QEMU_CAPS_CPU_CACHE */
"qemu-xhci", /* QEMU_CAPS_DEVICE_QEMU_XHCI */ "qemu-xhci", /* QEMU_CAPS_DEVICE_QEMU_XHCI */
"kernel-irqchip", /* X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP */ "kernel-irqchip", /* X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP */
"kernel-irqchip.split", /* X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT */ "kernel-irqchip.split", /* X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT */
@ -5457,11 +5457,6 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps)
static void static void
virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps) virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps)
{ {
if (ARCH_IS_X86(qemuCaps->arch) &&
virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) {
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE);
}
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_UNAVAILABLE_FEATURES)) if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_UNAVAILABLE_FEATURES))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CANONICAL_CPU_FEATURES); virQEMUCapsSet(qemuCaps, QEMU_CAPS_CANONICAL_CPU_FEATURES);

2
src/qemu/qemu_capabilities.h
View File

@ -396,7 +396,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 250 */ /* 250 */
X_QEMU_CAPS_QUERY_NAMED_BLOCK_NODES, /* qmp query-named-block-nodes */ X_QEMU_CAPS_QUERY_NAMED_BLOCK_NODES, /* qmp query-named-block-nodes */
QEMU_CAPS_CPU_CACHE, /* -cpu supports host-cache-info and l3-cache properties */ X_QEMU_CAPS_CPU_CACHE, /* -cpu supports host-cache-info and l3-cache properties */
QEMU_CAPS_DEVICE_QEMU_XHCI, /* -device qemu-xhci */ QEMU_CAPS_DEVICE_QEMU_XHCI, /* -device qemu-xhci */
X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP, /* -machine kernel_irqchip */ X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP, /* -machine kernel_irqchip */
X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT, /* -machine kernel_irqchip=split */ X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT, /* -machine kernel_irqchip=split */

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

@ -86,7 +86,6 @@
<flag name='nvdimm'/> <flag name='nvdimm'/>
<flag name='pcie-root-port'/> <flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/> <flag name='query-cpu-definitions'/>
<flag name='cpu-cache'/>
<flag name='qemu-xhci'/> <flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/> <flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.caching-mode'/>

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

@ -86,7 +86,6 @@
<flag name='nvdimm'/> <flag name='nvdimm'/>
<flag name='pcie-root-port'/> <flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/> <flag name='query-cpu-definitions'/>
<flag name='cpu-cache'/>
<flag name='qemu-xhci'/> <flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/> <flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.caching-mode'/>

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

@ -86,7 +86,6 @@
<flag name='nvdimm'/> <flag name='nvdimm'/>
<flag name='pcie-root-port'/> <flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/> <flag name='query-cpu-definitions'/>
<flag name='cpu-cache'/>
<flag name='qemu-xhci'/> <flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/> <flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.caching-mode'/>

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

@ -86,7 +86,6 @@
<flag name='nvdimm'/> <flag name='nvdimm'/>
<flag name='pcie-root-port'/> <flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/> <flag name='query-cpu-definitions'/>
<flag name='cpu-cache'/>
<flag name='qemu-xhci'/> <flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/> <flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.caching-mode'/>

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

@ -85,7 +85,6 @@
<flag name='nvdimm'/> <flag name='nvdimm'/>
<flag name='pcie-root-port'/> <flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/> <flag name='query-cpu-definitions'/>
<flag name='cpu-cache'/>
<flag name='qemu-xhci'/> <flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/> <flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.caching-mode'/>

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

@ -84,7 +84,6 @@
<flag name='nvdimm'/> <flag name='nvdimm'/>
<flag name='pcie-root-port'/> <flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/> <flag name='query-cpu-definitions'/>
<flag name='cpu-cache'/>
<flag name='qemu-xhci'/> <flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/> <flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.caching-mode'/>

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

@ -84,7 +84,6 @@
<flag name='nvdimm'/> <flag name='nvdimm'/>
<flag name='pcie-root-port'/> <flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/> <flag name='query-cpu-definitions'/>
<flag name='cpu-cache'/>
<flag name='qemu-xhci'/> <flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/> <flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.caching-mode'/>

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

@ -84,7 +84,6 @@
<flag name='nvdimm'/> <flag name='nvdimm'/>
<flag name='pcie-root-port'/> <flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/> <flag name='query-cpu-definitions'/>
<flag name='cpu-cache'/>
<flag name='qemu-xhci'/> <flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/> <flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.caching-mode'/>

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

@ -84,7 +84,6 @@
<flag name='nvdimm'/> <flag name='nvdimm'/>
<flag name='pcie-root-port'/> <flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/> <flag name='query-cpu-definitions'/>
<flag name='cpu-cache'/>
<flag name='qemu-xhci'/> <flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/> <flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.caching-mode'/>

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

@ -83,7 +83,6 @@
<flag name='nvdimm'/> <flag name='nvdimm'/>
<flag name='pcie-root-port'/> <flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/> <flag name='query-cpu-definitions'/>
<flag name='cpu-cache'/>
<flag name='qemu-xhci'/> <flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/> <flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.caching-mode'/>

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

@ -84,7 +84,6 @@
<flag name='nvdimm'/> <flag name='nvdimm'/>
<flag name='pcie-root-port'/> <flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/> <flag name='query-cpu-definitions'/>
<flag name='cpu-cache'/>
<flag name='qemu-xhci'/> <flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/> <flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.caching-mode'/>

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

@ -84,7 +84,6 @@
<flag name='nvdimm'/> <flag name='nvdimm'/>
<flag name='pcie-root-port'/> <flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/> <flag name='query-cpu-definitions'/>
<flag name='cpu-cache'/>
<flag name='qemu-xhci'/> <flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/> <flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.caching-mode'/>

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

@ -84,7 +84,6 @@
<flag name='nvdimm'/> <flag name='nvdimm'/>
<flag name='pcie-root-port'/> <flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/> <flag name='query-cpu-definitions'/>
<flag name='cpu-cache'/>
<flag name='qemu-xhci'/> <flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/> <flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.caching-mode'/>