mirror of https://gitee.com/openkylin/libvirt.git
cpu: Drop unused flags from cpuArchDecode
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
parent
0aa9383f3c
commit
86e2df6e71
|
@ -251,7 +251,7 @@ cpuDecode(virCPUDefPtr cpu,
|
|||
return -1;
|
||||
}
|
||||
|
||||
return driver->decode(cpu, data, models, nmodels, preferred, 0);
|
||||
return driver->decode(cpu, data, models, nmodels, preferred);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -54,8 +54,7 @@ typedef int
|
|||
const virCPUData *data,
|
||||
const char **models,
|
||||
unsigned int nmodels,
|
||||
const char *preferred,
|
||||
unsigned int flags);
|
||||
const char *preferred);
|
||||
|
||||
typedef int
|
||||
(*cpuArchEncode) (virArch arch,
|
||||
|
|
|
@ -665,15 +665,12 @@ ppc64DriverDecode(virCPUDefPtr cpu,
|
|||
const virCPUData *data,
|
||||
const char **models,
|
||||
unsigned int nmodels,
|
||||
const char *preferred ATTRIBUTE_UNUSED,
|
||||
unsigned int flags)
|
||||
const char *preferred ATTRIBUTE_UNUSED)
|
||||
{
|
||||
int ret = -1;
|
||||
struct ppc64_map *map;
|
||||
const struct ppc64_model *model;
|
||||
|
||||
virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, -1);
|
||||
|
||||
if (!data || !(map = ppc64LoadMap()))
|
||||
return -1;
|
||||
|
||||
|
@ -740,7 +737,7 @@ virCPUppc64GetHost(virCPUDefPtr cpu,
|
|||
#endif
|
||||
data->pvr[0].mask = 0xfffffffful;
|
||||
|
||||
ret = ppc64DriverDecode(cpu, cpuData, models, nmodels, NULL, 0);
|
||||
ret = ppc64DriverDecode(cpu, cpuData, models, nmodels, NULL);
|
||||
|
||||
cleanup:
|
||||
virCPUppc64DataFree(cpuData);
|
||||
|
|
|
@ -1984,10 +1984,9 @@ x86DecodeCPUData(virCPUDefPtr cpu,
|
|||
const virCPUData *data,
|
||||
const char **models,
|
||||
unsigned int nmodels,
|
||||
const char *preferred,
|
||||
unsigned int flags)
|
||||
const char *preferred)
|
||||
{
|
||||
return x86Decode(cpu, &data->data.x86, models, nmodels, preferred, flags);
|
||||
return x86Decode(cpu, &data->data.x86, models, nmodels, preferred, 0);
|
||||
}
|
||||
|
||||
|
||||
|
@ -2452,7 +2451,7 @@ virCPUx86GetHost(virCPUDefPtr cpu,
|
|||
cpuidSet(CPUX86_EXTENDED, cpuData) < 0)
|
||||
goto cleanup;
|
||||
|
||||
ret = x86DecodeCPUData(cpu, cpuData, models, nmodels, NULL, 0);
|
||||
ret = x86DecodeCPUData(cpu, cpuData, models, nmodels, NULL);
|
||||
|
||||
cleanup:
|
||||
virCPUx86DataFree(cpuData);
|
||||
|
|
Loading…
Reference in New Issue