[libvirt PATCH v2 2/2] qemu: capabilities: Drop the virQEMUCapsCacheLookupByArch function
Previous commit removed the last usage of the function. Drop
virQEMUCapsCompareArch as well since virQEMUCapsCacheLookupByArch was
its only caller.
Signed-off-by: Erik Skultety <eskultet(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 63 ------------------------------------
src/qemu/qemu_capabilities.h | 2 --
2 files changed, 65 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index efc42aac17..25a0b36940 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5668,69 +5668,6 @@ virQEMUCapsCacheLookupCopy(virFileCachePtr cache,
}
-static int
-virQEMUCapsCompareArch(const void *payload,
- const void *name G_GNUC_UNUSED,
- const void *opaque)
-{
- struct virQEMUCapsSearchData *data = (struct virQEMUCapsSearchData *)opaque;
- const virQEMUCaps *qemuCaps = payload;
-
- if (qemuCaps->arch != data->arch)
- return false;
-
- if (data->binaryFilter &&
- !strstr(qemuCaps->binary, data->binaryFilter)) {
- return false;
- }
-
- return true;
-}
-
-
-virQEMUCapsPtr
-virQEMUCapsCacheLookupByArch(virFileCachePtr cache,
- virArch arch)
-{
- virQEMUCapsCachePrivPtr priv = virFileCacheGetPriv(cache);
- virQEMUCapsPtr ret = NULL;
- const char *binaryFilters[] = {
- "qemu-system-",
- NULL,
- };
- virArch archs[] = {
- arch,
- virQEMUCapsFindTarget(virArchFromHost(), arch),
- };
- size_t i;
- size_t j;
-
- priv->microcodeVersion = virHostCPUGetMicrocodeVersion();
-
- for (i = 0; i < G_N_ELEMENTS(binaryFilters); i++) {
- for (j = 0; j < G_N_ELEMENTS(archs); j++) {
- struct virQEMUCapsSearchData data = {
- .arch = archs[j],
- .binaryFilter = binaryFilters[i],
- };
-
- ret = virFileCacheLookupByFunc(cache, virQEMUCapsCompareArch, &data);
- if (ret)
- goto done;
- }
- }
-
- virReportError(VIR_ERR_INVALID_ARG,
- _("unable to find any emulator to serve '%s' "
- "architecture"), virArchToString(arch));
-
- done:
- VIR_DEBUG("Returning caps %p for arch %s", ret, virArchToString(arch));
-
- return ret;
-}
-
-
/**
* virQEMUCapsCacheLookupDefault:
* @cache: QEMU capabilities cache
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 3e585d1229..9834fc2a52 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -703,8 +703,6 @@ virQEMUCapsPtr virQEMUCapsCacheLookupCopy(virFileCachePtr cache,
virDomainVirtType virtType,
const char *binary,
const char *machineType);
-virQEMUCapsPtr virQEMUCapsCacheLookupByArch(virFileCachePtr cache,
- virArch arch);
virQEMUCapsPtr virQEMUCapsCacheLookupDefault(virFileCachePtr cache,
const char *binary,
const char *archStr,
--
2.26.2