From: Jiri Denemark <jdenemar@redhat.com> This new API can be used to update an existing CPU definition with features described by CPU data. Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- src/cpu/cpu.c | 33 +++++++++++++++++++++++++++++++++ src/cpu/cpu.h | 12 ++++++++++++ src/cpu/cpu_x86.c | 23 +++++++++++++++++++++++ src/libvirt_private.syms | 1 + 4 files changed, 69 insertions(+) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 233686485d..4231fffa02 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -1372,6 +1372,39 @@ virCPUGetCanonicalModel(virArch arch, } +/** virCPUUpdateFeatures: + * + * @arch: CPU architecture + * @cpu: CPU definition to update + * @cpuData: CPU data describing features + * @policy: to be used by the updated features + * + * Updates features described in @cpuData to use the specified @policy. Missing + * features will be automatically added to the CPU definition. + * + * Returns 0 on success, -1 otherwise. + */ +int +virCPUUpdateFeatures(virArch arch, + virCPUDef *cpu, + virCPUData *cpuData, + virCPUFeaturePolicy policy) +{ + struct cpuArchDriver *driver; + + VIR_DEBUG("arch=%s, cpu=%p, model=%s", + virArchToString(arch), cpu, NULLSTR(cpu->model)); + + if (!(driver = cpuGetSubDriver(arch))) + return -1; + + if (!driver->updateFeatures) + return 0; + + return driver->updateFeatures(cpu, cpuData, policy); +} + + /** * virCPUArchIsSupported: * diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 36fd123675..65711ac085 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -143,6 +143,11 @@ typedef int typedef const char * (*virCPUArchGetCanonicalModel)(const char *model); +typedef int +(*virCPUArchUpdateFeatures)(virCPUDef *cpu, + virCPUData *cpuData, + virCPUFeaturePolicy policy); + struct cpuArchDriver { const char *name; const virArch *arch; @@ -172,6 +177,7 @@ struct cpuArchDriver { virCPUArchDataGetHost dataGetHost; virCPUArchGetCheckMode getCheckMode; virCPUArchGetCanonicalModel getCanonicalModel; + virCPUArchUpdateFeatures updateFeatures; }; @@ -332,6 +338,12 @@ const char * virCPUGetCanonicalModel(virArch arch, const char *model); +int +virCPUUpdateFeatures(virArch arch, + virCPUDef *cpu, + virCPUData *cpuData, + virCPUFeaturePolicy policy); + bool virCPUArchIsSupported(virArch arch); diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 93f1427e36..f6a6a2a46c 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -3780,6 +3780,28 @@ virCPUx86GetCanonicalModel(const char *modelName) } +static int +virCPUx86UpdateFeatures(virCPUDef *cpu, + virCPUData *cpuData, + virCPUFeaturePolicy policy) +{ + virCPUx86Data *data = &cpuData->data.x86; + virCPUx86Map *map; + size_t i; + + if (!(map = virCPUx86GetMap())) + return -1; + + for (i = 0; i < map->nfeatures; i++) { + virCPUx86Feature *feature = map->features[i]; + if (x86DataIsSubset(data, &feature->data)) + virCPUDefUpdateFeature(cpu, feature->name, policy); + } + + return 0; +} + + struct cpuArchDriver cpuDriverX86 = { .name = "x86", .arch = archs, @@ -3814,4 +3836,5 @@ struct cpuArchDriver cpuDriverX86 = { #endif .getCheckMode = virCPUx86GetCheckMode, .getCanonicalModel = virCPUx86GetCanonicalModel, + .updateFeatures = virCPUx86UpdateFeatures, }; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9d5e927b8a..e1f499899e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1592,6 +1592,7 @@ virCPUGetVendorForModel; virCPUProbeHost; virCPUTranslate; virCPUUpdate; +virCPUUpdateFeatures; virCPUUpdateLive; virCPUValidateFeatures; -- 2.54.0