mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 11:31:16 +00:00
cpu: Rename cpuGetModels
The new name is virCPUGetModels. Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
parent
007fb4388f
commit
b7011dfe44
@ -831,7 +831,7 @@ cpuModelIsAllowed(const char *model,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* cpuGetModels:
|
* virCPUGetModels:
|
||||||
*
|
*
|
||||||
* @arch: CPU architecture
|
* @arch: CPU architecture
|
||||||
* @models: where to store the NULL-terminated list of supported models
|
* @models: where to store the NULL-terminated list of supported models
|
||||||
@ -845,7 +845,7 @@ cpuModelIsAllowed(const char *model,
|
|||||||
* or -1 on error.
|
* or -1 on error.
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
cpuGetModels(virArch arch, char ***models)
|
virCPUGetModels(virArch arch, char ***models)
|
||||||
{
|
{
|
||||||
struct cpuArchDriver *driver;
|
struct cpuArchDriver *driver;
|
||||||
|
|
||||||
|
@ -105,7 +105,7 @@ typedef virCPUDataPtr
|
|||||||
(*cpuArchDataParse) (xmlXPathContextPtr ctxt);
|
(*cpuArchDataParse) (xmlXPathContextPtr ctxt);
|
||||||
|
|
||||||
typedef int
|
typedef int
|
||||||
(*cpuArchGetModels) (char ***models);
|
(*virCPUArchGetModels)(char ***models);
|
||||||
|
|
||||||
typedef int
|
typedef int
|
||||||
(*virCPUArchTranslate)(virCPUDefPtr cpu,
|
(*virCPUArchTranslate)(virCPUDefPtr cpu,
|
||||||
@ -128,7 +128,7 @@ struct cpuArchDriver {
|
|||||||
virCPUArchDataCheckFeature dataCheckFeature;
|
virCPUArchDataCheckFeature dataCheckFeature;
|
||||||
cpuArchDataFormat dataFormat;
|
cpuArchDataFormat dataFormat;
|
||||||
cpuArchDataParse dataParse;
|
cpuArchDataParse dataParse;
|
||||||
cpuArchGetModels getModels;
|
virCPUArchGetModels getModels;
|
||||||
virCPUArchTranslate translate;
|
virCPUArchTranslate translate;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -220,7 +220,7 @@ cpuModelIsAllowed(const char *model,
|
|||||||
ATTRIBUTE_NONNULL(1);
|
ATTRIBUTE_NONNULL(1);
|
||||||
|
|
||||||
int
|
int
|
||||||
cpuGetModels(virArch arch, char ***models);
|
virCPUGetModels(virArch arch, char ***models);
|
||||||
|
|
||||||
int
|
int
|
||||||
virCPUTranslate(virArch arch,
|
virCPUTranslate(virArch arch,
|
||||||
|
@ -876,7 +876,7 @@ ppc64DriverBaseline(virCPUDefPtr *cpus,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
ppc64DriverGetModels(char ***models)
|
virCPUppc64DriverGetModels(char ***models)
|
||||||
{
|
{
|
||||||
struct ppc64_map *map;
|
struct ppc64_map *map;
|
||||||
size_t i;
|
size_t i;
|
||||||
@ -921,5 +921,5 @@ struct cpuArchDriver cpuDriverPPC64 = {
|
|||||||
.guestData = ppc64DriverGuestData,
|
.guestData = ppc64DriverGuestData,
|
||||||
.baseline = ppc64DriverBaseline,
|
.baseline = ppc64DriverBaseline,
|
||||||
.update = virCPUppc64Update,
|
.update = virCPUppc64Update,
|
||||||
.getModels = ppc64DriverGetModels,
|
.getModels = virCPUppc64DriverGetModels,
|
||||||
};
|
};
|
||||||
|
@ -2668,7 +2668,7 @@ virCPUx86DataCheckFeature(const virCPUData *data,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
x86GetModels(char ***models)
|
virCPUx86GetModels(char ***models)
|
||||||
{
|
{
|
||||||
virCPUx86MapPtr map;
|
virCPUx86MapPtr map;
|
||||||
size_t i;
|
size_t i;
|
||||||
@ -2767,6 +2767,6 @@ struct cpuArchDriver cpuDriverX86 = {
|
|||||||
.dataCheckFeature = virCPUx86DataCheckFeature,
|
.dataCheckFeature = virCPUx86DataCheckFeature,
|
||||||
.dataFormat = x86CPUDataFormat,
|
.dataFormat = x86CPUDataFormat,
|
||||||
.dataParse = x86CPUDataParse,
|
.dataParse = x86CPUDataParse,
|
||||||
.getModels = x86GetModels,
|
.getModels = virCPUx86GetModels,
|
||||||
.translate = virCPUx86Translate,
|
.translate = virCPUx86Translate,
|
||||||
};
|
};
|
||||||
|
@ -980,13 +980,13 @@ cpuDataFree;
|
|||||||
cpuDataParse;
|
cpuDataParse;
|
||||||
cpuDecode;
|
cpuDecode;
|
||||||
cpuEncode;
|
cpuEncode;
|
||||||
cpuGetModels;
|
|
||||||
cpuGuestData;
|
cpuGuestData;
|
||||||
cpuNodeData;
|
cpuNodeData;
|
||||||
virCPUCheckFeature;
|
virCPUCheckFeature;
|
||||||
virCPUCompare;
|
virCPUCompare;
|
||||||
virCPUCompareXML;
|
virCPUCompareXML;
|
||||||
virCPUDataCheckFeature;
|
virCPUDataCheckFeature;
|
||||||
|
virCPUGetModels;
|
||||||
virCPUTranslate;
|
virCPUTranslate;
|
||||||
virCPUUpdate;
|
virCPUUpdate;
|
||||||
|
|
||||||
|
@ -4639,7 +4639,7 @@ virQEMUCapsFillDomainCPUCaps(virCapsPtr caps,
|
|||||||
virDomainCapsCPUModelsPtr filtered = NULL;
|
virDomainCapsCPUModelsPtr filtered = NULL;
|
||||||
char **models = NULL;
|
char **models = NULL;
|
||||||
|
|
||||||
if (cpuGetModels(domCaps->arch, &models) >= 0) {
|
if (virCPUGetModels(domCaps->arch, &models) >= 0) {
|
||||||
filtered = virDomainCapsCPUModelsFilter(qemuCaps->cpuDefinitions,
|
filtered = virDomainCapsCPUModelsFilter(qemuCaps->cpuDefinitions,
|
||||||
(const char **) models);
|
(const char **) models);
|
||||||
virStringFreeList(models);
|
virStringFreeList(models);
|
||||||
|
@ -18476,7 +18476,7 @@ qemuConnectGetCPUModelNames(virConnectPtr conn,
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
return cpuGetModels(arch, models);
|
return virCPUGetModels(arch, models);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -5943,7 +5943,7 @@ testConnectGetCPUModelNames(virConnectPtr conn ATTRIBUTE_UNUSED,
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
return cpuGetModels(arch, models);
|
return virCPUGetModels(arch, models);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
Loading…
Reference in New Issue
Block a user