External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Introduce virQEMUCapsCPUDefsToModels

Browse Source 
The function translates qemuMonitorCPUDefsPtr (used by QEMU caps probing
code) into virDomainCapsCPUModelsPtr used by domain capabilities.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2019-09-24 15:59:34 +02:00
parent b3ef7efaa5
commit a8ca6b4dc4
1 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/qemu/qemu_capabilities.c
View File

@ -1881,6 +1881,35 @@ virQEMUCapsAddCPUDefinitions(virQEMUCapsPtr qemuCaps,
}
static virDomainCapsCPUModelsPtr
virQEMUCapsCPUDefsToModels(qemuMonitorCPUDefsPtr defs,
const char **modelWhitelist,
const char **modelBlacklist)
{
g_autoptr(virDomainCapsCPUModels) cpuModels = NULL;
size_t i;
if (!(cpuModels = virDomainCapsCPUModelsNew(defs->ncpus)))
return NULL;
for (i = 0; i < defs->ncpus; i++) {
qemuMonitorCPUDefInfoPtr cpu = defs->cpus + i;
if (modelWhitelist && !virStringListHasString(modelWhitelist, cpu->name))
continue;
if (modelBlacklist && virStringListHasString(modelBlacklist, cpu->name))
continue;
if (virDomainCapsCPUModelsAdd(cpuModels, cpu->name, cpu->usable,
cpu->blockers) < 0)
return NULL;
}
return g_steal_pointer(&cpuModels);
}
virDomainCapsCPUModelsPtr
virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCaps,
virDomainVirtType type,
@ -2447,19 +2476,15 @@ virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon,
virDomainCapsCPUModelsPtr *cpuModels)
{
g_autoptr(qemuMonitorCPUDefs) defs = NULL;
virDomainCapsCPUModelsPtr models = NULL;
size_t i;
int ret = -1;
*cpuModels = NULL;
if (qemuMonitorGetCPUDefinitions(mon, &defs) < 0)
return -1;
if (!defs) {
ret = 0;
goto cleanup;
}
if (!defs)
return 0;
/* QEMU 2.11 for Power renamed all CPU models to lower case, we need to
* translate them back to libvirt's upper case model names. */
@ -2468,7 +2493,7 @@ virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon,
char **name;
if (virCPUGetModels(arch, &libvirtModels) < 0)
goto cleanup;
return -1;
for (name = libvirtModels; name && *name; name++) {
for (i = 0; i < defs->ncpus; i++) {
@ -2481,23 +2506,10 @@ virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon,
}
}
if (!(models = virDomainCapsCPUModelsNew(defs->ncpus)))
goto cleanup;
if (!(*cpuModels = virQEMUCapsCPUDefsToModels(defs, NULL, NULL)))
return -1;
for (i = 0; i < defs->ncpus; i++) {
if (virDomainCapsCPUModelsAddSteal(models,
&defs->cpus[i].name,
defs->cpus[i].usable,
&defs->cpus[i].blockers) < 0)
goto cleanup;
}
*cpuModels = g_steal_pointer(&models);
ret = 0;
cleanup:
virObjectUnref(models);
return ret;
return 0;
}