Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 5 +----
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
8 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index e7f7a6af4c..01c19c81fd 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -327,7 +327,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 185 */
"dea-key-wrap", /* QEMU_CAPS_DEA_KEY_WRAP */
"pci-serial", /* QEMU_CAPS_DEVICE_PCI_SERIAL */
- "aarch64-off", /* QEMU_CAPS_CPU_AARCH64_OFF */
+ "aarch64-off", /* X_QEMU_CAPS_CPU_AARCH64_OFF */
"vhost-user-multiqueue", /* X_QEMU_CAPS_VHOSTUSER_MULTIQUEUE */
"migration-event", /* X_QEMU_CAPS_MIGRATION_EVENT */
@@ -5467,9 +5467,6 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
/* ACPI only works on x86 and aarch64 */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI);
- /* -cpu ...,aarch64=off is not detectable via qmp at this point */
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_AARCH64_OFF);
-
/* gic is arm specific */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACH_VIRT_GIC_VERSION);
break;
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index d049f79dd9..aacf6084ae 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -305,7 +305,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 185 */
QEMU_CAPS_DEA_KEY_WRAP, /* -machine dea_key_wrap */
QEMU_CAPS_DEVICE_PCI_SERIAL, /* -device pci-serial */
- QEMU_CAPS_CPU_AARCH64_OFF, /* -cpu ...,aarch64=off */
+ X_QEMU_CAPS_CPU_AARCH64_OFF, /* -cpu ...,aarch64=off */
X_QEMU_CAPS_VHOSTUSER_MULTIQUEUE, /* vhost-user with -netdev queues= */
X_QEMU_CAPS_MIGRATION_EVENT, /* MIGRATION event */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index e1a6301897..1d100483dc 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -50,7 +50,6 @@
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='pci-serial'/>
- <flag name='aarch64-off'/>
<flag name='gpex-pcihost'/>
<flag name='ioh3420'/>
<flag name='x3130-upstream'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index f83ee7050b..24548a83a4 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -52,7 +52,6 @@
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='pci-serial'/>
- <flag name='aarch64-off'/>
<flag name='gpex-pcihost'/>
<flag name='ioh3420'/>
<flag name='x3130-upstream'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 4788398af7..5c19c9394d 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -51,7 +51,6 @@
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='pci-serial'/>
- <flag name='aarch64-off'/>
<flag name='gpex-pcihost'/>
<flag name='ioh3420'/>
<flag name='x3130-upstream'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 8238fb5d16..5c27847e23 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -50,7 +50,6 @@
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='pci-serial'/>
- <flag name='aarch64-off'/>
<flag name='gpex-pcihost'/>
<flag name='ioh3420'/>
<flag name='x3130-upstream'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 33c9982bd1..f3e995437d 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -55,7 +55,6 @@
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='pci-serial'/>
- <flag name='aarch64-off'/>
<flag name='gpex-pcihost'/>
<flag name='ioh3420'/>
<flag name='x3130-upstream'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 6517cd71f6..e1272566cc 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -55,7 +55,6 @@
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='pci-serial'/>
- <flag name='aarch64-off'/>
<flag name='gpex-pcihost'/>
<flag name='ioh3420'/>
<flag name='x3130-upstream'/>
--
2.39.2
