[PATCH 3/7] cpu_ppc64.c: remove 'guest' param from ppc64Compute()
ppc64Compute() is used only once, by virCPUppc64Compare(), which
doesn't use the 'guest' parameter.
The reason is similar to what was mentioned in the previous patch:
this parameter was being used by an API called 'cpuGuestData' that
was dropped by commit 03fa904c0c0cb2.
Removing the 'guest' parameter will not only remove unused code from
ppc64Compute() but also remove the ppc64MakeCPUData() entirely.
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
src/cpu/cpu_ppc64.c | 26 +-------------------------
1 file changed, 1 insertion(+), 25 deletions(-)
diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
index c7caaa9608..314d2f7c86 100644
--- a/src/cpu/cpu_ppc64.c
+++ b/src/cpu/cpu_ppc64.c
@@ -379,32 +379,15 @@ ppc64LoadMap(void)
return g_steal_pointer(&map);
}
-static virCPUData *
-ppc64MakeCPUData(virArch arch,
- virCPUppc64Data *data)
-{
- g_autoptr(virCPUData) cpuData = NULL;
-
- cpuData = g_new0(virCPUData, 1);
- cpuData->arch = arch;
-
- if (ppc64DataCopy(&cpuData->data.ppc64, data) < 0)
- return NULL;
-
- return g_steal_pointer(&cpuData);
-}
-
static virCPUCompareResult
ppc64Compute(virCPUDef *host,
const virCPUDef *other,
- virCPUData **guestData,
char **message)
{
g_autoptr(virCPUppc64Map) map = NULL;
g_autoptr(virCPUppc64Model) host_model = NULL;
g_autoptr(virCPUppc64Model) guest_model = NULL;
g_autoptr(virCPUDef) cpu = NULL;
- virArch arch;
size_t i;
/* Ensure existing configurations are handled correctly */
@@ -431,9 +414,6 @@ ppc64Compute(virCPUDef *host,
return VIR_CPU_COMPARE_INCOMPATIBLE;
}
- arch = cpu->arch;
- } else {
- arch = host->arch;
}
if (cpu->vendor &&
@@ -506,10 +486,6 @@ ppc64Compute(virCPUDef *host,
return VIR_CPU_COMPARE_INCOMPATIBLE;
}
- if (guestData)
- if (!(*guestData = ppc64MakeCPUData(arch, &guest_model->data)))
- return VIR_CPU_COMPARE_ERROR;
-
return VIR_CPU_COMPARE_IDENTICAL;
}
@@ -532,7 +508,7 @@ virCPUppc64Compare(virCPUDef *host,
return VIR_CPU_COMPARE_INCOMPATIBLE;
}
- ret = ppc64Compute(host, cpu, NULL, &message);
+ ret = ppc64Compute(host, cpu, &message);
if (failIncompatible && ret == VIR_CPU_COMPARE_INCOMPATIBLE) {
ret = VIR_CPU_COMPARE_ERROR;
--
2.31.1