openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cpu_ppc64.c: remove 'guest' param from ppc64Compute() 

ppc64Compute() is used only once, by virCPUppc64Compare(), which
doesn't use the 'guest' parameter. It was last used by an API
called 'cpuGuestData' that was dropped by commit 03fa904c0c.

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@gmail.com>
This commit is contained in:
Daniel Henrique Barboza 2021-11-18 11:20:20 -03:00
parent 294e92145e
commit 0e2b546166
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/cpu/cpu_ppc64.c
View File

@ -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;