[libvirt] [PATCH 02/22] conf: Drop nameLen parameter from virDomainCapsCPUModelsAdd
All callers use nameLen == -1 anyway.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/conf/domain_capabilities.c | 7 +++----
src/conf/domain_capabilities.h | 1 -
src/qemu/qemu_capabilities.c | 2 +-
tests/cputest.c | 4 ++--
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 37e767d5c9..fa0b9dfc71 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -171,7 +171,7 @@ virDomainCapsCPUModelsCopy(virDomainCapsCPUModelsPtr old)
for (i = 0; i < old->nmodels; i++) {
if (virDomainCapsCPUModelsAdd(cpuModels,
- old->models[i].name, -1,
+ old->models[i].name,
old->models[i].usable,
old->models[i].blockers) < 0)
goto error;
@@ -204,7 +204,7 @@ virDomainCapsCPUModelsFilter(virDomainCapsCPUModelsPtr old,
continue;
if (virDomainCapsCPUModelsAdd(cpuModels,
- old->models[i].name, -1,
+ old->models[i].name,
old->models[i].usable,
old->models[i].blockers) < 0)
goto error;
@@ -242,14 +242,13 @@ virDomainCapsCPUModelsAddSteal(virDomainCapsCPUModelsPtr cpuModels,
int
virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr cpuModels,
const char *name,
- ssize_t nameLen,
virDomainCapsCPUUsable usable,
char **blockers)
{
VIR_AUTOFREE(char *) nameCopy = NULL;
VIR_AUTOSTRINGLIST blockersCopy = NULL;
- if (VIR_STRNDUP(nameCopy, name, nameLen) < 0)
+ if (VIR_STRDUP(nameCopy, name) < 0)
return -1;
if (virStringListCopy(&blockersCopy, (const char **)blockers) < 0)
diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
index 4756af38e9..7ff2181eda 100644
--- a/src/conf/domain_capabilities.h
+++ b/src/conf/domain_capabilities.h
@@ -201,7 +201,6 @@ int virDomainCapsCPUModelsAddSteal(virDomainCapsCPUModelsPtr
cpuModels,
char ***blockers);
int virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr cpuModels,
const char *name,
- ssize_t nameLen,
virDomainCapsCPUUsable usable,
char **blockers);
virDomainCapsCPUModelPtr
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 3b50576a2b..806d102efd 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1871,7 +1871,7 @@ virQEMUCapsAddCPUDefinitions(virQEMUCapsPtr qemuCaps,
}
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;
}
diff --git a/tests/cputest.c b/tests/cputest.c
index 7037bcc8bd..403d23b961 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -854,7 +854,7 @@ cpuTestUpdateLive(const void *arg)
usable = hvModel->usable;
}
- if (virDomainCapsCPUModelsAdd(models, expected->model, -1,
+ if (virDomainCapsCPUModelsAdd(models, expected->model,
usable, blockers) < 0)
goto cleanup;
@@ -964,7 +964,7 @@ cpuTestInitModels(const char **list)
return NULL;
for (model = list; *model; model++) {
- if (virDomainCapsCPUModelsAdd(cpus, *model, -1,
+ if (virDomainCapsCPUModelsAdd(cpus, *model,
VIR_DOMCAPS_CPU_USABLE_UNKNOWN, NULL) < 0)
goto error;
}
--
2.23.0