diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 8788996f21..c014c3d501 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 */
@@ -5486,9 +5486,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 37bb4af194..04c7bfc193 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 3a082a8fee..3452b275a6 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -49,7 +49,6 @@
-
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 88f3c0a9fe..d2efacea98 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -51,7 +51,6 @@
-
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index ef93ea921c..d45dac7aec 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -50,7 +50,6 @@
-
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index f1a15943df..c17da78d6d 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -49,7 +49,6 @@
-
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 2b28a59746..32aa56c4e9 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -54,7 +54,6 @@
-
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 4eb750e393..37157189a2 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -54,7 +54,6 @@
-