cpu: Rename and document cpuModelIsAllowed

The new name is virCPUModelIsAllowed.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2016-11-04 14:57:53 +01:00
parent b7011dfe44
commit 938ec1620a
4 changed files with 22 additions and 9 deletions

View File

@ -813,10 +813,22 @@ cpuDataParse(const char *xmlStr)
return data;
}
/** virCPUModelIsAllowed:
*
* @model: CPU model to be checked
* @models: list of supported CPU models
* @nmodels: number of models in @models
*
* Checks whether @model can be found in the list of supported @models.
* If @models is empty, all models are supported.
*
* Returns true if @model is supported, false otherwise.
*/
bool
cpuModelIsAllowed(const char *model,
const char **models,
unsigned int nmodels)
virCPUModelIsAllowed(const char *model,
const char **models,
unsigned int nmodels)
{
size_t i;
@ -830,6 +842,7 @@ cpuModelIsAllowed(const char *model,
return false;
}
/**
* virCPUGetModels:
*
@ -898,7 +911,7 @@ virCPUTranslate(virArch arch,
cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH)
return 0;
if (cpuModelIsAllowed(cpu->model, (const char **) models, nmodels))
if (virCPUModelIsAllowed(cpu->model, (const char **) models, nmodels))
return 0;
if (cpu->fallback != VIR_CPU_FALLBACK_ALLOW) {

View File

@ -214,9 +214,9 @@ virCPUDataCheckFeature(const virCPUData *data,
bool
cpuModelIsAllowed(const char *model,
const char **models,
unsigned int nmodels)
virCPUModelIsAllowed(const char *model,
const char **models,
unsigned int nmodels)
ATTRIBUTE_NONNULL(1);
int

View File

@ -691,7 +691,7 @@ ppc64DriverDecode(virCPUDefPtr cpu,
goto cleanup;
}
if (!cpuModelIsAllowed(model->name, models, nmodels)) {
if (!virCPUModelIsAllowed(model->name, models, nmodels)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("CPU model %s is not supported by hypervisor"),
model->name);

View File

@ -1833,7 +1833,7 @@ x86Decode(virCPUDefPtr cpu,
*/
for (i = map->nmodels - 1; i >= 0; i--) {
candidate = map->models[i];
if (!cpuModelIsAllowed(candidate->name, models, nmodels)) {
if (!virCPUModelIsAllowed(candidate->name, models, nmodels)) {
if (preferred && STREQ(candidate->name, preferred)) {
if (cpu->fallback != VIR_CPU_FALLBACK_ALLOW) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,