[libvirt] [PATCH v2 4/6] util: add virTypedParamsAddStringList
The `virTypedParamsAddStringList' function provides interface to add a
NULL-terminated array of string values as a multi-value to the params.
Signed-off-by: Pavel Boldin <pboldin(a)mirantis.com>
---
include/libvirt/libvirt-host.h | 6 ++++++
src/libvirt_public.syms | 1 +
src/util/virtypedparam.c | 36 ++++++++++++++++++++++++++++++++++++
tests/virtypedparamtest.c | 28 ++++++++++++++++++++++++++++
4 files changed, 71 insertions(+)
diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h
index 36267fc..7d0b5b7 100644
--- a/include/libvirt/libvirt-host.h
+++ b/include/libvirt/libvirt-host.h
@@ -336,6 +336,12 @@ virTypedParamsAddString (virTypedParameterPtr *params,
const char *name,
const char *value);
int
+virTypedParamsAddStringList(virTypedParameterPtr *params,
+ int *nparams,
+ int *maxparams,
+ const char *name,
+ const char **values);
+int
virTypedParamsAddFromString(virTypedParameterPtr *params,
int *nparams,
int *maxparams,
diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
index 8fc8c42..4de23c0 100644
--- a/src/libvirt_public.syms
+++ b/src/libvirt_public.syms
@@ -714,6 +714,7 @@ LIBVIRT_1.2.16 {
global:
virTypedParamsFilter;
virTypedParamsPickStrings;
+ virTypedParamsAddStringList;
} LIBVIRT_1.2.15;
# .... define new API here using predicted next version number ....
diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c
index a3d959e..a2e99ee 100644
--- a/src/util/virtypedparam.c
+++ b/src/util/virtypedparam.c
@@ -1191,6 +1191,42 @@ virTypedParamsAddString(virTypedParameterPtr *params,
return -1;
}
+/**
+ * virTypedParamsAddStringList:
+ * @params: array of typed parameters
+ * @nparams: number of parameters in the @params array
+ * @maxparams: maximum number of parameters that can be stored in @params
+ * array without allocating more memory
+ * @name: name of the parameter to store values to
+ * @values: the values to store into the new parameters
+ *
+ * Packs NULL-terminated list of strings @values into @params under the
+ * key @name.
+ *
+ * Returns 0 on success, -1 on error.
+ */
+int
+virTypedParamsAddStringList(virTypedParameterPtr *params,
+ int *nparams,
+ int *maxparams,
+ const char *name,
+ const char **values)
+{
+ size_t i;
+ int rv = -1;
+
+ if (!values)
+ return 0;
+
+ for (i = 0; values[i]; i++) {
+ if ((rv = virTypedParamsAddString(params, nparams, maxparams,
+ name, values[i])) < 0)
+ break;
+ }
+
+ return rv;
+}
+
/**
* virTypedParamsAddFromString:
diff --git a/tests/virtypedparamtest.c b/tests/virtypedparamtest.c
index 945dbe7..26fa4b2 100644
--- a/tests/virtypedparamtest.c
+++ b/tests/virtypedparamtest.c
@@ -126,6 +126,31 @@ testTypedParamsFilter(const void *opaque ATTRIBUTE_UNUSED)
}
static int
+testTypedParamsAddStringList(const void *opaque ATTRIBUTE_UNUSED)
+{
+ int rv = 0;
+ virTypedParameterPtr params = NULL;
+ int nparams = 0, maxparams = 0, i;
+
+ const char *values[] = {
+ "foo", "bar", "foobar", NULL
+ };
+
+ rv = virTypedParamsAddStringList(¶ms, &nparams, &maxparams,
"param",
+ values);
+
+ for (i = 0; i < nparams; i++) {
+ if (STRNEQ(params[i].field, "param") ||
+ STRNEQ(params[i].value.s, values[i]) ||
+ params[i].type != VIR_TYPED_PARAM_STRING)
+ rv = -1;
+ }
+
+ virTypedParamsFree(params, nparams);
+ return rv;
+}
+
+static int
testTypedParamsPickStrings(const void *opaque ATTRIBUTE_UNUSED)
{
size_t i, picked;
@@ -255,6 +280,9 @@ mymain(void)
if (virtTestRun("Picking Strings", testTypedParamsPickStrings, NULL) <
0)
rv = -1;
+ if (virtTestRun("Add string list", testTypedParamsAddStringList, NULL) <
0)
+ rv = -1;
+
if (rv < 0)
return EXIT_FAILURE;
return EXIT_SUCCESS;
--
1.9.1