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

cpu_x86: Fix placement of *CheckFeature functions

Browse Source 
Commit 0a97486e09 moved them outside #ifdef, but after virCPUx86GetHost,
which will start calling them in the following patch.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2019-04-16 13:24:45 +02:00
parent c277b9ad5c
commit 32f577ab10
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/cpu/cpu_x86.c
View File

@ -2378,6 +2378,41 @@ x86Encode(virArch arch,
}
static int
virCPUx86CheckFeature(const virCPUDef *cpu,
const char *name)
{
int ret = -1;
virCPUx86MapPtr map;
virCPUx86ModelPtr model = NULL;
if (!(map = virCPUx86GetMap()))
return -1;
if (!(model = x86ModelFromCPU(cpu, map, -1)))
goto cleanup;
ret = x86FeatureInData(name, &model->data, map);
cleanup:
x86ModelFree(model);
return ret;
}
static int
virCPUx86DataCheckFeature(const virCPUData *data,
const char *name)
{
virCPUx86MapPtr map;
if (!(map = virCPUx86GetMap()))
return -1;
return x86FeatureInData(name, &data->data.x86, map);
}
#if defined(__i386__) || defined(__x86_64__)
static inline void
cpuidCall(virCPUx86CPUID *cpuid)
@ -2734,41 +2769,6 @@ virCPUx86GetHost(virCPUDefPtr cpu,
#endif
static int
virCPUx86CheckFeature(const virCPUDef *cpu,
const char *name)
{
int ret = -1;
virCPUx86MapPtr map;
virCPUx86ModelPtr model = NULL;
if (!(map = virCPUx86GetMap()))
return -1;
if (!(model = x86ModelFromCPU(cpu, map, -1)))
goto cleanup;
ret = x86FeatureInData(name, &model->data, map);
cleanup:
x86ModelFree(model);
return ret;
}
static int
virCPUx86DataCheckFeature(const virCPUData *data,
const char *name)
{
virCPUx86MapPtr map;
if (!(map = virCPUx86GetMap()))
return -1;
return x86FeatureInData(name, &data->data.x86, map);
}
static virCPUDefPtr
virCPUx86Baseline(virCPUDefPtr *cpus,
unsigned int ncpus,