External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu: Rename cpuBaseline as virCPUBaseline

Browse Source 
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2018-05-15 10:50:32 +02:00
parent 6d27148ae1
commit 5ed6cf96bc
12 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bhyve/bhyve_driver.c
View File

@ -1398,8 +1398,8 @@ bhyveConnectBaselineCPU(virConnectPtr conn,
if (!(cpus = virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST)))
goto cleanup;
if (!(cpu = cpuBaseline(cpus, ncpus, NULL,
!!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE))))
if (!(cpu = virCPUBaseline(cpus, ncpus, NULL,
!!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE))))
goto cleanup;
if ((flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) &&

10
src/cpu/cpu.c
View File

@ -479,7 +479,7 @@ virCPUProbeHost(virArch arch)
/**
* cpuBaseline:
* virCPUBaseline:
*
* @cpus: list of host CPU definitions
* @ncpus: number of CPUs in @cpus
@ -494,10 +494,10 @@ virCPUProbeHost(virArch arch)
* Returns baseline CPU definition or NULL on error.
*/
virCPUDefPtr
cpuBaseline(virCPUDefPtr *cpus,
unsigned int ncpus,
virDomainCapsCPUModelsPtr models,
bool migratable)
virCPUBaseline(virCPUDefPtr *cpus,
unsigned int ncpus,
virDomainCapsCPUModelsPtr models,
bool migratable)
{
struct cpuArchDriver *driver;
size_t i;

18
src/cpu/cpu.h
View File

@ -73,10 +73,10 @@ typedef int
virDomainCapsCPUModelsPtr models);
typedef virCPUDefPtr
(*cpuArchBaseline) (virCPUDefPtr *cpus,
unsigned int ncpus,
virDomainCapsCPUModelsPtr models,
bool migratable);
(*virCPUArchBaseline)(virCPUDefPtr *cpus,
unsigned int ncpus,
virDomainCapsCPUModelsPtr models,
bool migratable);
typedef int
(*virCPUArchUpdate)(virCPUDefPtr guest,
@ -129,7 +129,7 @@ struct cpuArchDriver {
cpuArchEncode encode;
cpuArchDataFree dataFree;
virCPUArchGetHost getHost;
cpuArchBaseline baseline;
virCPUArchBaseline baseline;
virCPUArchUpdate update;
virCPUArchUpdateLive updateLive;
virCPUArchCheckFeature checkFeature;
@ -194,10 +194,10 @@ virCPUDefPtr
virCPUProbeHost(virArch arch);
virCPUDefPtr
cpuBaseline (virCPUDefPtr *cpus,
unsigned int ncpus,
virDomainCapsCPUModelsPtr models,
bool migratable);
virCPUBaseline(virCPUDefPtr *cpus,
unsigned int ncpus,
virDomainCapsCPUModelsPtr models,
bool migratable);
int
virCPUUpdate(virArch arch,

10
src/cpu/cpu_arm.c
View File

@ -73,10 +73,10 @@ virCPUarmUpdate(virCPUDefPtr guest,
static virCPUDefPtr
armBaseline(virCPUDefPtr *cpus,
unsigned int ncpus ATTRIBUTE_UNUSED,
virDomainCapsCPUModelsPtr models ATTRIBUTE_UNUSED,
bool migratable ATTRIBUTE_UNUSED)
virCPUarmBaseline(virCPUDefPtr *cpus,
unsigned int ncpus ATTRIBUTE_UNUSED,
virDomainCapsCPUModelsPtr models ATTRIBUTE_UNUSED,
bool migratable ATTRIBUTE_UNUSED)
{
virCPUDefPtr cpu = NULL;
@ -107,6 +107,6 @@ struct cpuArchDriver cpuDriverArm = {
.compare = virCPUarmCompare,
.decode = NULL,
.encode = NULL,
.baseline = armBaseline,
.baseline = virCPUarmBaseline,
.update = virCPUarmUpdate,
};

4
src/cpu/cpu_ppc64.c
View File

@ -767,7 +767,7 @@ virCPUppc64Update(virCPUDefPtr guest,
}
static virCPUDefPtr
ppc64DriverBaseline(virCPUDefPtr *cpus,
virCPUppc64Baseline(virCPUDefPtr *cpus,
unsigned int ncpus,
virDomainCapsCPUModelsPtr models ATTRIBUTE_UNUSED,
bool migratable ATTRIBUTE_UNUSED)
@ -901,7 +901,7 @@ struct cpuArchDriver cpuDriverPPC64 = {
.encode = NULL,
.dataFree = virCPUppc64DataFree,
.getHost = virCPUppc64GetHost,
.baseline = ppc64DriverBaseline,
.baseline = virCPUppc64Baseline,
.update = virCPUppc64Update,
.getModels = virCPUppc64DriverGetModels,
.convertLegacy = virCPUppc64ConvertLegacy,

10
src/cpu/cpu_x86.c
View File

@ -2464,10 +2464,10 @@ virCPUx86GetHost(virCPUDefPtr cpu,
static virCPUDefPtr
x86Baseline(virCPUDefPtr *cpus,
unsigned int ncpus,
virDomainCapsCPUModelsPtr models,
bool migratable)
virCPUx86Baseline(virCPUDefPtr *cpus,
unsigned int ncpus,
virDomainCapsCPUModelsPtr models,
bool migratable)
{
virCPUx86MapPtr map = NULL;
virCPUx86ModelPtr base_model = NULL;
@ -3050,7 +3050,7 @@ struct cpuArchDriver cpuDriverX86 = {
#if defined(__i386__) || defined(__x86_64__)
.getHost = virCPUx86GetHost,
#endif
.baseline = x86Baseline,
.baseline = virCPUx86Baseline,
.update = virCPUx86Update,
.updateLive = virCPUx86UpdateLive,
.checkFeature = virCPUx86CheckFeature,

2
src/libvirt_private.syms
View File

@ -1140,9 +1140,9 @@ virStoragePoolObjVolumeListExport;
# cpu/cpu.h
cpuBaseline;
cpuDecode;
cpuEncode;
virCPUBaseline;
virCPUCheckFeature;
virCPUCompare;
virCPUCompareXML;

4
src/libxl/libxl_driver.c
View File

@ -6349,8 +6349,8 @@ libxlConnectBaselineCPU(virConnectPtr conn,
if (!(cpus = virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST)))
goto cleanup;
if (!(cpu = cpuBaseline(cpus, ncpus, NULL,
!!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE))))
if (!(cpu = virCPUBaseline(cpus, ncpus, NULL,
!!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE))))
goto cleanup;
if ((flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) &&

4
src/qemu/qemu_driver.c
View File

@ -13315,8 +13315,8 @@ qemuConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED,
if (!(cpus = virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST)))
goto cleanup;
if (!(baseline = cpuBaseline(cpus, ncpus, NULL,
!!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE))))
if (!(baseline = virCPUBaseline(cpus, ncpus, NULL,
!!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE))))
goto cleanup;
if (!(cpu = virCPUDefCopyWithoutModel(baseline)))

2
src/test/test_driver.c
View File

@ -1541,7 +1541,7 @@ testConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED,
if (!(cpus = virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST)))
goto cleanup;
if (!(cpu = cpuBaseline(cpus, ncpus, NULL, false)))
if (!(cpu = virCPUBaseline(cpus, ncpus, NULL, false)))
goto cleanup;
if ((flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) &&

2
src/vz/vz_driver.c
View File

@ -934,7 +934,7 @@ vzConnectBaselineCPU(virConnectPtr conn,
if (!(cpus = virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST)))
goto cleanup;
if (!(cpu = cpuBaseline(cpus, ncpus, NULL, false)))
if (!(cpu = virCPUBaseline(cpus, ncpus, NULL, false)))
goto cleanup;
if ((flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) &&

6
tests/cputest.c
View File

@ -321,8 +321,8 @@ cpuTestBaseline(const void *arg)
if (!(cpus = cpuTestLoadMultiXML(data->arch, data->name, &ncpus)))
goto cleanup;
baseline = cpuBaseline(cpus, ncpus, NULL,
!!(data->flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE));
baseline = virCPUBaseline(cpus, ncpus, NULL,
!!(data->flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE));
if (baseline &&
(data->flags & VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES) &&
@ -337,7 +337,7 @@ cpuTestBaseline(const void *arg)
ret = 0;
} else {
VIR_TEST_VERBOSE("\n%-70s... ",
"cpuBaseline was expected to fail but it succeeded");
"virCPUBaseline was expected to fail but it succeeded");
}
goto cleanup;
}