[PATCH 15/15] qemu: capabilities: Remove unused virQEMUCapsInitQMPBasicArch
The function doesn't set any capability and we don't want to add
arch-dependent always-peresent capabilities in the future.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 57 ------------------------------------
src/qemu/qemu_capspriv.h | 3 --
tests/qemuhotplugtest.c | 2 --
tests/qemuxml2argvtest.c | 2 --
tests/qemuxml2xmltest.c | 3 --
5 files changed, 67 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 76fb739fbc..18c4c0b1cd 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5462,61 +5462,6 @@ virQEMUCapsInitQMPArch(virQEMUCaps *qemuCaps,
}
-/**
- * virQEMUCapsInitQMPBasicArch:
- * @qemuCaps: QEMU capabilities
- *
- * Initialize @qemuCaps with basic always present and architecture-dependent
- * capabilities.
- */
-void
-virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
-{
- switch (qemuCaps->arch) {
- case VIR_ARCH_S390:
- case VIR_ARCH_S390X:
- case VIR_ARCH_AARCH64:
- case VIR_ARCH_I686:
- case VIR_ARCH_X86_64:
- case VIR_ARCH_ALPHA:
- case VIR_ARCH_PPC:
- case VIR_ARCH_PPCEMB:
- case VIR_ARCH_SH4:
- case VIR_ARCH_SH4EB:
- case VIR_ARCH_RISCV32:
- case VIR_ARCH_RISCV64:
- case VIR_ARCH_SPARC:
- case VIR_ARCH_SPARC64:
- case VIR_ARCH_ARMV6L:
- case VIR_ARCH_ARMV7L:
- case VIR_ARCH_ARMV7B:
- case VIR_ARCH_CRIS:
- case VIR_ARCH_ITANIUM:
- case VIR_ARCH_LM32:
- case VIR_ARCH_M68K:
- case VIR_ARCH_MICROBLAZE:
- case VIR_ARCH_MICROBLAZEEL:
- case VIR_ARCH_MIPS:
- case VIR_ARCH_MIPSEL:
- case VIR_ARCH_MIPS64:
- case VIR_ARCH_MIPS64EL:
- case VIR_ARCH_OR32:
- case VIR_ARCH_PARISC:
- case VIR_ARCH_PARISC64:
- case VIR_ARCH_PPCLE:
- case VIR_ARCH_PPC64:
- case VIR_ARCH_PPC64LE:
- case VIR_ARCH_UNICORE32:
- case VIR_ARCH_XTENSA:
- case VIR_ARCH_XTENSAEB:
- case VIR_ARCH_NONE:
- case VIR_ARCH_LAST:
- default:
- break;
- }
-}
-
-
/**
* virQEMUCapsInitQMPVersionCaps:
* @qemuCaps: QEMU capabilities
@@ -5666,8 +5611,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCaps *qemuCaps,
if (virQEMUCapsInitQMPArch(qemuCaps, mon) < 0)
return -1;
- virQEMUCapsInitQMPBasicArch(qemuCaps);
-
/* initiate all capabilities based on qemu version */
virQEMUCapsInitQMPVersionCaps(qemuCaps);
diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h
index 720435f762..60fdf02f06 100644
--- a/src/qemu/qemu_capspriv.h
+++ b/src/qemu/qemu_capspriv.h
@@ -66,9 +66,6 @@ virQEMUCapsInitCPUModel(virQEMUCaps *qemuCaps,
virCPUDef *cpu,
bool migratable);
-void
-virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps);
-
qemuMonitorCPUModelInfo *
virQEMUCapsGetCPUModelInfo(virQEMUCaps *qemuCaps,
virDomainVirtType type);
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 3b54a9e957..6a36856d8a 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -70,8 +70,6 @@ qemuHotplugCreateObjects(virDomainXMLOption *xmlopt,
priv->qemuCaps = virQEMUCapsNew();
- virQEMUCapsInitQMPBasicArch(priv->qemuCaps);
-
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_PLAIN);
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index cbb57523e9..740d7a5db5 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -345,8 +345,6 @@ testUpdateQEMUCaps(const struct testQemuInfo *info,
virQEMUCapsSetArch(info->qemuCaps, arch);
- virQEMUCapsInitQMPBasicArch(info->qemuCaps);
-
if (testAddCPUModels(info->qemuCaps,
!!(info->flags & FLAG_SKIP_LEGACY_CPUS)) < 0)
return -1;
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 473031df08..a1f8b004fb 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -41,9 +41,6 @@ testXML2XMLCommon(const struct testQemuInfo *info)
else
driver.caps = linuxCaps;
- if (!(info->flags & FLAG_REAL_CAPS))
- virQEMUCapsInitQMPBasicArch(info->qemuCaps);
-
virFileCacheClear(driver.qemuCapsCache);
if (info->args.hostOS == HOST_OS_MACOS)
--
2.39.2