External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-21 19:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Add usability blockers to virDomainCapsCPUModel

Browse Source 
When a hypervisor marks a CPU model as unusable on the current host, it
may also give us a list of features which prevent the model from being
usable. Storing this list in virDomainCapsCPUModel will help the CPU
driver with creating a host-model CPU configuration.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Jiri Denemark 2017-09-19 18:35:08 +02:00
parent ef04596d76
commit 0861080f0e
4 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/conf/domain_capabilities.c
View File

@ -163,7 +163,8 @@ virDomainCapsCPUModelsCopy(virDomainCapsCPUModelsPtr old)
for (i = 0; i < old->nmodels; i++) {
if (virDomainCapsCPUModelsAdd(cpuModels,
old->models[i].name, -1,
old->models[i].usable) < 0)
old->models[i].usable,
old->models[i].blockers) < 0)
goto error;
}
@ -195,7 +196,8 @@ virDomainCapsCPUModelsFilter(virDomainCapsCPUModelsPtr old,
if (virDomainCapsCPUModelsAdd(cpuModels,
old->models[i].name, -1,
old->models[i].usable) < 0)
old->models[i].usable,
old->models[i].blockers) < 0)
goto error;
}
@ -210,7 +212,8 @@ virDomainCapsCPUModelsFilter(virDomainCapsCPUModelsPtr old,
int
virDomainCapsCPUModelsAddSteal(virDomainCapsCPUModelsPtr cpuModels,
char **name,
virDomainCapsCPUUsable usable)
virDomainCapsCPUUsable usable,
char ***blockers)
{
if (VIR_RESIZE_N(cpuModels->models, cpuModels->nmodels_max,
cpuModels->nmodels, 1) < 0)
@ -218,6 +221,10 @@ virDomainCapsCPUModelsAddSteal(virDomainCapsCPUModelsPtr cpuModels,
cpuModels->models[cpuModels->nmodels].usable = usable;
VIR_STEAL_PTR(cpuModels->models[cpuModels->nmodels].name, *name);
if (blockers)
VIR_STEAL_PTR(cpuModels->models[cpuModels->nmodels].blockers, *blockers);
cpuModels->nmodels++;
return 0;
}
@ -227,20 +234,27 @@ int
virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr cpuModels,
const char *name,
ssize_t nameLen,
virDomainCapsCPUUsable usable)
virDomainCapsCPUUsable usable,
char **blockers)
{
char *copy = NULL;
char *nameCopy = NULL;
char **blockersCopy = NULL;
if (VIR_STRNDUP(copy, name, nameLen) < 0)
if (VIR_STRNDUP(nameCopy, name, nameLen) < 0)
goto error;
if (virDomainCapsCPUModelsAddSteal(cpuModels, &copy, usable) < 0)
if (virStringListCopy(&blockersCopy, (const char **)blockers) < 0)
goto error;
if (virDomainCapsCPUModelsAddSteal(cpuModels, &nameCopy,
usable, &blockersCopy) < 0)
goto error;
return 0;
error:
VIR_FREE(copy);
VIR_FREE(nameCopy);
virStringListFree(blockersCopy);
return -1;
}

7
src/conf/domain_capabilities.h
View File

@ -116,6 +116,7 @@ typedef virDomainCapsCPUModel *virDomainCapsCPUModelPtr;
struct _virDomainCapsCPUModel {
char *name;
virDomainCapsCPUUsable usable;
char **blockers; /* NULL-terminated list of usability blockers */
};
typedef struct _virDomainCapsCPUModels virDomainCapsCPUModels;
@ -171,11 +172,13 @@ virDomainCapsCPUModelsPtr virDomainCapsCPUModelsFilter(virDomainCapsCPUModelsPtr
const char **blacklist);
int virDomainCapsCPUModelsAddSteal(virDomainCapsCPUModelsPtr cpuModels,
char **name,
virDomainCapsCPUUsable usable);
virDomainCapsCPUUsable usable,
char ***blockers);
int virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr cpuModels,
const char *name,
ssize_t nameLen,
virDomainCapsCPUUsable usable);
virDomainCapsCPUUsable usable,
char **blockers);
# define VIR_DOMAIN_CAPS_ENUM_SET(capsEnum, ...) \
do { \

11
src/qemu/qemu_capabilities.c
View File

@ -796,7 +796,7 @@ virQEMUCapsParseX86Models(const char *output,
}
if (virDomainCapsCPUModelsAdd(cpus, p, len,
VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0)
VIR_DOMCAPS_CPU_USABLE_UNKNOWN, NULL) < 0)
goto error;
} while ((p = next));
@ -854,7 +854,7 @@ virQEMUCapsParsePPCModels(const char *output,
continue;
if (virDomainCapsCPUModelsAdd(cpus, p, t - p - 1,
VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0)
VIR_DOMCAPS_CPU_USABLE_UNKNOWN, NULL) < 0)
goto error;
} while ((p = next));
@ -2526,7 +2526,7 @@ virQEMUCapsAddCPUDefinitions(virQEMUCapsPtr qemuCaps,
}
for (i = 0; i < count; i++) {
if (virDomainCapsCPUModelsAdd(cpus, name[i], -1, usable) < 0)
if (virDomainCapsCPUModelsAdd(cpus, name[i], -1, usable, NULL) < 0)
return -1;
}
@ -3007,7 +3007,8 @@ virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps,
else if (cpus[i]->usable == VIR_TRISTATE_BOOL_NO)
usable = VIR_DOMCAPS_CPU_USABLE_NO;
if (virDomainCapsCPUModelsAddSteal(models, &cpus[i]->name, usable) < 0)
if (virDomainCapsCPUModelsAddSteal(models, &cpus[i]->name, usable,
NULL) < 0)
goto cleanup;
}
@ -3770,7 +3771,7 @@ virQEMUCapsLoadCPUModels(virQEMUCapsPtr qemuCaps,
goto cleanup;
}
if (virDomainCapsCPUModelsAddSteal(cpus, &str, usable) < 0)
if (virDomainCapsCPUModelsAddSteal(cpus, &str, usable, NULL) < 0)
goto cleanup;
}

6
tests/domaincapstest.c
View File

@ -88,11 +88,11 @@ fillAllCaps(virDomainCapsPtr domCaps)
cpu->hostModel = virCPUDefCopy(&host);
if (!(cpu->custom = virDomainCapsCPUModelsNew(3)) ||
virDomainCapsCPUModelsAdd(cpu->custom, "Model1", -1,
VIR_DOMCAPS_CPU_USABLE_UNKNOWN) < 0 ||
VIR_DOMCAPS_CPU_USABLE_UNKNOWN, NULL) < 0 ||
virDomainCapsCPUModelsAdd(cpu->custom, "Model2", -1,
VIR_DOMCAPS_CPU_USABLE_NO) < 0 ||
VIR_DOMCAPS_CPU_USABLE_NO, NULL) < 0 ||
virDomainCapsCPUModelsAdd(cpu->custom, "Model3", -1,
VIR_DOMCAPS_CPU_USABLE_YES) < 0)
VIR_DOMCAPS_CPU_USABLE_YES, NULL) < 0)
return -1;
disk->supported = true;