Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 7 +------
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 -
tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 -
15 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 972f3e24ee..c1aca27d64 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -417,7 +417,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 250 */
"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 */
"kernel-irqchip", /* X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP */
"kernel-irqchip.split", /* X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT */
@@ -5457,11 +5457,6 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps)
static void
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))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CANONICAL_CPU_FEATURES);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 642a4762b3..612ed03c1f 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -396,7 +396,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 250 */
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 */
X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP, /* -machine kernel_irqchip */
X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT, /* -machine kernel_irqchip=split */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
index 3c197af464..87d4fc6308 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
@@ -86,7 +86,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
index dc107952ca..bd506fc3b3 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
@@ -86,7 +86,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
index ddd3b560ab..96ea862323 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
@@ -86,7 +86,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
index 7162ca6a18..7761b43708 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
@@ -86,7 +86,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
index 77890694ad..237268cb69 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
@@ -85,7 +85,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
index 563c337b23..d7fd5742df 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
@@ -84,7 +84,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
index a33911ff3c..da548c8beb 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@@ -84,7 +84,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
index ce16662d6b..d4b9c16a52 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@@ -84,7 +84,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
index 56422fbdf8..088c417f4d 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@@ -84,7 +84,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
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 69e35c7133..d25f0c50b3 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@@ -83,7 +83,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
index b2fd5794cc..b29c52a643 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@@ -84,7 +84,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
index 3613dfd4cc..20625eee00 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@@ -84,7 +84,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
index 965ba37c7f..a107d2c8dd 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@@ -84,7 +84,6 @@
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
- <flag name='cpu-cache'/>
<flag name='qemu-xhci'/>
<flag name='intel-iommu.intremap'/>
<flag name='intel-iommu.caching-mode'/>
--
2.41.0
