mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
cpu: Mark driver functions in ppc64 driver
Use the ppc64Driver prefix for all functions that are used to fill in the cpuDriverPPC64 structure, ie. those that are going to be called by the generic CPU code. This makes it clear which functions are exported and which are implementation details; it also gets rid of the ambiguity that affected the ppc64DataFree() function which, despite what the name suggested, was not related to ppc64DataCopy() and could not be used to release the memory allocated for a virCPUppc64Data* instance. No functional changes.
This commit is contained in:
parent
eefec56b47
commit
2686bf2292
@ -448,9 +448,9 @@ ppc64Compute(virCPUDefPtr host,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static virCPUCompareResult
|
static virCPUCompareResult
|
||||||
ppc64Compare(virCPUDefPtr host,
|
ppc64DriverCompare(virCPUDefPtr host,
|
||||||
virCPUDefPtr cpu,
|
virCPUDefPtr cpu,
|
||||||
bool failIncompatible)
|
bool failIncompatible)
|
||||||
{
|
{
|
||||||
if ((cpu->arch == VIR_ARCH_NONE || host->arch == cpu->arch) &&
|
if ((cpu->arch == VIR_ARCH_NONE || host->arch == cpu->arch) &&
|
||||||
STREQ(host->model, cpu->model))
|
STREQ(host->model, cpu->model))
|
||||||
@ -465,12 +465,12 @@ ppc64Compare(virCPUDefPtr host,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
ppc64Decode(virCPUDefPtr cpu,
|
ppc64DriverDecode(virCPUDefPtr cpu,
|
||||||
const virCPUData *data,
|
const virCPUData *data,
|
||||||
const char **models,
|
const char **models,
|
||||||
unsigned int nmodels,
|
unsigned int nmodels,
|
||||||
const char *preferred ATTRIBUTE_UNUSED,
|
const char *preferred ATTRIBUTE_UNUSED,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
struct ppc64_map *map;
|
struct ppc64_map *map;
|
||||||
@ -510,7 +510,7 @@ ppc64Decode(virCPUDefPtr cpu,
|
|||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
ppc64DataFree(virCPUDataPtr data)
|
ppc64DriverFree(virCPUDataPtr data)
|
||||||
{
|
{
|
||||||
if (data == NULL)
|
if (data == NULL)
|
||||||
return;
|
return;
|
||||||
@ -519,7 +519,7 @@ ppc64DataFree(virCPUDataPtr data)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static virCPUDataPtr
|
static virCPUDataPtr
|
||||||
ppc64NodeData(virArch arch)
|
ppc64DriverNodeData(virArch arch)
|
||||||
{
|
{
|
||||||
virCPUDataPtr cpuData;
|
virCPUDataPtr cpuData;
|
||||||
|
|
||||||
@ -537,17 +537,17 @@ ppc64NodeData(virArch arch)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static virCPUCompareResult
|
static virCPUCompareResult
|
||||||
ppc64GuestData(virCPUDefPtr host,
|
ppc64DriverGuestData(virCPUDefPtr host,
|
||||||
virCPUDefPtr guest,
|
virCPUDefPtr guest,
|
||||||
virCPUDataPtr *data,
|
virCPUDataPtr *data,
|
||||||
char **message)
|
char **message)
|
||||||
{
|
{
|
||||||
return ppc64Compute(host, guest, data, message);
|
return ppc64Compute(host, guest, data, message);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
ppc64Update(virCPUDefPtr guest,
|
ppc64DriverUpdate(virCPUDefPtr guest,
|
||||||
const virCPUDef *host)
|
const virCPUDef *host)
|
||||||
{
|
{
|
||||||
switch ((virCPUMode) guest->mode) {
|
switch ((virCPUMode) guest->mode) {
|
||||||
case VIR_CPU_MODE_HOST_MODEL:
|
case VIR_CPU_MODE_HOST_MODEL:
|
||||||
@ -569,11 +569,11 @@ ppc64Update(virCPUDefPtr guest,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static virCPUDefPtr
|
static virCPUDefPtr
|
||||||
ppc64Baseline(virCPUDefPtr *cpus,
|
ppc64DriverBaseline(virCPUDefPtr *cpus,
|
||||||
unsigned int ncpus,
|
unsigned int ncpus,
|
||||||
const char **models ATTRIBUTE_UNUSED,
|
const char **models ATTRIBUTE_UNUSED,
|
||||||
unsigned int nmodels ATTRIBUTE_UNUSED,
|
unsigned int nmodels ATTRIBUTE_UNUSED,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
struct ppc64_map *map = NULL;
|
struct ppc64_map *map = NULL;
|
||||||
const struct ppc64_model *model;
|
const struct ppc64_model *model;
|
||||||
@ -653,7 +653,7 @@ ppc64Baseline(virCPUDefPtr *cpus,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
ppc64GetModels(char ***models)
|
ppc64DriverGetModels(char ***models)
|
||||||
{
|
{
|
||||||
struct ppc64_map *map;
|
struct ppc64_map *map;
|
||||||
struct ppc64_model *model;
|
struct ppc64_model *model;
|
||||||
@ -699,14 +699,14 @@ struct cpuArchDriver cpuDriverPPC64 = {
|
|||||||
.name = "ppc64",
|
.name = "ppc64",
|
||||||
.arch = archs,
|
.arch = archs,
|
||||||
.narch = ARRAY_CARDINALITY(archs),
|
.narch = ARRAY_CARDINALITY(archs),
|
||||||
.compare = ppc64Compare,
|
.compare = ppc64DriverCompare,
|
||||||
.decode = ppc64Decode,
|
.decode = ppc64DriverDecode,
|
||||||
.encode = NULL,
|
.encode = NULL,
|
||||||
.free = ppc64DataFree,
|
.free = ppc64DriverFree,
|
||||||
.nodeData = ppc64NodeData,
|
.nodeData = ppc64DriverNodeData,
|
||||||
.guestData = ppc64GuestData,
|
.guestData = ppc64DriverGuestData,
|
||||||
.baseline = ppc64Baseline,
|
.baseline = ppc64DriverBaseline,
|
||||||
.update = ppc64Update,
|
.update = ppc64DriverUpdate,
|
||||||
.hasFeature = NULL,
|
.hasFeature = NULL,
|
||||||
.getModels = ppc64GetModels,
|
.getModels = ppc64DriverGetModels,
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user