Re: [libvirt] [PATCH v2 python 1/2] minor clean-up for libvirt_virDomainPin*

All libvirt_virDomainPin* functions do the same thing for convert pycpumap to cpumap, so this patch moves all common logic to new helper - virPyCpuMapToChar. Signed-off-by: Konstantin Neumoin <kneumoin(a)virtuozzo.com&gt; --- libvirt-override.c | 131 +++++------------------------------------------------ libvirt-utils.c | 60 ++++++++++++++++++++++++ libvirt-utils.h | 5 ++ 3 files changed, 76 insertions(+), 120 deletions(-)

diff --git a/libvirt-override.c b/libvirt-override.c index fa3e2ca..ba0d87c 100644 --- a/libvirt-override.c +++ b/libvirt-override.c

diff --git a/libvirt-utils.c b/libvirt-utils.c index 2bf7519..aaf4bea 100644 --- a/libvirt-utils.c +++ b/libvirt-utils.c @@ -586,3 +586,63 @@ virPyDictToTypedParams(PyObject *dict, return ret; } #endif /* LIBVIR_CHECK_VERSION(1, 1, 0) */ + + +/* virPyCpuMapToChar

+ * @cpunum: the number of cpus

+ * @pycpumap: source Py cpu map

+ * @cpumapptr: destination cpu map + * @cpumaplen: destination cpu map length + * + * Helper function to convert a pycpumap to char* + * + * return -1 on error.

+ */ +int +virPyCpuMapToChar(int cpunum, + PyObject *pycpumap, + unsigned char **cpumapptr, + int *cpumaplen) +{ + int tuple_size; + size_t i; + int i_retval = -1;

+ *cpumapptr = NULL; + + if (!PyTuple_Check(pycpumap)) { + PyErr_SetString(PyExc_TypeError, "Unexpected type, tuple is required"); + goto exit; + } + + *cpumaplen = VIR_CPU_MAPLEN(cpunum); + + if ((tuple_size = PyTuple_Size(pycpumap)) == -1) + goto exit; + + if (VIR_ALLOC_N(*cpumapptr, *cpumaplen) < 0) { + PyErr_NoMemory(); + goto exit; + } + + for (i = 0; i < tuple_size; i++) { + PyObject *flag = PyTuple_GetItem(pycpumap, i); + bool b; + + if (!flag || libvirt_boolUnwrap(flag, &b) < 0) { + VIR_FREE(*cpumapptr); + goto exit; + } + + if (b) + VIR_USE_CPU(*cpumapptr, i); + else + VIR_UNUSE_CPU(*cpumapptr, i); + } + + for (; i < cpunum; i++) + VIR_UNUSE_CPU(*cpumapptr, i); + + i_retval = 0; +exit:

+ return i_retval; +}