External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 13:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Drop nameLen parameter from virDomainCapsCPUModelsAdd

Browse Source 
All callers use nameLen == -1 anyway.

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-19 16:10:14 +02:00
parent 537768a7ca
commit 18eeb75daf
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf/domain_capabilities.c
View File

@ -167,7 +167,7 @@ virDomainCapsCPUModelsCopy(virDomainCapsCPUModelsPtr old)
for (i = 0; i < old->nmodels; i++) { for (i = 0; i < old->nmodels; i++) {
if (virDomainCapsCPUModelsAdd(cpuModels, if (virDomainCapsCPUModelsAdd(cpuModels,
old->models[i].name, -1, old->models[i].name,
old->models[i].usable, old->models[i].usable,
old->models[i].blockers) < 0) old->models[i].blockers) < 0)
goto error; goto error;
@ -200,7 +200,7 @@ virDomainCapsCPUModelsFilter(virDomainCapsCPUModelsPtr old,
continue; continue;
if (virDomainCapsCPUModelsAdd(cpuModels, if (virDomainCapsCPUModelsAdd(cpuModels,
old->models[i].name, -1, old->models[i].name,
old->models[i].usable, old->models[i].usable,
old->models[i].blockers) < 0) old->models[i].blockers) < 0)
goto error; goto error;
@ -238,15 +238,13 @@ virDomainCapsCPUModelsAddSteal(virDomainCapsCPUModelsPtr cpuModels,
int int
virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr cpuModels, virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr cpuModels,
const char *name, const char *name,
ssize_t nameLen,
virDomainCapsCPUUsable usable, virDomainCapsCPUUsable usable,
char **blockers) char **blockers)
{ {
g_autofree char * nameCopy = NULL; g_autofree char * nameCopy = NULL;
VIR_AUTOSTRINGLIST blockersCopy = NULL; VIR_AUTOSTRINGLIST blockersCopy = NULL;
if (VIR_STRNDUP(nameCopy, name, nameLen) < 0) nameCopy = g_strdup(name);
return -1;
if (virStringListCopy(&blockersCopy, (const char **)blockers) < 0) if (virStringListCopy(&blockersCopy, (const char **)blockers) < 0)
return -1; return -1;

1
src/conf/domain_capabilities.h
View File

@ -203,7 +203,6 @@ int virDomainCapsCPUModelsAddSteal(virDomainCapsCPUModelsPtr cpuModels,
char ***blockers); char ***blockers);
int virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr cpuModels, int virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr cpuModels,
const char *name, const char *name,
ssize_t nameLen,
virDomainCapsCPUUsable usable, virDomainCapsCPUUsable usable,
char **blockers); char **blockers);
virDomainCapsCPUModelPtr virDomainCapsCPUModelPtr

2
src/qemu/qemu_capabilities.c
View File

@ -1873,7 +1873,7 @@ virQEMUCapsAddCPUDefinitions(virQEMUCapsPtr qemuCaps,
} }
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
if (virDomainCapsCPUModelsAdd(cpus, name[i], -1, usable, NULL) < 0) if (virDomainCapsCPUModelsAdd(cpus, name[i], usable, NULL) < 0)
return -1; return -1;
} }

4
tests/cputest.c
View File

@ -845,7 +845,7 @@ cpuTestUpdateLive(const void *arg)
usable = hvModel->usable; usable = hvModel->usable;
} }
if (virDomainCapsCPUModelsAdd(models, expected->model, -1, if (virDomainCapsCPUModelsAdd(models, expected->model,
usable, blockers) < 0) usable, blockers) < 0)
goto cleanup; goto cleanup;
@ -954,7 +954,7 @@ cpuTestInitModels(const char **list)
return NULL; return NULL;
for (model = list; *model; model++) { for (model = list; *model; model++) {
if (virDomainCapsCPUModelsAdd(cpus, *model, -1, if (virDomainCapsCPUModelsAdd(cpus, *model,
VIR_DOMCAPS_CPU_USABLE_UNKNOWN, NULL) < 0) VIR_DOMCAPS_CPU_USABLE_UNKNOWN, NULL) < 0)
goto error; goto error;
} }