Python api returns a tuple with the vcpus information. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- libvirt-override-api.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index d1a9c26..1a0e314 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -239,8 +239,8 @@ <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> </function> <function name='virDomainGetVcpus' file='python'> - <info>Extract information about virtual CPUs of domain, store it in info array and also in cpumaps if this pointer is&apos;nt NULL.</info> - <return type='int' info='the number of info filled in case of success, -1 in case of failure.'/> + <info>Extract information about virtual CPUs of domain, store it in info array and also in cpumaps.</info> + <return type='char *' info='None in case of error, returns a tuple of vcpu info and vcpu map.'/> <arg name='domain' type='virDomainPtr' info='pointer to domain object, or NULL for Domain0'/> </function> <function name='virDomainPinVcpu' file='python'> -- 2.5.3

On 09/24/2015 10:01 AM, Pavel Hrdina wrote: Seems as though py_retval can be removed as it's no longer needed (build whine) So if this was missing - would the error indicate 'seconds' was malformed? Or just some generic invalid value python error? I'm preferential to specific errors that help point me at what I did wrong. John

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- libvirt-override.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 14aa0e9..114104b 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -2303,12 +2303,9 @@ libvirt_virRegisterErrorHandler(ATTRIBUTE_UNUSED PyObject * self, pyobj_f); virSetErrorFunc(NULL, libvirt_virErrorFuncHandler); - if (libvirt_virPythonErrorFuncHandler != NULL) { - Py_XDECREF(libvirt_virPythonErrorFuncHandler); - } - if (libvirt_virPythonErrorFuncCtxt != NULL) { - Py_XDECREF(libvirt_virPythonErrorFuncCtxt); - } + + Py_XDECREF(libvirt_virPythonErrorFuncHandler); + Py_XDECREF(libvirt_virPythonErrorFuncCtxt); if ((pyobj_f == Py_None) && (pyobj_ctx == Py_None)) { libvirt_virPythonErrorFuncHandler = NULL; -- 2.5.3

On Sat, Sep 26, 2015 at 09:08:35AM -0400, John Ferlan wrote: I don't understand what do you mean by this?? Check the whole function. It will decrement the old handlers, check for existence of new handlers and clean/set new handlers. And before setting the new handlers, we need to increment them, otherwise they will be cleared by GC. Everything that is parsed by 'PyArg_ParseTuple' has to be incremented, if you need to use those object outside of the function scope, where you've called that parser. Pavel

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- libvirt-override.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 114104b..b18196f 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -476,27 +476,22 @@ cleanup: */ static int getPyNodeCPUCount(virConnectPtr conn) { - int i_retval = -1; + int i_retval; virNodeInfo nodeinfo; #if LIBVIR_CHECK_VERSION(1, 0, 0) LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virNodeGetCPUMap(conn, NULL, NULL, 0); LIBVIRT_END_ALLOW_THREADS; -#endif /* LIBVIR_CHECK_VERSION(1, 0, 0) */ - - if (i_retval < 0) { - /* fallback: use nodeinfo */ - LIBVIRT_BEGIN_ALLOW_THREADS; - i_retval = virNodeGetInfo(conn, &nodeinfo); - LIBVIRT_END_ALLOW_THREADS; - if (i_retval < 0) - goto cleanup; +#else /* fallback: use nodeinfo */ + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virNodeGetInfo(conn, &nodeinfo); + LIBVIRT_END_ALLOW_THREADS; + if (i_retval >= 0) i_retval = VIR_NODEINFO_MAXCPUS(nodeinfo); - } +#endif /* LIBVIR_CHECK_VERSION(1, 0, 0) */ -cleanup: return i_retval; } -- 2.5.3

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- libvirt-lxc-override.c | 7 - libvirt-override.c | 413 ------------------------------------------------ libvirt-qemu-override.c | 7 - libvirt-utils.c | 406 +++++++++++++++++++++++++++++++++++++++++++++++ libvirt-utils.h | 51 ++++++ 5 files changed, 457 insertions(+), 427 deletions(-) diff --git a/libvirt-lxc-override.c b/libvirt-lxc-override.c index d0d9ffd..e0d3e60 100644 --- a/libvirt-lxc-override.c +++ b/libvirt-lxc-override.c @@ -47,13 +47,6 @@ extern void initcygvirtmod_lxc(void); do {} while (0) #endif -/* The two-statement sequence "Py_INCREF(Py_None); return Py_None;" - is so common that we encapsulate it here. Now, each use is simply - return VIR_PY_NONE; */ -#define VIR_PY_NONE (Py_INCREF (Py_None), Py_None) -#define VIR_PY_INT_FAIL (libvirt_intWrap(-1)) -#define VIR_PY_INT_SUCCESS (libvirt_intWrap(0)) - /************************************************************************ * * * Statistics * diff --git a/libvirt-override.c b/libvirt-override.c index b18196f..ff6f338 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -51,419 +51,6 @@ extern void initcygvirtmod(void); do {} while (0) #endif -/* The two-statement sequence "Py_INCREF(Py_None); return Py_None;" - is so common that we encapsulate it here. Now, each use is simply - return VIR_PY_NONE; */ -#define VIR_PY_NONE (Py_INCREF (Py_None), Py_None) -#define VIR_PY_INT_FAIL (libvirt_intWrap(-1)) -#define VIR_PY_INT_SUCCESS (libvirt_intWrap(0)) - -static char *py_str(PyObject *obj) -{ - PyObject *str = PyObject_Str(obj); - char *ret; - if (!str) { - PyErr_Print(); - PyErr_Clear(); - return NULL; - }; - libvirt_charPtrUnwrap(str, &ret); - return ret; -} - -/* Helper function to convert a virTypedParameter output array into a - * Python dictionary for return to the user. Return NULL on failure, - * after raising a python exception. */ -static PyObject * -getPyVirTypedParameter(const virTypedParameter *params, int nparams) -{ - PyObject *key, *val, *info; - size_t i; - - if ((info = PyDict_New()) == NULL) - return NULL; - - for (i = 0; i < nparams; i++) { - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - val = libvirt_intWrap(params[i].value.i); - break; - - case VIR_TYPED_PARAM_UINT: - val = libvirt_intWrap(params[i].value.ui); - break; - - case VIR_TYPED_PARAM_LLONG: - val = libvirt_longlongWrap(params[i].value.l); - break; - - case VIR_TYPED_PARAM_ULLONG: - val = libvirt_ulonglongWrap(params[i].value.ul); - break; - - case VIR_TYPED_PARAM_DOUBLE: - val = PyFloat_FromDouble(params[i].value.d); - break; - - case VIR_TYPED_PARAM_BOOLEAN: - val = PyBool_FromLong(params[i].value.b); - break; - - case VIR_TYPED_PARAM_STRING: - val = libvirt_constcharPtrWrap(params[i].value.s); - break; - - default: - /* Possible if a newer server has a bug and sent stuff we - * don't recognize. */ - PyErr_Format(PyExc_LookupError, - "Type value \"%d\" not recognized", - params[i].type); - val = NULL; - break; - } - - key = libvirt_constcharPtrWrap(params[i].field); - if (!key || !val) - goto cleanup; - - if (PyDict_SetItem(info, key, val) < 0) { - Py_DECREF(info); - goto cleanup; - } - - Py_DECREF(key); - Py_DECREF(val); - } - return info; - -cleanup: - Py_XDECREF(key); - Py_XDECREF(val); - return NULL; -} - -/* Allocate a new typed parameter array with the same contents and - * length as info, and using the array params of length nparams as - * hints on what types to use when creating the new array. The caller - * must clear the array before freeing it. Return NULL on failure, - * after raising a python exception. */ -static virTypedParameterPtr ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) -setPyVirTypedParameter(PyObject *info, - const virTypedParameter *params, int nparams) -{ - PyObject *key, *value; -#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 4 - int pos = 0; -#else - Py_ssize_t pos = 0; -#endif - virTypedParameterPtr temp = NULL, ret = NULL; - Py_ssize_t size; - size_t i; - - if ((size = PyDict_Size(info)) < 0) - return NULL; - - /* Libvirt APIs use NULL array and 0 size as a special case; - * setting should have at least one parameter. */ - if (size == 0) { - PyErr_Format(PyExc_LookupError, "Dictionary must not be empty"); - return NULL; - } - - if (VIR_ALLOC_N(ret, size) < 0) { - PyErr_NoMemory(); - return NULL; - } - - temp = &ret[0]; - while (PyDict_Next(info, &pos, &key, &value)) { - char *keystr = NULL; - - if (libvirt_charPtrUnwrap(key, &keystr) < 0 || - keystr == NULL) - goto cleanup; - - for (i = 0; i < nparams; i++) { - if (STREQ(params[i].field, keystr)) - break; - } - if (i == nparams) { - PyErr_Format(PyExc_LookupError, - "Attribute name \"%s\" could not be recognized", - keystr); - VIR_FREE(keystr); - goto cleanup; - } - - strncpy(temp->field, keystr, VIR_TYPED_PARAM_FIELD_LENGTH - 1); - temp->type = params[i].type; - VIR_FREE(keystr); - - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - if (libvirt_intUnwrap(value, &temp->value.i) < 0) - goto cleanup; - break; - - case VIR_TYPED_PARAM_UINT: - if (libvirt_uintUnwrap(value, &temp->value.ui) < 0) - goto cleanup; - break; - - case VIR_TYPED_PARAM_LLONG: - if (libvirt_longlongUnwrap(value, &temp->value.l) < 0) - goto cleanup; - break; - - case VIR_TYPED_PARAM_ULLONG: - if (libvirt_ulonglongUnwrap(value, &temp->value.ul) < 0) - goto cleanup; - break; - - case VIR_TYPED_PARAM_DOUBLE: - if (libvirt_doubleUnwrap(value, &temp->value.d) < 0) - goto cleanup; - break; - - case VIR_TYPED_PARAM_BOOLEAN: - { - bool b; - if (libvirt_boolUnwrap(value, &b) < 0) - goto cleanup; - temp->value.b = b; - break; - } - case VIR_TYPED_PARAM_STRING: - { - char *string_val; - if (libvirt_charPtrUnwrap(value, &string_val) < 0 || - !string_val) - goto cleanup; - temp->value.s = string_val; - break; - } - - default: - /* Possible if a newer server has a bug and sent stuff we - * don't recognize. */ - PyErr_Format(PyExc_LookupError, - "Type value \"%d\" not recognized", - params[i].type); - goto cleanup; - } - - temp++; - } - return ret; - -cleanup: - virTypedParamsFree(ret, size); - return NULL; -} - -/* While these appeared in libvirt in 1.0.2, we only - * need them in the python from 1.1.0 onwards */ -#if LIBVIR_CHECK_VERSION(1, 1, 0) -typedef struct { - const char *name; - int type; -} virPyTypedParamsHint; -typedef virPyTypedParamsHint *virPyTypedParamsHintPtr; - -# if PY_MAJOR_VERSION > 2 -# define libvirt_PyString_Check PyUnicode_Check -# else -# define libvirt_PyString_Check PyString_Check -# endif - -static int -virPyDictToTypedParamOne(virTypedParameterPtr *params, - int *n, - int *max, - virPyTypedParamsHintPtr hints, - int nhints, - const char *keystr, - PyObject *value) -{ - int rv = -1, type = -1; - size_t i; - - for (i = 0; i < nhints; i++) { - if (STREQ(hints[i].name, keystr)) { - type = hints[i].type; - break; - } - } - - if (type == -1) { - if (libvirt_PyString_Check(value)) { - type = VIR_TYPED_PARAM_STRING; - } else if (PyBool_Check(value)) { - type = VIR_TYPED_PARAM_BOOLEAN; - } else if (PyLong_Check(value)) { - unsigned long long ull = PyLong_AsUnsignedLongLong(value); - if (ull == (unsigned long long) -1 && PyErr_Occurred()) - type = VIR_TYPED_PARAM_LLONG; - else - type = VIR_TYPED_PARAM_ULLONG; -#if PY_MAJOR_VERSION < 3 - } else if (PyInt_Check(value)) { - if (PyInt_AS_LONG(value) < 0) - type = VIR_TYPED_PARAM_LLONG; - else - type = VIR_TYPED_PARAM_ULLONG; -#endif - } else if (PyFloat_Check(value)) { - type = VIR_TYPED_PARAM_DOUBLE; - } - } - - if (type == -1) { - PyErr_Format(PyExc_TypeError, - "Unknown type of \"%s\" field", keystr); - goto cleanup; - } - - switch ((virTypedParameterType) type) { - case VIR_TYPED_PARAM_INT: - { - int val; - if (libvirt_intUnwrap(value, &val) < 0 || - virTypedParamsAddInt(params, n, max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_UINT: - { - unsigned int val; - if (libvirt_uintUnwrap(value, &val) < 0 || - virTypedParamsAddUInt(params, n, max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_LLONG: - { - long long val; - if (libvirt_longlongUnwrap(value, &val) < 0 || - virTypedParamsAddLLong(params, n, max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_ULLONG: - { - unsigned long long val; - if (libvirt_ulonglongUnwrap(value, &val) < 0 || - virTypedParamsAddULLong(params, n, max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_DOUBLE: - { - double val; - if (libvirt_doubleUnwrap(value, &val) < 0 || - virTypedParamsAddDouble(params, n, max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_BOOLEAN: - { - bool val; - if (libvirt_boolUnwrap(value, &val) < 0 || - virTypedParamsAddBoolean(params, n, max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_STRING: - { - char *val;; - if (libvirt_charPtrUnwrap(value, &val) < 0 || - !val || - virTypedParamsAddString(params, n, max, keystr, val) < 0) { - VIR_FREE(val); - goto cleanup; - } - VIR_FREE(val); - break; - } - case VIR_TYPED_PARAM_LAST: - break; /* unreachable */ - } - - rv = 0; - - cleanup: - return rv; -} - - -/* Automatically convert dict into type parameters based on types reported - * by python. All integer types are converted into LLONG (in case of a negative - * value) or ULLONG (in case of a positive value). If you need different - * handling, use @hints to explicitly specify what types should be used for - * specific parameters. - */ -static int -ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) -virPyDictToTypedParams(PyObject *dict, - virTypedParameterPtr *ret_params, - int *ret_nparams, - virPyTypedParamsHintPtr hints, - int nhints) -{ - PyObject *key; - PyObject *value; -#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 4 - int pos = 0; -#else - Py_ssize_t pos = 0; -#endif - virTypedParameterPtr params = NULL; - int n = 0; - int max = 0; - int ret = -1; - char *keystr = NULL; - - *ret_params = NULL; - *ret_nparams = 0; - - if (PyDict_Size(dict) < 0) - return -1; - - while (PyDict_Next(dict, &pos, &key, &value)) { - if (libvirt_charPtrUnwrap(key, &keystr) < 0 || - !keystr) - goto cleanup; - - if (PyList_Check(value) || PyTuple_Check(value)) { - Py_ssize_t i, size = PySequence_Size(value); - - for (i = 0; i < size; i++) { - PyObject *v = PySequence_ITEM(value, i); - if (virPyDictToTypedParamOne(&params, &n, &max, - hints, nhints, keystr, v) < 0) - goto cleanup; - } - } else if (virPyDictToTypedParamOne(&params, &n, &max, - hints, nhints, keystr, value) < 0) - goto cleanup; - - VIR_FREE(keystr); - } - - *ret_params = params; - *ret_nparams = n; - params = NULL; - ret = 0; - -cleanup: - VIR_FREE(keystr); - virTypedParamsFree(params, n); - return ret; -} -#endif /* LIBVIR_CHECK_VERSION(1, 1, 0) */ - /* * Utility function to retrieve the number of node CPUs present. diff --git a/libvirt-qemu-override.c b/libvirt-qemu-override.c index ce6f4fd..c082324 100644 --- a/libvirt-qemu-override.c +++ b/libvirt-qemu-override.c @@ -47,13 +47,6 @@ extern void initcygvirtmod_qemu(void); do {} while (0) #endif -/* The two-statement sequence "Py_INCREF(Py_None); return Py_None;" - is so common that we encapsulate it here. Now, each use is simply - return VIR_PY_NONE; */ -#define VIR_PY_NONE (Py_INCREF (Py_None), Py_None) -#define VIR_PY_INT_FAIL (libvirt_intWrap(-1)) -#define VIR_PY_INT_SUCCESS (libvirt_intWrap(0)) - /******************************************* * Helper functions to avoid importing modules * for every callback diff --git a/libvirt-utils.c b/libvirt-utils.c index d1f6e70..651d74f 100644 --- a/libvirt-utils.c +++ b/libvirt-utils.c @@ -19,12 +19,21 @@ * */ +#include <Python.h> + +/* Ugly python defines that, which is also defined in errno.h */ +#undef _POSIC_C_SOURCE + +/* We want to see *_LAST enums. */ +#define VIR_ENUM_SENTINELS + #include <errno.h> #include <stddef.h> #include <stdlib.h> #include <unistd.h> #include <libvirt/libvirt.h> #include "libvirt-utils.h" +#include "typewrappers.h" /** * virAlloc: @@ -184,3 +193,400 @@ virTypedParamsFree(virTypedParameterPtr params, VIR_FREE(params); } #endif /* ! LIBVIR_CHECK_VERSION(1, 0, 2) */ + +char * +py_str(PyObject *obj) +{ + PyObject *str = PyObject_Str(obj); + char *ret; + if (!str) { + PyErr_Print(); + PyErr_Clear(); + return NULL; + }; + libvirt_charPtrUnwrap(str, &ret); + return ret; +} + +/* Helper function to convert a virTypedParameter output array into a + * Python dictionary for return to the user. Return NULL on failure, + * after raising a python exception. */ +PyObject * +getPyVirTypedParameter(const virTypedParameter *params, + int nparams) +{ + PyObject *key, *val, *info; + size_t i; + + if ((info = PyDict_New()) == NULL) + return NULL; + + for (i = 0; i < nparams; i++) { + switch (params[i].type) { + case VIR_TYPED_PARAM_INT: + val = libvirt_intWrap(params[i].value.i); + break; + + case VIR_TYPED_PARAM_UINT: + val = libvirt_intWrap(params[i].value.ui); + break; + + case VIR_TYPED_PARAM_LLONG: + val = libvirt_longlongWrap(params[i].value.l); + break; + + case VIR_TYPED_PARAM_ULLONG: + val = libvirt_ulonglongWrap(params[i].value.ul); + break; + + case VIR_TYPED_PARAM_DOUBLE: + val = PyFloat_FromDouble(params[i].value.d); + break; + + case VIR_TYPED_PARAM_BOOLEAN: + val = PyBool_FromLong(params[i].value.b); + break; + + case VIR_TYPED_PARAM_STRING: + val = libvirt_constcharPtrWrap(params[i].value.s); + break; + + default: + /* Possible if a newer server has a bug and sent stuff we + * don't recognize. */ + PyErr_Format(PyExc_LookupError, + "Type value \"%d\" not recognized", + params[i].type); + val = NULL; + break; + } + + key = libvirt_constcharPtrWrap(params[i].field); + if (!key || !val) + goto cleanup; + + if (PyDict_SetItem(info, key, val) < 0) { + Py_DECREF(info); + goto cleanup; + } + + Py_DECREF(key); + Py_DECREF(val); + } + return info; + + cleanup: + Py_XDECREF(key); + Py_XDECREF(val); + return NULL; +} + +/* Allocate a new typed parameter array with the same contents and + * length as info, and using the array params of length nparams as + * hints on what types to use when creating the new array. The caller + * must clear the array before freeing it. Return NULL on failure, + * after raising a python exception. */ +virTypedParameterPtr +setPyVirTypedParameter(PyObject *info, + const virTypedParameter *params, + int nparams) +{ + PyObject *key, *value; +#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 4 + int pos = 0; +#else + Py_ssize_t pos = 0; +#endif + virTypedParameterPtr temp = NULL, ret = NULL; + Py_ssize_t size; + size_t i; + + if ((size = PyDict_Size(info)) < 0) + return NULL; + + /* Libvirt APIs use NULL array and 0 size as a special case; + * setting should have at least one parameter. */ + if (size == 0) { + PyErr_Format(PyExc_LookupError, "Dictionary must not be empty"); + return NULL; + } + + if (VIR_ALLOC_N(ret, size) < 0) { + PyErr_NoMemory(); + return NULL; + } + + temp = &ret[0]; + while (PyDict_Next(info, &pos, &key, &value)) { + char *keystr = NULL; + + if (libvirt_charPtrUnwrap(key, &keystr) < 0 || + keystr == NULL) + goto cleanup; + + for (i = 0; i < nparams; i++) { + if (STREQ(params[i].field, keystr)) + break; + } + if (i == nparams) { + PyErr_Format(PyExc_LookupError, + "Attribute name \"%s\" could not be recognized", + keystr); + VIR_FREE(keystr); + goto cleanup; + } + + strncpy(temp->field, keystr, VIR_TYPED_PARAM_FIELD_LENGTH - 1); + temp->type = params[i].type; + VIR_FREE(keystr); + + switch (params[i].type) { + case VIR_TYPED_PARAM_INT: + if (libvirt_intUnwrap(value, &temp->value.i) < 0) + goto cleanup; + break; + + case VIR_TYPED_PARAM_UINT: + if (libvirt_uintUnwrap(value, &temp->value.ui) < 0) + goto cleanup; + break; + + case VIR_TYPED_PARAM_LLONG: + if (libvirt_longlongUnwrap(value, &temp->value.l) < 0) + goto cleanup; + break; + + case VIR_TYPED_PARAM_ULLONG: + if (libvirt_ulonglongUnwrap(value, &temp->value.ul) < 0) + goto cleanup; + break; + + case VIR_TYPED_PARAM_DOUBLE: + if (libvirt_doubleUnwrap(value, &temp->value.d) < 0) + goto cleanup; + break; + + case VIR_TYPED_PARAM_BOOLEAN: + { + bool b; + if (libvirt_boolUnwrap(value, &b) < 0) + goto cleanup; + temp->value.b = b; + break; + } + case VIR_TYPED_PARAM_STRING: + { + char *string_val; + if (libvirt_charPtrUnwrap(value, &string_val) < 0 || + !string_val) + goto cleanup; + temp->value.s = string_val; + break; + } + + default: + /* Possible if a newer server has a bug and sent stuff we + * don't recognize. */ + PyErr_Format(PyExc_LookupError, + "Type value \"%d\" not recognized", + params[i].type); + goto cleanup; + } + + temp++; + } + return ret; + +cleanup: + virTypedParamsFree(ret, size); + return NULL; +} + + +/* While these appeared in libvirt in 1.0.2, we only + * need them in the python from 1.1.0 onwards */ +#if LIBVIR_CHECK_VERSION(1, 1, 0) +int +virPyDictToTypedParamOne(virTypedParameterPtr *params, + int *n, + int *max, + virPyTypedParamsHintPtr hints, + int nhints, + const char *keystr, + PyObject *value) +{ + int rv = -1, type = -1; + size_t i; + + for (i = 0; i < nhints; i++) { + if (STREQ(hints[i].name, keystr)) { + type = hints[i].type; + break; + } + } + + if (type == -1) { + if (libvirt_PyString_Check(value)) { + type = VIR_TYPED_PARAM_STRING; + } else if (PyBool_Check(value)) { + type = VIR_TYPED_PARAM_BOOLEAN; + } else if (PyLong_Check(value)) { + unsigned long long ull = PyLong_AsUnsignedLongLong(value); + if (ull == (unsigned long long) -1 && PyErr_Occurred()) + type = VIR_TYPED_PARAM_LLONG; + else + type = VIR_TYPED_PARAM_ULLONG; +#if PY_MAJOR_VERSION < 3 + } else if (PyInt_Check(value)) { + if (PyInt_AS_LONG(value) < 0) + type = VIR_TYPED_PARAM_LLONG; + else + type = VIR_TYPED_PARAM_ULLONG; +#endif + } else if (PyFloat_Check(value)) { + type = VIR_TYPED_PARAM_DOUBLE; + } + } + + if (type == -1) { + PyErr_Format(PyExc_TypeError, + "Unknown type of \"%s\" field", keystr); + goto cleanup; + } + + switch ((virTypedParameterType) type) { + case VIR_TYPED_PARAM_INT: + { + int val; + if (libvirt_intUnwrap(value, &val) < 0 || + virTypedParamsAddInt(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_UINT: + { + unsigned int val; + if (libvirt_uintUnwrap(value, &val) < 0 || + virTypedParamsAddUInt(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_LLONG: + { + long long val; + if (libvirt_longlongUnwrap(value, &val) < 0 || + virTypedParamsAddLLong(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_ULLONG: + { + unsigned long long val; + if (libvirt_ulonglongUnwrap(value, &val) < 0 || + virTypedParamsAddULLong(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_DOUBLE: + { + double val; + if (libvirt_doubleUnwrap(value, &val) < 0 || + virTypedParamsAddDouble(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_BOOLEAN: + { + bool val; + if (libvirt_boolUnwrap(value, &val) < 0 || + virTypedParamsAddBoolean(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_STRING: + { + char *val;; + if (libvirt_charPtrUnwrap(value, &val) < 0 || + !val || + virTypedParamsAddString(params, n, max, keystr, val) < 0) { + VIR_FREE(val); + goto cleanup; + } + VIR_FREE(val); + break; + } + case VIR_TYPED_PARAM_LAST: + break; /* unreachable */ + } + + rv = 0; + + cleanup: + return rv; +} + + +/* Automatically convert dict into type parameters based on types reported + * by python. All integer types are converted into LLONG (in case of a negative + * value) or ULLONG (in case of a positive value). If you need different + * handling, use @hints to explicitly specify what types should be used for + * specific parameters. + */ +int +virPyDictToTypedParams(PyObject *dict, + virTypedParameterPtr *ret_params, + int *ret_nparams, + virPyTypedParamsHintPtr hints, + int nhints) +{ + PyObject *key; + PyObject *value; +#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 4 + int pos = 0; +#else + Py_ssize_t pos = 0; +#endif + virTypedParameterPtr params = NULL; + int n = 0; + int max = 0; + int ret = -1; + char *keystr = NULL; + + *ret_params = NULL; + *ret_nparams = 0; + + if (PyDict_Size(dict) < 0) + return -1; + + while (PyDict_Next(dict, &pos, &key, &value)) { + if (libvirt_charPtrUnwrap(key, &keystr) < 0 || + !keystr) + goto cleanup; + + if (PyList_Check(value) || PyTuple_Check(value)) { + Py_ssize_t i, size = PySequence_Size(value); + + for (i = 0; i < size; i++) { + PyObject *v = PySequence_ITEM(value, i); + if (virPyDictToTypedParamOne(&params, &n, &max, + hints, nhints, keystr, v) < 0) + goto cleanup; + } + } else if (virPyDictToTypedParamOne(&params, &n, &max, + hints, nhints, keystr, value) < 0) + goto cleanup; + + VIR_FREE(keystr); + } + + *ret_params = params; + *ret_nparams = n; + params = NULL; + ret = 0; + +cleanup: + VIR_FREE(keystr); + virTypedParamsFree(params, n); + return ret; +} +#endif /* LIBVIR_CHECK_VERSION(1, 1, 0) */ diff --git a/libvirt-utils.h b/libvirt-utils.h index bef5489..9f80133 100644 --- a/libvirt-utils.h +++ b/libvirt-utils.h @@ -22,6 +22,9 @@ #ifndef __LIBVIRT_UTILS_H__ # define __LIBVIRT_UTILS_H__ +# include <Python.h> +# include <libvirt/libvirt.h> + # define STREQ(a,b) (strcmp(a,b) == 0) # ifndef MIN @@ -135,6 +138,22 @@ int virReallocN(void *ptrptr, size_t size, size_t count) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1); void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1); + +# if PY_MAJOR_VERSION > 2 +# define libvirt_PyString_Check PyUnicode_Check +# else +# define libvirt_PyString_Check PyString_Check +# endif + + +/* The two-statement sequence "Py_INCREF(Py_None); return Py_None;" + is so common that we encapsulate it here. Now, each use is simply + return VIR_PY_NONE; */ +#define VIR_PY_NONE (Py_INCREF (Py_None), Py_None) +#define VIR_PY_INT_FAIL (libvirt_intWrap(-1)) +#define VIR_PY_INT_SUCCESS (libvirt_intWrap(0)) + + /** * VIR_ALLOC: * @ptr: pointer to hold address of allocated memory @@ -216,4 +235,36 @@ void virTypedParamsClear(virTypedParameterPtr params, int nparams); void virTypedParamsFree(virTypedParameterPtr params, int nparams); # endif /* ! LIBVIR_CHECK_VERSION(1, 0, 2) */ +char * py_str(PyObject *obj); +PyObject * getPyVirTypedParameter(const virTypedParameter *params, + int nparams); +virTypedParameterPtr setPyVirTypedParameter(PyObject *info, + const virTypedParameter *params, + int nparams) +ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + + +# if LIBVIR_CHECK_VERSION(1, 1, 0) +typedef struct { + const char *name; + int type; +} virPyTypedParamsHint; +typedef virPyTypedParamsHint *virPyTypedParamsHintPtr; + + +int virPyDictToTypedPramaOne(virTypedParameterPtr *params, + int *n, + int *max, + virPyTypedParamsHintPtr hints, + int nhints, + const char *keystr, + PyObject *value); +int virPyDictToTypedParams(PyObject *dict, + virTypedParameterPtr *ret_params, + int *ret_nparams, + virPyTypedParamsHintPtr hints, + int nhints) +ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); +# endif /* LIBVIR_CHECK_VERSION(1, 1, 0) */ + #endif /* __LIBVIRT_UTILS_H__ */ -- 2.5.3

On 09/24/2015 10:01 AM, Pavel Hrdina wrote: [...] There's an extra space between * and self and args... May as well be consistent while you're at it. Ditto about spaces again [...] You didn't follow the model of one line per arg John

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- libvirt-lxc-override.c | 30 ++++++------ libvirt-override.c | 125 ++++++++++++++++++++++-------------------------- libvirt-qemu-override.c | 41 ++++++++-------- typewrappers.c | 8 ++-- 4 files changed, 96 insertions(+), 108 deletions(-) diff --git a/libvirt-lxc-override.c b/libvirt-lxc-override.c index 2a3619e..8f5bb0c 100644 --- a/libvirt-lxc-override.c +++ b/libvirt-lxc-override.c @@ -41,10 +41,10 @@ extern void initcygvirtmod_lxc(void); #if DEBUG_ERROR # define DEBUG(fmt, ...) \ - printf(fmt, __VA_ARGS__) + printf(fmt, __VA_ARGS__) #else # define DEBUG(fmt, ...) \ - do {} while (0) + do {} while (0) #endif /************************************************************************ @@ -114,19 +114,19 @@ static PyMethodDef libvirtLxcMethods[] = { #if PY_MAJOR_VERSION > 2 static struct PyModuleDef moduledef = { - PyModuleDef_HEAD_INIT, + PyModuleDef_HEAD_INIT, # ifndef __CYGWIN__ - "libvirtmod_lxc", + "libvirtmod_lxc", # else - "cygvirtmod_lxc", + "cygvirtmod_lxc", # endif - NULL, - -1, - libvirtLxcMethods, - NULL, - NULL, - NULL, - NULL + NULL, + -1, + libvirtLxcMethods, + NULL, + NULL, + NULL, + NULL }; PyObject * @@ -135,7 +135,7 @@ PyInit_libvirtmod_lxc # else PyInit_cygvirtmod_lxc # endif - (void) +(void) { PyObject *module; @@ -153,7 +153,7 @@ initlibvirtmod_lxc # else initcygvirtmod_lxc # endif - (void) +(void) { if (virInitialize() < 0) return; @@ -165,6 +165,6 @@ initcygvirtmod_lxc # else "cygvirtmod_lxc", # endif - libvirtLxcMethods); + libvirtLxcMethods); } #endif /* ! PY_MAJOR_VERSION > 2 */ diff --git a/libvirt-override.c b/libvirt-override.c index 4c5590a..cf4fedb 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -45,10 +45,10 @@ extern void initcygvirtmod(void); #if DEBUG_ERROR # define DEBUG(fmt, ...) \ - printf(fmt, __VA_ARGS__) + printf(fmt, __VA_ARGS__) #else # define DEBUG(fmt, ...) \ - do {} while (0) + do {} while (0) #endif @@ -101,7 +101,7 @@ libvirt_virDomainBlockStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *info; if (!PyArg_ParseTuple(args, (char *)"Oz:virDomainBlockStats", - &pyobj_domain, &path)) + &pyobj_domain, &path)) return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); @@ -319,7 +319,7 @@ libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *info; if (!PyArg_ParseTuple(args, (char *)"Oz:virDomainInterfaceStats", - &pyobj_domain, &path)) + &pyobj_domain, &path)) return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); @@ -498,7 +498,7 @@ libvirt_virDomainGetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, static PyObject * libvirt_virDomainGetSchedulerParametersFlags(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) + PyObject *args) { virDomainPtr domain; PyObject *pyobj_domain; @@ -1258,10 +1258,10 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, goto itemError; continue; - itemError: - Py_DECREF(info); - Py_XDECREF(item); - goto cleanup; + itemError: + Py_DECREF(info); + Py_XDECREF(item); + goto cleanup; } for (i = 0; i < dominfo.nrVirtCpu; i++) { PyObject *info = PyTuple_New(cpunum); @@ -1326,8 +1326,8 @@ libvirt_virDomainPinVcpu(PyObject *self ATTRIBUTE_UNUSED, if (tuple_size == -1) return ret; } else { - PyErr_SetString(PyExc_TypeError, "Unexpected type, tuple is required"); - return ret; + PyErr_SetString(PyExc_TypeError, "Unexpected type, tuple is required"); + return ret; } cpumaplen = VIR_CPU_MAPLEN(cpunum); @@ -1391,8 +1391,8 @@ libvirt_virDomainPinVcpuFlags(PyObject *self ATTRIBUTE_UNUSED, if (tuple_size == -1) return ret; } else { - PyErr_SetString(PyExc_TypeError, "Unexpected type, tuple is required"); - return ret; + PyErr_SetString(PyExc_TypeError, "Unexpected type, tuple is required"); + return ret; } cpumaplen = VIR_CPU_MAPLEN(cpunum); @@ -1520,8 +1520,8 @@ libvirt_virDomainPinEmulator(PyObject *self ATTRIBUTE_UNUSED, cpumaplen = VIR_CPU_MAPLEN(cpunum); if (!PyTuple_Check(pycpumap)) { - PyErr_SetString(PyExc_TypeError, "Unexpected type, tuple is required"); - return NULL; + PyErr_SetString(PyExc_TypeError, "Unexpected type, tuple is required"); + return NULL; } if ((tuple_size = PyTuple_Size(pycpumap)) == -1) @@ -1889,9 +1889,8 @@ libvirt_virRegisterErrorHandler(ATTRIBUTE_UNUSED PyObject * self, PyObject *pyobj_f; PyObject *pyobj_ctx; - if (!PyArg_ParseTuple - (args, (char *) "OO:xmlRegisterErrorHandler", &pyobj_f, - &pyobj_ctx)) + if (!PyArg_ParseTuple(args, (char *) "OO:xmlRegisterErrorHandler", + &pyobj_f, &pyobj_ctx)) return NULL; DEBUG("libvirt_virRegisterErrorHandler(%p, %p) called\n", pyobj_ctx, @@ -3202,7 +3201,7 @@ libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, py_retval = PyList_New(c_retval); for (i = 0; i < c_retval; i++) { PyList_SetItem(py_retval, i, - libvirt_ulonglongWrap(freeMems[i])); + libvirt_ulonglongWrap(freeMems[i])); } VIR_FREE(freeMems); return py_retval; @@ -5102,9 +5101,8 @@ libvirt_virConnectDomainEventRegister(ATTRIBUTE_UNUSED PyObject *self, virConnectPtr conn; int ret = 0; - if (!PyArg_ParseTuple - (args, (char *) "OO:virConnectDomainEventRegister", - &pyobj_conn, &pyobj_conn_inst)) { + if (!PyArg_ParseTuple(args, (char *) "OO:virConnectDomainEventRegister", + &pyobj_conn, &pyobj_conn_inst)) { DEBUG("%s failed parsing tuple\n", __FUNCTION__); return VIR_PY_INT_FAIL; } @@ -5138,9 +5136,8 @@ libvirt_virConnectDomainEventDeregister(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; int ret = 0; - if (!PyArg_ParseTuple - (args, (char *) "OO:virConnectDomainEventDeregister", - &pyobj_conn, &pyobj_conn_inst)) + if (!PyArg_ParseTuple(args, (char *) "OO:virConnectDomainEventDeregister", + &pyobj_conn, &pyobj_conn_inst)) return NULL; DEBUG("libvirt_virConnectDomainEventDeregister(%p) called\n", pyobj_conn); @@ -5500,10 +5497,8 @@ libvirt_virEventInvokeHandleCallback(PyObject *self ATTRIBUTE_UNUSED, virEventHandleCallback cb; void *opaque; - if (!PyArg_ParseTuple - (args, (char *) "iiiOO:virEventInvokeHandleCallback", - &watch, &fd, &event, &py_f, &py_opaque - )) + if (!PyArg_ParseTuple(args, (char *) "iiiOO:virEventInvokeHandleCallback", + &watch, &fd, &event, &py_f, &py_opaque)) return VIR_PY_INT_FAIL; cb = (virEventHandleCallback) PyvirEventHandleCallback_Get(py_f); @@ -5528,10 +5523,8 @@ libvirt_virEventInvokeTimeoutCallback(PyObject *self ATTRIBUTE_UNUSED, virEventTimeoutCallback cb; void *opaque; - if (!PyArg_ParseTuple - (args, (char *) "iOO:virEventInvokeTimeoutCallback", - &timer, &py_f, &py_opaque - )) + if (!PyArg_ParseTuple(args, (char *) "iOO:virEventInvokeTimeoutCallback", + &timer, &py_f, &py_opaque)) return VIR_PY_INT_FAIL; cb = (virEventTimeoutCallback) PyvirEventTimeoutCallback_Get(py_f); @@ -6702,15 +6695,15 @@ libvirt_virConnectDomainEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, virConnectDomainEventGenericCallback cb = NULL; virDomainPtr dom; - if (!PyArg_ParseTuple - (args, (char *) "OOiO:virConnectDomainEventRegisterAny", - &pyobj_conn, &pyobj_dom, &eventID, &pyobj_cbData)) { + if (!PyArg_ParseTuple(args, + (char *) "OOiO:virConnectDomainEventRegisterAny", + &pyobj_conn, &pyobj_dom, &eventID, &pyobj_cbData)) { DEBUG("%s failed parsing tuple\n", __FUNCTION__); return VIR_PY_INT_FAIL; } DEBUG("libvirt_virConnectDomainEventRegister(%p %p %d %p) called\n", - pyobj_conn, pyobj_dom, eventID, pyobj_cbData); + pyobj_conn, pyobj_dom, eventID, pyobj_cbData); conn = PyvirConnect_Get(pyobj_conn); if (pyobj_dom == Py_None) dom = NULL; @@ -6824,9 +6817,8 @@ libvirt_virConnectDomainEventDeregisterAny(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; int ret = 0; - if (!PyArg_ParseTuple - (args, (char *) "Oi:virConnectDomainEventDeregister", - &pyobj_conn, &callbackID)) + if (!PyArg_ParseTuple(args, (char *) "Oi:virConnectDomainEventDeregister", + &pyobj_conn, &callbackID)) return NULL; DEBUG("libvirt_virConnectDomainEventDeregister(%p) called\n", pyobj_conn); @@ -6920,15 +6912,15 @@ libvirt_virConnectNetworkEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, virConnectNetworkEventGenericCallback cb = NULL; virNetworkPtr net; - if (!PyArg_ParseTuple - (args, (char *) "OOiO:virConnectNetworkEventRegisterAny", - &pyobj_conn, &pyobj_net, &eventID, &pyobj_cbData)) { + if (!PyArg_ParseTuple(args, + (char *) "OOiO:virConnectNetworkEventRegisterAny", + &pyobj_conn, &pyobj_net, &eventID, &pyobj_cbData)) { DEBUG("%s failed parsing tuple\n", __FUNCTION__); return VIR_PY_INT_FAIL; } DEBUG("libvirt_virConnectNetworkEventRegister(%p %p %d %p) called\n", - pyobj_conn, pyobj_net, eventID, pyobj_cbData); + pyobj_conn, pyobj_net, eventID, pyobj_cbData); conn = PyvirConnect_Get(pyobj_conn); if (pyobj_net == Py_None) net = NULL; @@ -6974,9 +6966,8 @@ libvirt_virConnectNetworkEventDeregisterAny(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; int ret = 0; - if (!PyArg_ParseTuple - (args, (char *) "Oi:virConnectNetworkEventDeregister", - &pyobj_conn, &callbackID)) + if (!PyArg_ParseTuple(args, (char *) "Oi:virConnectNetworkEventDeregister", + &pyobj_conn, &callbackID)) return NULL; DEBUG("libvirt_virConnectNetworkEventDeregister(%p) called\n", pyobj_conn); @@ -7041,15 +7032,14 @@ libvirt_virConnectRegisterCloseCallback(PyObject * self ATTRIBUTE_UNUSED, virConnectPtr conn; int ret = 0; - if (!PyArg_ParseTuple - (args, (char *) "OO:virConnectRegisterCloseCallback", - &pyobj_conn, &pyobj_cbData)) { + if (!PyArg_ParseTuple(args, (char *) "OO:virConnectRegisterCloseCallback", + &pyobj_conn, &pyobj_cbData)) { DEBUG("%s failed parsing tuple\n", __FUNCTION__); return VIR_PY_INT_FAIL; } DEBUG("libvirt_virConnectRegisterCloseCallback(%p %p) called\n", - pyobj_conn, pyobj_cbData); + pyobj_conn, pyobj_cbData); conn = PyvirConnect_Get(pyobj_conn); Py_INCREF(pyobj_cbData); @@ -7078,9 +7068,8 @@ libvirt_virConnectUnregisterCloseCallback(PyObject * self ATTRIBUTE_UNUSED, virConnectPtr conn; int ret = 0; - if (!PyArg_ParseTuple - (args, (char *) "O:virConnectDomainEventUnregister", - &pyobj_conn)) + if (!PyArg_ParseTuple(args, (char *) "O:virConnectDomainEventUnregister", + &pyobj_conn)) return NULL; DEBUG("libvirt_virConnectDomainEventUnregister(%p) called\n", @@ -8424,7 +8413,7 @@ libvirt_virDomainGetFSInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval = NULL; if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainFSInfo", - &pyobj_domain, &flags)) + &pyobj_domain, &flags)) return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); @@ -8687,19 +8676,19 @@ static PyMethodDef libvirtMethods[] = { #if PY_MAJOR_VERSION > 2 static struct PyModuleDef moduledef = { - PyModuleDef_HEAD_INIT, + PyModuleDef_HEAD_INIT, # ifndef __CYGWIN__ - "libvirtmod", + "libvirtmod", # else - "cygvirtmod", + "cygvirtmod", # endif - NULL, - -1, - libvirtMethods, - NULL, - NULL, - NULL, - NULL + NULL, + -1, + libvirtMethods, + NULL, + NULL, + NULL, + NULL }; PyObject * @@ -8708,7 +8697,7 @@ PyInit_libvirtmod # else PyInit_cygvirtmod # endif - (void) +(void) { PyObject *module; @@ -8726,7 +8715,7 @@ initlibvirtmod # else initcygvirtmod # endif - (void) +(void) { if (virInitialize() < 0) return; @@ -8738,6 +8727,6 @@ initcygvirtmod # else "cygvirtmod", # endif - libvirtMethods); + libvirtMethods); } #endif /* ! PY_MAJOR_VERSION > 2 */ diff --git a/libvirt-qemu-override.c b/libvirt-qemu-override.c index ad1693b..46d513d 100644 --- a/libvirt-qemu-override.c +++ b/libvirt-qemu-override.c @@ -41,10 +41,10 @@ extern void initcygvirtmod_qemu(void); #if DEBUG_ERROR # define DEBUG(fmt, ...) \ - printf(fmt, __VA_ARGS__) + printf(fmt, __VA_ARGS__) #else # define DEBUG(fmt, ...) \ - do {} while (0) + do {} while (0) #endif /******************************************* @@ -270,9 +270,8 @@ libvirt_qemu_virConnectDomainQemuMonitorEventRegister(PyObject *self ATTRIBUTE_U virDomainPtr dom; unsigned int flags; - if (!PyArg_ParseTuple - (args, (char *) "OOzOI", - &pyobj_conn, &pyobj_dom, &event, &pyobj_cbData, &flags)) { + if (!PyArg_ParseTuple(args, (char *) "OOzOI", &pyobj_conn, &pyobj_dom, + &event, &pyobj_cbData, &flags)) { DEBUG("%s failed parsing tuple\n", __FUNCTION__); return VIR_PY_INT_FAIL; } @@ -315,9 +314,9 @@ libvirt_qemu_virConnectDomainQemuMonitorEventDeregister(PyObject *self ATTRIBUTE virConnectPtr conn; int ret = 0; - if (!PyArg_ParseTuple - (args, (char *) "Oi:virConnectDomainQemuMonitorEventDeregister", - &pyobj_conn, &callbackID)) + if (!PyArg_ParseTuple(args, + (char *) "Oi:virConnectDomainQemuMonitorEventDeregister", + &pyobj_conn, &callbackID)) return NULL; DEBUG("libvirt_qemu_virConnectDomainQemuMonitorEventDeregister(%p) called\n", @@ -355,19 +354,19 @@ static PyMethodDef libvirtQemuMethods[] = { #if PY_MAJOR_VERSION > 2 static struct PyModuleDef moduledef = { - PyModuleDef_HEAD_INIT, + PyModuleDef_HEAD_INIT, # ifndef __CYGWIN__ - "libvirtmod_qemu", + "libvirtmod_qemu", # else - "cygvirtmod_qemu", + "cygvirtmod_qemu", # endif - NULL, - -1, - libvirtQemuMethods, - NULL, - NULL, - NULL, - NULL + NULL, + -1, + libvirtQemuMethods, + NULL, + NULL, + NULL, + NULL }; PyObject * @@ -376,7 +375,7 @@ PyInit_libvirtmod_qemu # else PyInit_cygvirtmod_qemu # endif - (void) +(void) { PyObject *module; @@ -394,7 +393,7 @@ initlibvirtmod_qemu # else initcygvirtmod_qemu # endif - (void) +(void) { if (virInitialize() < 0) return; @@ -406,6 +405,6 @@ initcygvirtmod_qemu # else "cygvirtmod_qemu", # endif - libvirtQemuMethods); + libvirtQemuMethods); } #endif /* ! PY_MAJOR_VERSION > 2 */ diff --git a/typewrappers.c b/typewrappers.c index a164a11..6507e0f 100644 --- a/typewrappers.c +++ b/typewrappers.c @@ -145,10 +145,10 @@ libvirt_constcharPtrWrap(const char *str) PyObject * libvirt_boolWrap(int val) { - if (val) - Py_RETURN_TRUE; - else - Py_RETURN_FALSE; + if (val) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; } int -- 2.5.3

There is a rule, python API fails, it also in those cases sets an exception. We should follow those rules and in those cases return NULL. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- libvirt-lxc-override.c | 2 +- libvirt-override.c | 143 +++++++++++++++++++++--------------------------- libvirt-qemu-override.c | 6 +- 3 files changed, 64 insertions(+), 87 deletions(-) diff --git a/libvirt-lxc-override.c b/libvirt-lxc-override.c index 8f5bb0c..20d1cf4 100644 --- a/libvirt-lxc-override.c +++ b/libvirt-lxc-override.c @@ -99,7 +99,7 @@ libvirt_lxc_virDomainLxcOpenNamespace(PyObject *self ATTRIBUTE_UNUSED, VIR_FORCE_CLOSE(fdlist[i]); } VIR_FREE(fdlist); - return VIR_PY_NONE; + return NULL; } /************************************************************************ * * diff --git a/libvirt-override.c b/libvirt-override.c index 2a50f19..a6339e5 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -114,7 +114,8 @@ libvirt_virDomainBlockStats(PyObject *self ATTRIBUTE_UNUSED, /* convert to a Python tuple of long objects */ if ((info = PyTuple_New(5)) == NULL) - return VIR_PY_NONE; + return NULL; + PyTuple_SetItem(info, 0, libvirt_longlongWrap(stats.rd_req)); PyTuple_SetItem(info, 1, libvirt_longlongWrap(stats.rd_bytes)); PyTuple_SetItem(info, 2, libvirt_longlongWrap(stats.wr_req)); @@ -334,7 +335,8 @@ libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, /* convert to a Python tuple of long objects */ if ((info = PyTuple_New(8)) == NULL) - return VIR_PY_NONE; + return NULL; + PyTuple_SetItem(info, 0, libvirt_longlongWrap(stats.rx_bytes)); PyTuple_SetItem(info, 1, libvirt_longlongWrap(stats.rx_packets)); PyTuple_SetItem(info, 2, libvirt_longlongWrap(stats.rx_errs)); @@ -369,7 +371,7 @@ libvirt_virDomainMemoryStats(PyObject *self ATTRIBUTE_UNUSED, /* convert to a Python dictionary */ if ((info = PyDict_New()) == NULL) - return VIR_PY_NONE; + return NULL; for (i = 0; i < nr_stats; i++) { switch (stats[i].tag) { @@ -442,7 +444,7 @@ libvirt_virDomainGetSchedulerType(PyObject *self ATTRIBUTE_UNUSED, /* convert to a Python tuple of long objects */ if ((info = PyTuple_New(2)) == NULL) { VIR_FREE(c_retval); - return VIR_PY_NONE; + return NULL; } PyTuple_SetItem(info, 0, libvirt_constcharPtrWrap(c_retval)); @@ -1504,7 +1506,7 @@ libvirt_virDomainGetVcpuPinInfo(PyObject *self ATTRIBUTE_UNUSED, Py_XDECREF(pycpumaps); - return VIR_PY_NONE; + return NULL; } @@ -1549,7 +1551,7 @@ libvirt_virDomainPinEmulator(PyObject *self ATTRIBUTE_UNUSED, if (!flag || libvirt_boolUnwrap(flag, &b) < 0) { VIR_FREE(cpumap); - return VIR_PY_INT_FAIL; + return NULL; } if (b) @@ -1695,7 +1697,6 @@ libvirt_virDomainGetIOThreadInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *pyused; if ((pyused = PyBool_FromLong(VIR_CPU_USED(iothr->cpumap, pcpu))) == NULL) { - py_retval = VIR_PY_NONE; goto cleanup; } if (PyList_SetItem(iothrmap, pcpu, pyused) < 0) { @@ -1804,7 +1805,8 @@ libvirt_virGetLastError(PyObject *self ATTRIBUTE_UNUSED, return VIR_PY_NONE; if ((info = PyTuple_New(9)) == NULL) - return VIR_PY_NONE; + return NULL; + PyTuple_SetItem(info, 0, libvirt_intWrap((long) err->code)); PyTuple_SetItem(info, 1, libvirt_intWrap((long) err->domain)); PyTuple_SetItem(info, 2, libvirt_constcharPtrWrap(err->message)); @@ -1838,7 +1840,8 @@ libvirt_virConnGetLastError(PyObject *self ATTRIBUTE_UNUSED, return VIR_PY_NONE; if ((info = PyTuple_New(9)) == NULL) - return VIR_PY_NONE; + return NULL; + PyTuple_SetItem(info, 0, libvirt_intWrap((long) err->code)); PyTuple_SetItem(info, 1, libvirt_intWrap((long) err->domain)); PyTuple_SetItem(info, 2, libvirt_constcharPtrWrap(err->message)); @@ -3408,7 +3411,7 @@ libvirt_virConnectListStoragePools(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(names[i]); VIR_FREE(names); } - return VIR_PY_NONE; + return NULL; } if (names) { @@ -3463,7 +3466,7 @@ libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(names[i]); VIR_FREE(names); } - return VIR_PY_NONE; + return NULL; } if (names) { @@ -3566,7 +3569,7 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(names[i]); VIR_FREE(names); } - return VIR_PY_NONE; + return NULL; } if (names) { @@ -3678,7 +3681,7 @@ libvirt_virStoragePoolGetInfo(PyObject *self ATTRIBUTE_UNUSED, return VIR_PY_NONE; if ((py_retval = PyList_New(4)) == NULL) - return VIR_PY_NONE; + return NULL; PyList_SetItem(py_retval, 0, libvirt_intWrap((int) info.state)); PyList_SetItem(py_retval, 1, @@ -3712,7 +3715,8 @@ libvirt_virStorageVolGetInfo(PyObject *self ATTRIBUTE_UNUSED, return VIR_PY_NONE; if ((py_retval = PyList_New(3)) == NULL) - return VIR_PY_NONE; + return NULL; + PyList_SetItem(py_retval, 0, libvirt_intWrap((int) info.type)); PyList_SetItem(py_retval, 1, libvirt_ulonglongWrap(info.capacity)); @@ -4395,7 +4399,7 @@ libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(names[i]); VIR_FREE(names); } - return VIR_PY_NONE; + return NULL; } if (names) { @@ -4451,7 +4455,7 @@ libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(names[i]); VIR_FREE(names); } - return VIR_PY_NONE; + return NULL; } if (names) { @@ -4546,7 +4550,7 @@ libvirt_virConnectBaselineCPU(PyObject *self ATTRIBUTE_UNUSED, for (j = 0 ; j < i ; j++) VIR_FREE(xmlcpus[j]); VIR_FREE(xmlcpus); - return VIR_PY_NONE; + return NULL; } } } @@ -4565,9 +4569,6 @@ libvirt_virConnectBaselineCPU(PyObject *self ATTRIBUTE_UNUSED, pybase_cpu = libvirt_constcharPtrWrap(base_cpu); VIR_FREE(base_cpu); - if (pybase_cpu == NULL) - return VIR_PY_NONE; - return pybase_cpu; } @@ -4624,7 +4625,7 @@ libvirt_virDomainGetJobStats(PyObject *self ATTRIBUTE_UNUSED, if (!PyArg_ParseTuple(args, (char *) "OI:virDomainGetJobStats", &pyobj_domain, &flags)) - goto cleanup; + return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); LIBVIRT_BEGIN_ALLOW_THREADS; @@ -4645,10 +4646,7 @@ libvirt_virDomainGetJobStats(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - if (dict) - return dict; - else - return VIR_PY_NONE; + return dict; } #endif /* LIBVIR_CHECK_VERSION(1, 0, 3) */ @@ -4906,7 +4904,7 @@ libvirt_virDomainInterfaceAddresses(PyObject *self ATTRIBUTE_UNUSED, if (!PyArg_ParseTuple(args, (char *) "Oii:virDomainInterfaceAddresses", &pyobj_domain, &source, &flags)) - goto error; + return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); @@ -5142,10 +5140,8 @@ libvirt_virConnectDomainEventRegister(ATTRIBUTE_UNUSED PyObject *self, int ret = 0; if (!PyArg_ParseTuple(args, (char *) "OO:virConnectDomainEventRegister", - &pyobj_conn, &pyobj_conn_inst)) { - DEBUG("%s failed parsing tuple\n", __FUNCTION__); - return VIR_PY_INT_FAIL; - } + &pyobj_conn, &pyobj_conn_inst)) + return NULL; DEBUG("libvirt_virConnectDomainEventRegister(%p %p) called\n", pyobj_conn, pyobj_conn_inst); @@ -5490,7 +5486,7 @@ libvirt_virEventRegisterImpl(PyObject * self ATTRIBUTE_UNUSED, !PyCallable_Check(addTimeoutObj) || !PyCallable_Check(updateTimeoutObj) || !PyCallable_Check(removeTimeoutObj)) - return VIR_PY_INT_FAIL; + return NULL; /* Get argument string representations (for error reporting) */ addHandleName = py_str(addHandleObj); @@ -5539,7 +5535,7 @@ libvirt_virEventInvokeHandleCallback(PyObject *self ATTRIBUTE_UNUSED, if (!PyArg_ParseTuple(args, (char *) "iiiOO:virEventInvokeHandleCallback", &watch, &fd, &event, &py_f, &py_opaque)) - return VIR_PY_INT_FAIL; + return NULL; cb = (virEventHandleCallback) PyvirEventHandleCallback_Get(py_f); opaque = (void *) PyvirVoidPtr_Get(py_opaque); @@ -5565,7 +5561,7 @@ libvirt_virEventInvokeTimeoutCallback(PyObject *self ATTRIBUTE_UNUSED, if (!PyArg_ParseTuple(args, (char *) "iOO:virEventInvokeTimeoutCallback", &timer, &py_f, &py_opaque)) - return VIR_PY_INT_FAIL; + return NULL; cb = (virEventTimeoutCallback) PyvirEventTimeoutCallback_Get(py_f); opaque = (void *) PyvirVoidPtr_Get(py_opaque); @@ -5628,10 +5624,8 @@ libvirt_virEventAddHandle(PyObject *self ATTRIBUTE_UNUSED, int ret; if (!PyArg_ParseTuple(args, (char *) "iiO:virEventAddHandle", - &fd, &events, &pyobj_cbData)) { - DEBUG("%s failed to parse tuple\n", __FUNCTION__); - return VIR_PY_INT_FAIL; - } + &fd, &events, &pyobj_cbData)) + return NULL; Py_INCREF(pyobj_cbData); @@ -5694,10 +5688,8 @@ libvirt_virEventAddTimeout(PyObject *self ATTRIBUTE_UNUSED, int ret; if (!PyArg_ParseTuple(args, (char *) "iO:virEventAddTimeout", - &timeout, &pyobj_cbData)) { - DEBUG("%s failed to parse tuple\n", __FUNCTION__); - return VIR_PY_INT_FAIL; - } + &timeout, &pyobj_cbData)) + return NULL; Py_INCREF(pyobj_cbData); @@ -6739,10 +6731,8 @@ libvirt_virConnectDomainEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, if (!PyArg_ParseTuple(args, (char *) "OOiO:virConnectDomainEventRegisterAny", - &pyobj_conn, &pyobj_dom, &eventID, &pyobj_cbData)) { - DEBUG("%s failed parsing tuple\n", __FUNCTION__); - return VIR_PY_INT_FAIL; - } + &pyobj_conn, &pyobj_dom, &eventID, &pyobj_cbData)) + return NULL; DEBUG("libvirt_virConnectDomainEventRegister(%p %p %d %p) called\n", pyobj_conn, pyobj_dom, eventID, pyobj_cbData); @@ -6956,10 +6946,8 @@ libvirt_virConnectNetworkEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, if (!PyArg_ParseTuple(args, (char *) "OOiO:virConnectNetworkEventRegisterAny", - &pyobj_conn, &pyobj_net, &eventID, &pyobj_cbData)) { - DEBUG("%s failed parsing tuple\n", __FUNCTION__); - return VIR_PY_INT_FAIL; - } + &pyobj_conn, &pyobj_net, &eventID, &pyobj_cbData)) + return NULL; DEBUG("libvirt_virConnectNetworkEventRegister(%p %p %d %p) called\n", pyobj_conn, pyobj_net, eventID, pyobj_cbData); @@ -7075,10 +7063,8 @@ libvirt_virConnectRegisterCloseCallback(PyObject * self ATTRIBUTE_UNUSED, int ret = 0; if (!PyArg_ParseTuple(args, (char *) "OO:virConnectRegisterCloseCallback", - &pyobj_conn, &pyobj_cbData)) { - DEBUG("%s failed parsing tuple\n", __FUNCTION__); - return VIR_PY_INT_FAIL; - } + &pyobj_conn, &pyobj_cbData)) + return NULL; DEBUG("libvirt_virConnectRegisterCloseCallback(%p %p) called\n", pyobj_conn, pyobj_cbData); @@ -7187,10 +7173,8 @@ libvirt_virStreamEventAddCallback(PyObject *self ATTRIBUTE_UNUSED, int events; if (!PyArg_ParseTuple(args, (char *) "OiO:virStreamEventAddCallback", - &pyobj_stream, &events, &pyobj_cbData)) { - DEBUG("%s failed to parse tuple\n", __FUNCTION__); - return VIR_PY_INT_FAIL; - } + &pyobj_stream, &events, &pyobj_cbData)) + return NULL; DEBUG("libvirt_virStreamEventAddCallback(%p, %d, %p) called\n", pyobj_stream, events, pyobj_cbData); @@ -7224,8 +7208,7 @@ libvirt_virStreamRecv(PyObject *self ATTRIBUTE_UNUSED, if (!PyArg_ParseTuple(args, (char *) "Oi:virStreamRecv", &pyobj_stream, &nbytes)) { - DEBUG("%s failed to parse tuple\n", __FUNCTION__); - return VIR_PY_NONE; + return NULL; } stream = PyvirStream_Get(pyobj_stream); @@ -7261,10 +7244,9 @@ libvirt_virStreamSend(PyObject *self ATTRIBUTE_UNUSED, int ret; if (!PyArg_ParseTuple(args, (char *) "OO:virStreamRecv", - &pyobj_stream, &pyobj_data)) { - DEBUG("%s failed to parse tuple\n", __FUNCTION__); - return VIR_PY_INT_FAIL; - } + &pyobj_stream, &pyobj_data)) + return NULL; + stream = PyvirStream_Get(pyobj_stream); libvirt_charPtrSizeUnwrap(pyobj_data, &data, &datalen); @@ -7296,10 +7278,9 @@ libvirt_virDomainSendKey(PyObject *self ATTRIBUTE_UNUSED, if (!PyArg_ParseTuple(args, (char *)"OiiOiI:virDomainSendKey", &pyobj_domain, &codeset, &holdtime, &pyobj_list, - &nkeycodes, &flags)) { - DEBUG("%s failed to parse tuple\n", __FUNCTION__); - return VIR_PY_INT_FAIL; - } + &nkeycodes, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); if (!PyList_Check(pyobj_list)) { @@ -7340,7 +7321,7 @@ libvirt_virDomainMigrateGetCompressionCache(PyObject *self ATTRIBUTE_UNUSED, if (!PyArg_ParseTuple(args, (char *) "OI:virDomainMigrateGetCompressionCache", &pyobj_domain, &flags)) - return VIR_PY_NONE; + return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); @@ -8145,24 +8126,24 @@ libvirt_virNetworkGetDHCPLeases(PyObject *self ATTRIBUTE_UNUSED, } if (!(py_retval = PyList_New(leases_count))) - goto no_memory; + goto error; for (i = 0; i < leases_count; i++) { virNetworkDHCPLeasePtr lease = leases[i]; if ((py_lease = PyDict_New()) == NULL) - goto no_memory; + goto error; #define VIR_SET_LEASE_ITEM(NAME, VALUE_OBJ_FUNC) \ do { \ PyObject *tmp_val; \ \ if (!(tmp_val = VALUE_OBJ_FUNC)) \ - goto no_memory; \ + goto error; \ \ if (PyDict_SetItemString(py_lease, NAME, tmp_val) < 0) { \ Py_DECREF(tmp_val); \ - goto no_memory; \ + goto error; \ } \ } while (0) @@ -8179,7 +8160,7 @@ libvirt_virNetworkGetDHCPLeases(PyObject *self ATTRIBUTE_UNUSED, #undef VIR_SET_LEASE_ITEM if (PyList_SetItem(py_retval, i, py_lease) < 0) - goto no_memory; + goto error; py_lease = NULL; } @@ -8194,9 +8175,9 @@ libvirt_virNetworkGetDHCPLeases(PyObject *self ATTRIBUTE_UNUSED, return py_retval; - no_memory: + error: Py_XDECREF(py_retval); - py_retval = PyErr_NoMemory(); + py_retval = NULL; goto cleanup; } @@ -8283,8 +8264,7 @@ libvirt_virConnectGetAllDomainStats(PyObject *self ATTRIBUTE_UNUSED, if (nrecords < 0) return VIR_PY_NONE; - if (!(py_retval = convertDomainStatsRecord(records, nrecords))) - py_retval = VIR_PY_NONE; + py_retval = convertDomainStatsRecord(records, nrecords); virDomainStatsRecordListFree(records); @@ -8330,8 +8310,7 @@ libvirt_virDomainListGetStats(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; } - if (!(py_retval = convertDomainStatsRecord(records, nrecords))) - py_retval = VIR_PY_NONE; + py_retval = convertDomainStatsRecord(records, nrecords); cleanup: virDomainStatsRecordListFree(records); @@ -8358,11 +8337,11 @@ libvirt_virDomainBlockCopy(PyObject *self ATTRIBUTE_UNUSED, if (!PyArg_ParseTuple(args, (char *) "Ozz|OI:virDomainBlockCopy", &pyobj_dom, &disk, &destxml, &pyobj_dict, &flags)) - return VIR_PY_INT_FAIL; + return NULL; if (PyDict_Check(pyobj_dict)) { if (virPyDictToTypedParams(pyobj_dict, &params, &nparams, NULL, 0) < 0) - return VIR_PY_INT_FAIL; + return NULL; } dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom); @@ -8505,7 +8484,7 @@ libvirt_virDomainGetFSInfo(PyObject *self ATTRIBUTE_UNUSED, virDomainFSInfoFree(fsinfo[i]); VIR_FREE(fsinfo); Py_XDECREF(py_retval); - return VIR_PY_NONE; + return NULL; } #endif /* LIBVIR_CHECK_VERSION(1, 2, 11) */ diff --git a/libvirt-qemu-override.c b/libvirt-qemu-override.c index 46d513d..f2e876a 100644 --- a/libvirt-qemu-override.c +++ b/libvirt-qemu-override.c @@ -271,10 +271,8 @@ libvirt_qemu_virConnectDomainQemuMonitorEventRegister(PyObject *self ATTRIBUTE_U unsigned int flags; if (!PyArg_ParseTuple(args, (char *) "OOzOI", &pyobj_conn, &pyobj_dom, - &event, &pyobj_cbData, &flags)) { - DEBUG("%s failed parsing tuple\n", __FUNCTION__); - return VIR_PY_INT_FAIL; - } + &event, &pyobj_cbData, &flags)) + return NULL; DEBUG("libvirt_qemu_virConnectDomainQemuMonitorEventRegister(%p %p %s %p %x) called\n", pyobj_conn, pyobj_dom, NULLSTR(event), pyobj_cbData, flags); -- 2.5.3

This is a recommended work-flow for allocation failures and we should follow it. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- libvirt-override.c | 53 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index d137185..d2279de 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -2047,7 +2047,7 @@ libvirt_virConnectOpenAuth(PyObject *self ATTRIBUTE_UNUSED, if (auth.ncredtype) { size_t i; if (VIR_ALLOC_N(auth.credtype, auth.ncredtype) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); for (i = 0; i < auth.ncredtype; i++) { PyObject *val; val = PyList_GetItem(pycredtype, i); @@ -2232,7 +2232,7 @@ libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED, if (c_retval) { if (VIR_ALLOC_N(ids, c_retval) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListDomains(conn, ids, c_retval); @@ -2328,7 +2328,7 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED, if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListDefinedDomains(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; @@ -2950,7 +2950,7 @@ libvirt_virConnectListNetworks(PyObject *self ATTRIBUTE_UNUSED, if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListNetworks(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; @@ -2998,7 +2998,7 @@ libvirt_virConnectListDefinedNetworks(PyObject *self ATTRIBUTE_UNUSED, if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListDefinedNetworks(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; @@ -3223,7 +3223,7 @@ libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); if (VIR_ALLOC_N(freeMems, maxCells) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetCellsFreeMemory(conn, freeMems, startCell, maxCells); @@ -3398,7 +3398,7 @@ libvirt_virConnectListStoragePools(PyObject *self ATTRIBUTE_UNUSED, if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListStoragePools(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; @@ -3453,7 +3453,7 @@ libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED, if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListDefinedStoragePools(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; @@ -3556,7 +3556,8 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED, if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virStoragePoolListVolumes(pool, names, c_retval); LIBVIRT_END_ALLOW_THREADS; @@ -3836,7 +3837,8 @@ libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED, if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeListDevices(conn, cap, names, c_retval, flags); LIBVIRT_END_ALLOW_THREADS; @@ -3930,7 +3932,7 @@ libvirt_virNodeDeviceListCaps(PyObject *self ATTRIBUTE_UNUSED, if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeDeviceListCaps(dev, names, c_retval); LIBVIRT_END_ALLOW_THREADS; @@ -4057,7 +4059,7 @@ libvirt_virConnectListSecrets(PyObject *self ATTRIBUTE_UNUSED, if (c_retval) { if (VIR_ALLOC_N(uuids, c_retval) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListSecrets(conn, uuids, c_retval); LIBVIRT_END_ALLOW_THREADS; @@ -4290,7 +4292,8 @@ libvirt_virConnectListNWFilters(PyObject *self ATTRIBUTE_UNUSED, if (c_retval) { if (VIR_ALLOC_N(uuids, c_retval) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListNWFilters(conn, uuids, c_retval); LIBVIRT_END_ALLOW_THREADS; @@ -4386,7 +4389,8 @@ libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED, if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListInterfaces(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; @@ -4442,7 +4446,8 @@ libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED, if (c_retval) { if (VIR_ALLOC_N(names, c_retval) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListDefinedInterfaces(conn, names, c_retval); LIBVIRT_END_ALLOW_THREADS; @@ -4544,7 +4549,7 @@ libvirt_virConnectBaselineCPU(PyObject *self ATTRIBUTE_UNUSED, if (PyList_Check(list)) { ncpus = PyList_Size(list); if (VIR_ALLOC_N(xmlcpus, ncpus) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); for (i = 0; i < ncpus; i++) { if (libvirt_charPtrUnwrap(PyList_GetItem(list, i), @@ -4862,7 +4867,7 @@ libvirt_virDomainGetDiskErrors(PyObject *self ATTRIBUTE_UNUSED, if (ndisks) { if (VIR_ALLOC_N(disks, ndisks) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; count = virDomainGetDiskErrors(domain, disks, ndisks, 0); @@ -7218,7 +7223,7 @@ libvirt_virStreamRecv(PyObject *self ATTRIBUTE_UNUSED, stream = PyvirStream_Get(pyobj_stream); if (VIR_ALLOC_N(buf, nbytes+1 > 0 ? nbytes+1 : 1) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; ret = virStreamRecv(stream, buf, nbytes); @@ -7453,7 +7458,7 @@ libvirt_virDomainBlockPeek(PyObject *self ATTRIBUTE_UNUSED, domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); if (VIR_ALLOC_N(buf, size) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainBlockPeek(domain, disk, offset, size, buf, flags); @@ -7491,7 +7496,7 @@ libvirt_virDomainMemoryPeek(PyObject *self ATTRIBUTE_UNUSED, domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); if (VIR_ALLOC_N(buf, size) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainMemoryPeek(domain, start, size, buf, flags); @@ -8034,8 +8039,12 @@ libvirt_virNodeGetFreePages(PyObject *self ATTRIBUTE_UNUSED, pyobj_pagesize_size = PyList_Size(pyobj_pagesize); if (VIR_ALLOC_N(pages, pyobj_pagesize_size) < 0 || - VIR_ALLOC_N(counts, pyobj_pagesize_size * cellCount) < 0 || - !(pyobj_counts = PyDict_New())) + VIR_ALLOC_N(counts, pyobj_pagesize_size * cellCount) < 0) { + PyErr_NoMemory(); + goto cleanup; + } + + if (!(pyobj_counts = PyDict_New())) goto cleanup; for (i = 0; i < pyobj_pagesize_size; i++) { -- 2.5.3

in the subject "instead of Py_None" and perhaps a few more details in the commit message regarding what's being done and why On 09/24/2015 10:01 AM, Pavel Hrdina wrote: I'm curious as to why it was done before and why it's OK to remove it. The others mostly make sense - this functions usage is, well, odd John

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- libvirt-override.c | 69 ++++++++++++++++++------------------------------------ 1 file changed, 23 insertions(+), 46 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 4d0fb92..0df6844 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -405,14 +405,11 @@ libvirt_virDomainMemoryStats(PyObject *self ATTRIBUTE_UNUSED, val = libvirt_ulonglongWrap(stats[i].val); if (!key || !val || PyDict_SetItem(info, key, val) < 0) { - Py_DECREF(info); - info = NULL; + Py_CLEAR(info); goto cleanup; } - Py_DECREF(key); - Py_DECREF(val); - key = NULL; - val = NULL; + Py_CLEAR(key); + Py_CLEAR(val); } cleanup: @@ -2174,8 +2171,7 @@ libvirt_virConnectGetCPUModelNames(PyObject *self ATTRIBUTE_UNUSED, return rv; error: - Py_XDECREF(rv); - rv = NULL; + Py_CLEAR(rv); goto done; } #endif /* LIBVIR_CHECK_VERSION(1, 1, 3) */ @@ -2283,8 +2279,7 @@ libvirt_virConnectListAllDomains(PyObject *self ATTRIBUTE_UNUSED, if (!(tmp = libvirt_virDomainPtrWrap(doms[i])) || PyList_SetItem(py_retval, i, tmp) < 0) { Py_XDECREF(tmp); - Py_DECREF(py_retval); - py_retval = NULL; + Py_CLEAR(py_retval); goto cleanup; } /* python steals the pointer */ @@ -2390,8 +2385,7 @@ libvirt_virDomainSnapshotListNames(PyObject *self ATTRIBUTE_UNUSED, if ((pyobj_snap = libvirt_constcharPtrWrap(names[i])) == NULL || PyList_SetItem(py_retval, i, pyobj_snap) < 0) { Py_XDECREF(pyobj_snap); - Py_DECREF(py_retval); - py_retval = NULL; + Py_CLEAR(py_retval); goto cleanup; } VIR_FREE(names[i]); @@ -2436,8 +2430,7 @@ libvirt_virDomainListAllSnapshots(PyObject *self ATTRIBUTE_UNUSED, if ((pyobj_snap = libvirt_virDomainSnapshotPtrWrap(snaps[i])) == NULL || PyList_SetItem(py_retval, i, pyobj_snap) < 0) { Py_XDECREF(pyobj_snap); - Py_DECREF(py_retval); - py_retval = NULL; + Py_CLEAR(py_retval); goto cleanup; } snaps[i] = NULL; @@ -2493,8 +2486,7 @@ libvirt_virDomainSnapshotListChildrenNames(PyObject *self ATTRIBUTE_UNUSED, if ((pyobj_snap = libvirt_constcharPtrWrap(names[i])) == NULL || PyList_SetItem(py_retval, i, pyobj_snap) < 0) { Py_XDECREF(pyobj_snap); - Py_DECREF(py_retval); - py_retval = NULL; + Py_CLEAR(py_retval); goto cleanup; } VIR_FREE(names[i]); @@ -2539,8 +2531,7 @@ libvirt_virDomainSnapshotListAllChildren(PyObject *self ATTRIBUTE_UNUSED, if ((pyobj_snap = libvirt_virDomainSnapshotPtrWrap(snaps[i])) == NULL || PyList_SetItem(py_retval, i, pyobj_snap) < 0) { Py_XDECREF(pyobj_snap); - Py_DECREF(py_retval); - py_retval = NULL; + Py_CLEAR(py_retval); goto cleanup; } snaps[i] = NULL; @@ -2834,8 +2825,7 @@ libvirt_virDomainGetSecurityLabelList(PyObject *self ATTRIBUTE_UNUSED, return py_retval; error: - Py_XDECREF(py_retval); - py_retval = NULL; + Py_CLEAR(py_retval); goto cleanup; } #endif /* LIBVIR_CHECK_VERSION(0, 10, 0) */ @@ -3049,8 +3039,7 @@ libvirt_virConnectListAllNetworks(PyObject *self ATTRIBUTE_UNUSED, if (!(tmp = libvirt_virNetworkPtrWrap(nets[i])) || PyList_SetItem(py_retval, i, tmp) < 0) { Py_XDECREF(tmp); - Py_DECREF(py_retval); - py_retval = NULL; + Py_CLEAR(py_retval); goto cleanup; } /* python steals the pointer */ @@ -3286,8 +3275,7 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, val = libvirt_ulonglongWrap(stats[i].value); if (!key || !val || PyDict_SetItem(ret, key, val) < 0) { - Py_DECREF(ret); - ret = NULL; + Py_CLEAR(ret); goto error; } @@ -3352,8 +3340,7 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, val = libvirt_ulonglongWrap(stats[i].value); if (!key || !val || PyDict_SetItem(ret, key, val) < 0) { - Py_DECREF(ret); - ret = NULL; + Py_CLEAR(ret); goto error; } @@ -3512,8 +3499,7 @@ libvirt_virConnectListAllStoragePools(PyObject *self ATTRIBUTE_UNUSED, if (!(tmp = libvirt_virStoragePoolPtrWrap(pools[i])) || PyList_SetItem(py_retval, i, tmp) < 0) { Py_XDECREF(tmp); - Py_DECREF(py_retval); - py_retval = NULL; + Py_CLEAR(py_retval); goto cleanup; } /* python steals the pointer */ @@ -3617,8 +3603,7 @@ libvirt_virStoragePoolListAllVolumes(PyObject *self ATTRIBUTE_UNUSED, if (!(tmp = libvirt_virStorageVolPtrWrap(vols[i])) || PyList_SetItem(py_retval, i, tmp) < 0) { Py_XDECREF(tmp); - Py_DECREF(py_retval); - py_retval = NULL; + Py_CLEAR(py_retval); goto cleanup; } /* python steals the pointer */ @@ -3889,8 +3874,7 @@ libvirt_virConnectListAllNodeDevices(PyObject *self ATTRIBUTE_UNUSED, if (!(tmp = libvirt_virNodeDevicePtrWrap(devices[i])) || PyList_SetItem(py_retval, i, tmp) < 0) { Py_XDECREF(tmp); - Py_DECREF(py_retval); - py_retval = NULL; + Py_CLEAR(py_retval); goto cleanup; } /* python steals the pointer */ @@ -4110,8 +4094,7 @@ libvirt_virConnectListAllSecrets(PyObject *self ATTRIBUTE_UNUSED, if (!(tmp = libvirt_virSecretPtrWrap(secrets[i])) || PyList_SetItem(py_retval, i, tmp) < 0) { Py_XDECREF(tmp); - Py_DECREF(py_retval); - py_retval = NULL; + Py_CLEAR(py_retval); goto cleanup; } /* python steals the pointer */ @@ -4344,8 +4327,7 @@ libvirt_virConnectListAllNWFilters(PyObject *self ATTRIBUTE_UNUSED, if (!(tmp = libvirt_virNWFilterPtrWrap(filters[i])) || PyList_SetItem(py_retval, i, tmp) < 0) { Py_XDECREF(tmp); - Py_DECREF(py_retval); - py_retval = NULL; + Py_CLEAR(py_retval); goto cleanup; } /* python steals the pointer */ @@ -4507,8 +4489,7 @@ libvirt_virConnectListAllInterfaces(PyObject *self ATTRIBUTE_UNUSED, if (!(tmp = libvirt_virInterfacePtrWrap(ifaces[i])) || PyList_SetItem(py_retval, i, tmp) < 0) { Py_XDECREF(tmp); - Py_DECREF(py_retval); - py_retval = NULL; + Py_CLEAR(py_retval); goto cleanup; } /* python steals the pointer */ @@ -4644,8 +4625,7 @@ libvirt_virDomainGetJobStats(PyObject *self ATTRIBUTE_UNUSED, if (PyDict_SetItem(dict, libvirt_constcharPtrWrap("type"), libvirt_intWrap(type)) < 0) { - Py_DECREF(dict); - dict = NULL; + Py_CLEAR(dict); goto cleanup; } @@ -5012,8 +4992,7 @@ libvirt_virDomainInterfaceAddresses(PyObject *self ATTRIBUTE_UNUSED, return py_retval; error: - Py_XDECREF(py_retval); - py_retval = NULL; + Py_CLEAR(py_retval); goto cleanup; } #endif /* LIBVIR_CHECK_VERSION(1, 2, 14) */ @@ -7694,12 +7673,11 @@ libvirt_virNodeGetCPUMap(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(cpumap); return ret; error: - Py_XDECREF(ret); + Py_CLEAR(ret); Py_XDECREF(pycpumap); Py_XDECREF(pyused); Py_XDECREF(pycpunum); Py_XDECREF(pyonline); - ret = NULL; goto cleanup; } #endif /* LIBVIR_CHECK_VERSION(1, 0, 0) */ @@ -8187,8 +8165,7 @@ libvirt_virNetworkGetDHCPLeases(PyObject *self ATTRIBUTE_UNUSED, return py_retval; error: - Py_XDECREF(py_retval); - py_retval = NULL; + Py_CLEAR(py_retval); goto cleanup; } -- 2.5.3

$subj: Must check return value for all Py*_New functions On 09/24/2015 10:01 AM, Pavel Hrdina wrote: General comment... 4 patches ago we were returning PyErr_NoMemory on allocation failures - that would seem to be the case for these too, right? Or is this "just different" enough that it would be necessary? if (( nit: could all be one line (any typos are mine ;-)) if ((pycreditem = PyList_New(5)) == NULL) Nothing jumped out at me in the rest - although I admit my eyes & brain are starting to tire ;-) John

This change makes it easier to free allocated object especially for python objects. We can benefit from the fact, that if you call Py_DECREF on eny python object it will also remove reference for all assigned object to the root object. For example, calling Py_DECREF on dict will also remove reference recursively on all elements in that dictionary. Our job is then just call Py_DECREF on the root element and don't care about anything else. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- libvirt-override.c | 189 ++++++++++++++++++++++++----------------------------- 1 file changed, 85 insertions(+), 104 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 92c31b8..63a469b 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -1238,9 +1238,16 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; if ((pycpuinfo = PyList_New(dominfo.nrVirtCpu)) == NULL) goto cleanup; + + if (PyTuple_SetItem(pyretval, 0, pycpuinfo) < 0) + goto cleanup; + if ((pycpumap = PyList_New(dominfo.nrVirtCpu)) == NULL) goto cleanup; + if (PyTuple_SetItem(pyretval, 1, pycpumap) < 0) + goto cleanup; + for (i = 0; i < dominfo.nrVirtCpu; i++) { PyObject *info = PyTuple_New(4); PyObject *item = NULL; @@ -1248,54 +1255,42 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, if (info == NULL) goto cleanup; + if (PyList_SetItem(pycpuinfo, i, info) < 0) + goto cleanup; + if ((item = libvirt_intWrap((long)cpuinfo[i].number)) == NULL || PyTuple_SetItem(info, 0, item) < 0) - goto itemError; + goto cleanup; if ((item = libvirt_intWrap((long)cpuinfo[i].state)) == NULL || PyTuple_SetItem(info, 1, item) < 0) - goto itemError; + goto cleanup; if ((item = libvirt_ulonglongWrap(cpuinfo[i].cpuTime)) == NULL || PyTuple_SetItem(info, 2, item) < 0) - goto itemError; + goto cleanup; if ((item = libvirt_intWrap((long)cpuinfo[i].cpu)) == NULL || PyTuple_SetItem(info, 3, item) < 0) - goto itemError; - - if (PyList_SetItem(pycpuinfo, i, info) < 0) - goto itemError; - - continue; - itemError: - Py_DECREF(info); - Py_XDECREF(item); - goto cleanup; + goto cleanup; } for (i = 0; i < dominfo.nrVirtCpu; i++) { PyObject *info = PyTuple_New(cpunum); size_t j; if (info == NULL) goto cleanup; + + if (PyList_SetItem(pycpumap, i, info) < 0) + goto cleanup; + for (j = 0; j < cpunum; j++) { PyObject *item = NULL; if ((item = PyBool_FromLong(VIR_CPU_USABLE(cpumap, cpumaplen, i, j))) == NULL || - PyTuple_SetItem(info, j, item) < 0) { - Py_DECREF(info); - Py_XDECREF(item); + PyTuple_SetItem(info, j, item) < 0) goto cleanup; - } - } - if (PyList_SetItem(pycpumap, i, info) < 0) { - Py_DECREF(info); - goto cleanup; } } - if (PyTuple_SetItem(pyretval, 0, pycpuinfo) < 0 || - PyTuple_SetItem(pyretval, 1, pycpumap) < 0) - goto cleanup; VIR_FREE(cpuinfo); VIR_FREE(cpumap); @@ -1306,8 +1301,6 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(cpuinfo); VIR_FREE(cpumap); Py_XDECREF(pyretval); - Py_XDECREF(pycpuinfo); - Py_XDECREF(pycpumap); return error; } @@ -1489,12 +1482,13 @@ libvirt_virDomainGetVcpuPinInfo(PyObject *self ATTRIBUTE_UNUSED, if (mapinfo == NULL) goto cleanup; + PyList_SetItem(pycpumaps, vcpu, mapinfo); + for (pcpu = 0; pcpu < cpunum; pcpu++) { PyTuple_SetItem(mapinfo, pcpu, PyBool_FromLong(VIR_CPU_USABLE(cpumaps, cpumaplen, vcpu, pcpu))); } - PyList_SetItem(pycpumaps, vcpu, mapinfo); } VIR_FREE(cpumaps); @@ -1877,12 +1871,14 @@ libvirt_virErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, if ((list = PyTuple_New(2)) == NULL) goto cleanup; + Py_XINCREF(libvirt_virPythonErrorFuncCtxt); + PyTuple_SetItem(list, 0, libvirt_virPythonErrorFuncCtxt); + if ((info = PyTuple_New(9)) == NULL) goto cleanup; - PyTuple_SetItem(list, 0, libvirt_virPythonErrorFuncCtxt); PyTuple_SetItem(list, 1, info); - Py_XINCREF(libvirt_virPythonErrorFuncCtxt); + PyTuple_SetItem(info, 0, libvirt_intWrap((long) err->code)); PyTuple_SetItem(info, 1, libvirt_intWrap((long) err->domain)); PyTuple_SetItem(info, 2, libvirt_constcharPtrWrap(err->message)); @@ -1894,14 +1890,11 @@ libvirt_virErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, PyTuple_SetItem(info, 8, libvirt_intWrap((long) err->int2)); /* TODO pass conn and dom if available */ result = PyEval_CallObject(libvirt_virPythonErrorFuncHandler, list); - Py_XDECREF(list); Py_XDECREF(result); } cleanup: Py_XDECREF(list); - Py_XDECREF(info); - LIBVIRT_RELEASE_THREAD_STATE; } @@ -1966,6 +1959,8 @@ virConnectCredCallbackWrapper(virConnectCredentialPtr cred, if ((pycred = PyTuple_New(ncred)) == NULL) goto cleanup; + PyTuple_SetItem(list, 0, pycred); + for (i = 0; i < ncred; i++) { PyObject *pycreditem = PyList_New(5); if (pycreditem == NULL) @@ -1989,7 +1984,6 @@ virConnectCredCallbackWrapper(virConnectCredentialPtr cred, PyList_SetItem(pycreditem, 4, VIR_PY_NONE); } - PyTuple_SetItem(list, 0, pycred); Py_XINCREF(pycbdata); PyTuple_SetItem(list, 1, pycbdata); @@ -4720,19 +4714,18 @@ libvirt_virDomainGetBlockJobInfo(PyObject *self ATTRIBUTE_UNUSED, return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); - if ((dict = PyDict_New()) == NULL) - return NULL; - LIBVIRT_BEGIN_ALLOW_THREADS; c_ret = virDomainGetBlockJobInfo(domain, path, &info, flags); LIBVIRT_END_ALLOW_THREADS; - if (c_ret == 0) { - return dict; - } else if (c_ret < 0) { - Py_DECREF(dict); + if (c_ret < 0) return VIR_PY_NONE; - } + + if ((dict = PyDict_New()) == NULL) + return NULL; + + if (c_ret == 0) + return dict; if ((type = libvirt_intWrap(info.type)) == NULL || PyDict_SetItemString(dict, "type", type) < 0) @@ -5270,16 +5263,22 @@ libvirt_virEventAddHandleFunc(int fd, virFreeCallback ff) { PyObject *result; - PyObject *python_cb; PyObject *cb_obj; PyObject *ff_obj; PyObject *opaque_obj; + PyObject *python_cb = NULL; PyObject *cb_args = NULL; PyObject *pyobj_args = NULL; int retval = -1; LIBVIRT_ENSURE_THREAD_STATE; + if ((pyobj_args = PyTuple_New(4)) == NULL) + goto cleanup; + + PyTuple_SetItem(pyobj_args, 0, libvirt_intWrap(fd)); + PyTuple_SetItem(pyobj_args, 1, libvirt_intWrap(event)); + /* Lookup the python callback */ python_cb = libvirt_lookupPythonFunc("_eventInvokeHandleCallback"); if (!python_cb) { @@ -5287,26 +5286,21 @@ libvirt_virEventAddHandleFunc(int fd, } Py_INCREF(python_cb); - /* create tuple for cb */ - cb_obj = libvirt_virEventHandleCallbackWrap(cb); - ff_obj = libvirt_virFreeCallbackWrap(ff); - opaque_obj = libvirt_virVoidPtrWrap(opaque); + PyTuple_SetItem(pyobj_args, 2, python_cb); if ((cb_args = PyTuple_New(3)) == NULL) goto cleanup; + PyTuple_SetItem(pyobj_args, 3, cb_args); + + /* create tuple for cb */ + cb_obj = libvirt_virEventHandleCallbackWrap(cb); + ff_obj = libvirt_virFreeCallbackWrap(ff); + opaque_obj = libvirt_virVoidPtrWrap(opaque); PyTuple_SetItem(cb_args, 0, cb_obj); PyTuple_SetItem(cb_args, 1, opaque_obj); PyTuple_SetItem(cb_args, 2, ff_obj); - if ((pyobj_args = PyTuple_New(4)) == NULL) - goto cleanup; - - PyTuple_SetItem(pyobj_args, 0, libvirt_intWrap(fd)); - PyTuple_SetItem(pyobj_args, 1, libvirt_intWrap(event)); - PyTuple_SetItem(pyobj_args, 2, python_cb); - PyTuple_SetItem(pyobj_args, 3, cb_args); - result = PyEval_CallObject(addHandleObj, pyobj_args); if (!result) { PyErr_Print(); @@ -5415,33 +5409,32 @@ libvirt_virEventAddTimeoutFunc(int timeout, LIBVIRT_ENSURE_THREAD_STATE; + if ((pyobj_args = PyTuple_New(3)) == NULL) + goto cleanup; + + PyTuple_SetItem(pyobj_args, 0, libvirt_intWrap(timeout)); + /* Lookup the python callback */ python_cb = libvirt_lookupPythonFunc("_eventInvokeTimeoutCallback"); if (!python_cb) { goto cleanup; } Py_INCREF(python_cb); + PyTuple_SetItem(pyobj_args, 1, python_cb); + + if ((cb_args = PyTuple_New(3)) == NULL) + goto cleanup; + + PyTuple_SetItem(pyobj_args, 2, cb_args); /* create tuple for cb */ cb_obj = libvirt_virEventTimeoutCallbackWrap(cb); ff_obj = libvirt_virFreeCallbackWrap(ff); opaque_obj = libvirt_virVoidPtrWrap(opaque); - - if ((cb_args = PyTuple_New(3)) == NULL) - goto cleanup; - PyTuple_SetItem(cb_args, 0, cb_obj); PyTuple_SetItem(cb_args, 1, opaque_obj); PyTuple_SetItem(cb_args, 2, ff_obj); - pyobj_args = PyTuple_New(3); - if ((pyobj_args = PyTuple_New(3)) == NULL) - goto cleanup; - - PyTuple_SetItem(pyobj_args, 0, libvirt_intWrap(timeout)); - PyTuple_SetItem(pyobj_args, 1, python_cb); - PyTuple_SetItem(pyobj_args, 2, cb_args); - result = PyEval_CallObject(addTimeoutObj, pyobj_args); if (!result) { PyErr_Print(); @@ -6171,12 +6164,13 @@ libvirt_virConnectDomainEventGraphicsCallback(virConnectPtr conn ATTRIBUTE_UNUSE if (pair == NULL) goto cleanup; + PyList_SetItem(pyobj_subject, i, pair); + PyTuple_SetItem(pair, 0, libvirt_constcharPtrWrap(subject->identities[i].type)); PyTuple_SetItem(pair, 1, libvirt_constcharPtrWrap(subject->identities[i].name)); - PyList_SetItem(pyobj_subject, i, pair); } /* Call the Callback Dispatcher */ @@ -7751,6 +7745,9 @@ libvirt_virNodeGetCPUMap(PyObject *self ATTRIBUTE_UNUSED, if ((pycpumap = PyList_New(i_retval)) == NULL) goto error; + if (PyTuple_SetItem(ret, 1, pycpumap) < 0) + goto error; + for (i = 0; i < i_retval; i++) { if ((pyused = PyBool_FromLong(VIR_CPU_USED(cpumap, i))) == NULL) goto error; @@ -7758,9 +7755,6 @@ libvirt_virNodeGetCPUMap(PyObject *self ATTRIBUTE_UNUSED, goto error; } - if (PyTuple_SetItem(ret, 1, pycpumap) < 0) - goto error; - /* 2: number of online CPUs */ if ((pyonline = libvirt_uintWrap(online)) == NULL || PyTuple_SetItem(ret, 2, pyonline) < 0) @@ -7769,12 +7763,9 @@ libvirt_virNodeGetCPUMap(PyObject *self ATTRIBUTE_UNUSED, cleanup: VIR_FREE(cpumap); return ret; + error: Py_CLEAR(ret); - Py_XDECREF(pycpumap); - Py_XDECREF(pyused); - Py_XDECREF(pycpunum); - Py_XDECREF(pyonline); goto cleanup; } #endif /* LIBVIR_CHECK_VERSION(1, 0, 0) */ @@ -8149,6 +8140,12 @@ libvirt_virNodeGetFreePages(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; } + if (PyDict_SetItem(pyobj_counts, node, per_node) < 0) { + Py_XDECREF(per_node); + Py_XDECREF(node); + goto cleanup; + } + for (j = 0; j < pyobj_pagesize_size; j ++) { PyObject *page = NULL; PyObject *count = NULL; @@ -8164,12 +8161,6 @@ libvirt_virNodeGetFreePages(PyObject *self ATTRIBUTE_UNUSED, } } i += pyobj_pagesize_size; - - if (PyDict_SetItem(pyobj_counts, node, per_node) < 0) { - Py_XDECREF(per_node); - Py_XDECREF(node); - goto cleanup; - } } py_retval = pyobj_counts; @@ -8220,6 +8211,9 @@ libvirt_virNetworkGetDHCPLeases(PyObject *self ATTRIBUTE_UNUSED, if ((py_lease = PyDict_New()) == NULL) goto error; + if (PyList_SetItem(py_retval, i, py_lease) < 0) + goto error; + #define VIR_SET_LEASE_ITEM(NAME, VALUE_OBJ_FUNC) \ do { \ PyObject *tmp_val; \ @@ -8244,15 +8238,9 @@ libvirt_virNetworkGetDHCPLeases(PyObject *self ATTRIBUTE_UNUSED, VIR_SET_LEASE_ITEM("iaid", libvirt_charPtrWrap(lease->iaid)); #undef VIR_SET_LEASE_ITEM - - if (PyList_SetItem(py_retval, i, py_lease) < 0) - goto error; - - py_lease = NULL; } cleanup: - Py_XDECREF(py_lease); if (leases) { for (i = 0; i < leases_count; i++) virNetworkDHCPLeaseFree(leases[i]); @@ -8287,6 +8275,9 @@ convertDomainStatsRecord(virDomainStatsRecordPtr *records, if (!(py_record = PyTuple_New(2))) goto error; + if (PyList_SetItem(py_retval, i, py_record) < 0) + goto error; + /* libvirt_virDomainPtrWrap steals the object */ virDomainRef(records[i]->dom); if (!(py_record_domain = libvirt_virDomainPtrWrap(records[i]->dom))) { @@ -8294,33 +8285,21 @@ convertDomainStatsRecord(virDomainStatsRecordPtr *records, goto error; } - if (!(py_record_stats = getPyVirTypedParameter(records[i]->params, - records[i]->nparams))) - goto error; - if (PyTuple_SetItem(py_record, 0, py_record_domain) < 0) goto error; - py_record_domain = NULL; - - if (PyTuple_SetItem(py_record, 1, py_record_stats) < 0) + if (!(py_record_stats = getPyVirTypedParameter(records[i]->params, + records[i]->nparams))) goto error; - py_record_stats = NULL; - - if (PyList_SetItem(py_retval, i, py_record) < 0) + if (PyTuple_SetItem(py_record, 1, py_record_stats) < 0) goto error; - - py_record = NULL; } return py_retval; error: Py_XDECREF(py_retval); - Py_XDECREF(py_record); - Py_XDECREF(py_record_domain); - Py_XDECREF(py_record_stats); return NULL; } @@ -8546,13 +8525,15 @@ libvirt_virDomainGetFSInfo(PyObject *self ATTRIBUTE_UNUSED, if (info == NULL) goto cleanup; PyList_SetItem(py_retval, i, info); - alias = PyList_New(0); - if (alias == NULL) - goto cleanup; PyTuple_SetItem(info, 0, libvirt_constcharPtrWrap(fs->mountpoint)); PyTuple_SetItem(info, 1, libvirt_constcharPtrWrap(fs->name)); PyTuple_SetItem(info, 2, libvirt_constcharPtrWrap(fs->fstype)); + + alias = PyList_New(0); + if (alias == NULL) + goto cleanup; + PyTuple_SetItem(info, 3, alias); for (j = 0; j < fs->ndevAlias; j++) -- 2.5.3

On Sat, Sep 26, 2015 at 09:56:03AM -0400, John Ferlan wrote: That's true, I can probably updated it during second "phase" of improving libvirt-python. I'm planning to improve the generator in order to automatically generate more APIs. The 'info' is inserted to list right after it's allocation, so it's sufficient to decref only list. Pavel [...]

This removes several code duplicates and also some unusual code structures. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- libvirt-override.c | 159 +++++++++++++++++++++++------------------------------ 1 file changed, 68 insertions(+), 91 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 8afe7d7..205f0dd 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -439,13 +439,13 @@ libvirt_virDomainGetSchedulerType(PyObject *self ATTRIBUTE_UNUSED, return VIR_PY_NONE; /* convert to a Python tuple of long objects */ - if ((info = PyTuple_New(2)) == NULL) { - VIR_FREE(c_retval); - return NULL; - } + if ((info = PyTuple_New(2)) == NULL) + goto cleanup; PyTuple_SetItem(info, 0, libvirt_constcharPtrWrap(c_retval)); PyTuple_SetItem(info, 1, libvirt_intWrap((long)nparams)); + + cleanup: VIR_FREE(c_retval); return info; } @@ -2401,7 +2401,6 @@ libvirt_virDomainSnapshotListNames(PyObject *self ATTRIBUTE_UNUSED, Py_CLEAR(py_retval); goto cleanup; } - VIR_FREE(names[i]); } cleanup: @@ -3245,8 +3244,8 @@ libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) { - VIR_FREE(freeMems); - return VIR_PY_NONE; + py_retval = VIR_PY_NONE; + goto cleanup; } if ((py_retval = PyList_New(c_retval)) == NULL) @@ -3425,24 +3424,19 @@ libvirt_virConnectListStoragePools(PyObject *self ATTRIBUTE_UNUSED, return VIR_PY_NONE; } } - py_retval = PyList_New(c_retval); - if (py_retval == NULL) { - if (names) { - for (i = 0; i < c_retval; i++) - VIR_FREE(names[i]); - VIR_FREE(names); - } - return NULL; - } + + if ((py_retval = PyList_New(c_retval)) == NULL) + goto cleanup; if (names) { - for (i = 0; i < c_retval; i++) { + for (i = 0; i < c_retval; i++) PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); - VIR_FREE(names[i]); - } - VIR_FREE(names); } + cleanup: + for (i = 0; i < c_retval; i++) + VIR_FREE(names[i]); + VIR_FREE(names); return py_retval; } @@ -3480,24 +3474,20 @@ libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED, return VIR_PY_NONE; } } - py_retval = PyList_New(c_retval); - if (py_retval == NULL) { - if (names) { - for (i = 0; i < c_retval; i++) - VIR_FREE(names[i]); - VIR_FREE(names); - } - return NULL; - } + + if ((py_retval = PyList_New(c_retval)) == NULL) + goto cleanup; if (names) { - for (i = 0; i < c_retval; i++) { + for (i = 0; i < c_retval; i++) PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); - VIR_FREE(names[i]); - } - VIR_FREE(names); } + cleanup: + for (i = 0; i < c_retval; i++) + VIR_FREE(names[i]); + VIR_FREE(names); + return py_retval; } @@ -3579,28 +3569,24 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED, c_retval = virStoragePoolListVolumes(pool, names, c_retval); LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) { - VIR_FREE(names); - return VIR_PY_NONE; + py_retval = VIR_PY_NONE; + goto cleanup; } } - py_retval = PyList_New(c_retval); - if (py_retval == NULL) { - if (names) { - for (i = 0; i < c_retval; i++) - VIR_FREE(names[i]); - VIR_FREE(names); - } - return NULL; - } + + if ((py_retval = PyList_New(c_retval)) == NULL) + goto cleanup; if (names) { - for (i = 0; i < c_retval; i++) { + for (i = 0; i < c_retval; i++) PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); - VIR_FREE(names[i]); - } - VIR_FREE(names); } + cleanup: + for (i = 0; i < c_retval; i++) + VIR_FREE(names[i]); + VIR_FREE(names); + return py_retval; } @@ -3850,9 +3836,10 @@ libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeListDevices(conn, cap, names, c_retval, flags); LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { - VIR_FREE(names); - return VIR_PY_NONE; + py_retval = VIR_PY_NONE; + goto cleanup; } } @@ -3947,8 +3934,8 @@ libvirt_virNodeDeviceListCaps(PyObject *self ATTRIBUTE_UNUSED, c_retval = virNodeDeviceListCaps(dev, names, c_retval); LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) { - VIR_FREE(names); - return VIR_PY_NONE; + py_retval = VIR_PY_NONE; + goto cleanup; } } @@ -4072,8 +4059,8 @@ libvirt_virConnectListSecrets(PyObject *self ATTRIBUTE_UNUSED, c_retval = virConnectListSecrets(conn, uuids, c_retval); LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) { - VIR_FREE(uuids); - return VIR_PY_NONE; + py_retval = VIR_PY_NONE; + goto cleanup; } } @@ -4404,24 +4391,19 @@ libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED, return VIR_PY_NONE; } } - py_retval = PyList_New(c_retval); - if (py_retval == NULL) { - if (names) { - for (i = 0; i < c_retval; i++) - VIR_FREE(names[i]); - VIR_FREE(names); - } - return NULL; - } + + if ((py_retval = PyList_New(c_retval)) == NULL) + goto cleanup; if (names) { - for (i = 0; i < c_retval; i++) { + for (i = 0; i < c_retval; i++) PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); - VIR_FREE(names[i]); - } - VIR_FREE(names); } + cleanup: + for (i = 0; i < c_retval; i++) + VIR_FREE(names[i]); + VIR_FREE(names); return py_retval; } @@ -4461,24 +4443,19 @@ libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED, return VIR_PY_NONE; } } - py_retval = PyList_New(c_retval); - if (py_retval == NULL) { - if (names) { - for (i = 0; i < c_retval; i++) - VIR_FREE(names[i]); - VIR_FREE(names); - } - return NULL; - } + + if ((py_retval = PyList_New(c_retval)) == NULL) + goto cleanup; if (names) { - for (i = 0; i < c_retval; i++) { + for (i = 0; i < c_retval; i++) PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); - VIR_FREE(names[i]); - } - VIR_FREE(names); } + cleanup: + for (i = 0; i < c_retval; i++) + VIR_FREE(names[i]); + VIR_FREE(names); return py_retval; } @@ -8459,17 +8436,19 @@ libvirt_virDomainGetFSInfo(PyObject *self ATTRIBUTE_UNUSED, /* convert to a Python list */ if ((py_retval = PyList_New(c_retval)) == NULL) - goto cleanup; + goto error; for (i = 0; i < c_retval; i++) { virDomainFSInfoPtr fs = fsinfo[i]; PyObject *info, *alias; if (fs == NULL) - goto cleanup; + goto error; + info = PyTuple_New(4); if (info == NULL) - goto cleanup; + goto error; + PyList_SetItem(py_retval, i, info); PyTuple_SetItem(info, 0, libvirt_constcharPtrWrap(fs->mountpoint)); @@ -8478,27 +8457,25 @@ libvirt_virDomainGetFSInfo(PyObject *self ATTRIBUTE_UNUSED, alias = PyList_New(0); if (alias == NULL) - goto cleanup; + goto error; PyTuple_SetItem(info, 3, alias); for (j = 0; j < fs->ndevAlias; j++) if (PyList_Append(alias, libvirt_constcharPtrWrap(fs->devAlias[j])) < 0) - goto cleanup; + goto error; } + cleanup: for (i = 0; i < c_retval; i++) virDomainFSInfoFree(fsinfo[i]); VIR_FREE(fsinfo); return py_retval; - cleanup: - for (i = 0; i < c_retval; i++) - virDomainFSInfoFree(fsinfo[i]); - VIR_FREE(fsinfo); - Py_XDECREF(py_retval); - return NULL; + error: + Py_CLEAR(py_retval); + goto cleanup; } #endif /* LIBVIR_CHECK_VERSION(1, 2, 11) */ -- 2.5.3

On Sat, Sep 26, 2015 at 10:14:37AM -0400, John Ferlan wrote: Oh, I didn't realize this, because some functions have 'int i;' and others have 'size_t i'. I've verified the 'i' declaration only in function with int and conclude it's ok to use it this way. This needs to be fixed, I'll send a v2. Pavel

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- libvirt-override.c | 304 +++++++++++++++++++++++++++-------------------------- 1 file changed, 155 insertions(+), 149 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 205f0dd..c2e9fb9 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -116,12 +116,17 @@ libvirt_virDomainBlockStats(PyObject *self ATTRIBUTE_UNUSED, if ((info = PyTuple_New(5)) == NULL) return NULL; - PyTuple_SetItem(info, 0, libvirt_longlongWrap(stats.rd_req)); - PyTuple_SetItem(info, 1, libvirt_longlongWrap(stats.rd_bytes)); - PyTuple_SetItem(info, 2, libvirt_longlongWrap(stats.wr_req)); - PyTuple_SetItem(info, 3, libvirt_longlongWrap(stats.wr_bytes)); - PyTuple_SetItem(info, 4, libvirt_longlongWrap(stats.errs)); + VIR_PY_TUPLE_SET_GOTO(info, 0, libvirt_longlongWrap(stats.rd_req), error); + VIR_PY_TUPLE_SET_GOTO(info, 1, libvirt_longlongWrap(stats.rd_bytes), error); + VIR_PY_TUPLE_SET_GOTO(info, 2, libvirt_longlongWrap(stats.wr_req), error); + VIR_PY_TUPLE_SET_GOTO(info, 3, libvirt_longlongWrap(stats.wr_bytes), error); + VIR_PY_TUPLE_SET_GOTO(info, 4, libvirt_longlongWrap(stats.errs), error); + return info; + +error: + Py_DECREF(info); + return NULL; } static PyObject * @@ -337,15 +342,20 @@ libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, if ((info = PyTuple_New(8)) == NULL) return NULL; - PyTuple_SetItem(info, 0, libvirt_longlongWrap(stats.rx_bytes)); - PyTuple_SetItem(info, 1, libvirt_longlongWrap(stats.rx_packets)); - PyTuple_SetItem(info, 2, libvirt_longlongWrap(stats.rx_errs)); - PyTuple_SetItem(info, 3, libvirt_longlongWrap(stats.rx_drop)); - PyTuple_SetItem(info, 4, libvirt_longlongWrap(stats.tx_bytes)); - PyTuple_SetItem(info, 5, libvirt_longlongWrap(stats.tx_packets)); - PyTuple_SetItem(info, 6, libvirt_longlongWrap(stats.tx_errs)); - PyTuple_SetItem(info, 7, libvirt_longlongWrap(stats.tx_drop)); + VIR_PY_TUPLE_SET_GOTO(info, 0, libvirt_longlongWrap(stats.rx_bytes), error); + VIR_PY_TUPLE_SET_GOTO(info, 1, libvirt_longlongWrap(stats.rx_packets), error); + VIR_PY_TUPLE_SET_GOTO(info, 2, libvirt_longlongWrap(stats.rx_errs), error); + VIR_PY_TUPLE_SET_GOTO(info, 3, libvirt_longlongWrap(stats.rx_drop), error); + VIR_PY_TUPLE_SET_GOTO(info, 4, libvirt_longlongWrap(stats.tx_bytes), error); + VIR_PY_TUPLE_SET_GOTO(info, 5, libvirt_longlongWrap(stats.tx_packets), error); + VIR_PY_TUPLE_SET_GOTO(info, 6, libvirt_longlongWrap(stats.tx_errs), error); + VIR_PY_TUPLE_SET_GOTO(info, 7, libvirt_longlongWrap(stats.tx_drop), error); + return info; + + error: + Py_DECREF(info); + return NULL; } static PyObject * @@ -442,12 +452,17 @@ libvirt_virDomainGetSchedulerType(PyObject *self ATTRIBUTE_UNUSED, if ((info = PyTuple_New(2)) == NULL) goto cleanup; - PyTuple_SetItem(info, 0, libvirt_constcharPtrWrap(c_retval)); - PyTuple_SetItem(info, 1, libvirt_intWrap((long)nparams)); + VIR_PY_TUPLE_SET_GOTO(info, 0, libvirt_constcharPtrWrap(c_retval), error); + VIR_PY_TUPLE_SET_GOTO(info, 1, libvirt_intWrap((long)nparams), error); cleanup: VIR_FREE(c_retval); return info; + + error: + Py_CLEAR(info); + goto cleanup; + } static PyObject * @@ -1239,18 +1254,15 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, if ((pycpuinfo = PyList_New(dominfo.nrVirtCpu)) == NULL) goto cleanup; - if (PyTuple_SetItem(pyretval, 0, pycpuinfo) < 0) - goto cleanup; + VIR_PY_TUPLE_SET_GOTO(pyretval, 0, pycpuinfo, cleanup); if ((pycpumap = PyList_New(dominfo.nrVirtCpu)) == NULL) goto cleanup; - if (PyTuple_SetItem(pyretval, 1, pycpumap) < 0) - goto cleanup; + VIR_PY_TUPLE_SET_GOTO(pyretval, 1, pycpumap, cleanup); for (i = 0; i < dominfo.nrVirtCpu; i++) { PyObject *info = PyTuple_New(4); - PyObject *item = NULL; if (info == NULL) goto cleanup; @@ -1258,21 +1270,15 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, if (PyList_SetItem(pycpuinfo, i, info) < 0) goto cleanup; - if ((item = libvirt_intWrap((long)cpuinfo[i].number)) == NULL || - PyTuple_SetItem(info, 0, item) < 0) - goto cleanup; - - if ((item = libvirt_intWrap((long)cpuinfo[i].state)) == NULL || - PyTuple_SetItem(info, 1, item) < 0) - goto cleanup; - - if ((item = libvirt_ulonglongWrap(cpuinfo[i].cpuTime)) == NULL || - PyTuple_SetItem(info, 2, item) < 0) - goto cleanup; - - if ((item = libvirt_intWrap((long)cpuinfo[i].cpu)) == NULL || - PyTuple_SetItem(info, 3, item) < 0) - goto cleanup; + VIR_PY_TUPLE_SET_GOTO(info, 0, libvirt_intWrap((long)cpuinfo[i].number), + cleanup); + VIR_PY_TUPLE_SET_GOTO(info, 1, libvirt_intWrap((long)cpuinfo[i].state), + cleanup); + VIR_PY_TUPLE_SET_GOTO(info, 2, + libvirt_ulonglongWrap((long)cpuinfo[i].cpuTime), + cleanup); + VIR_PY_TUPLE_SET_GOTO(info, 3, libvirt_intWrap((long)cpuinfo[i].cpu), + cleanup); } for (i = 0; i < dominfo.nrVirtCpu; i++) { PyObject *info = PyTuple_New(cpunum); @@ -1284,11 +1290,11 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; for (j = 0; j < cpunum; j++) { - PyObject *item = NULL; - if ((item = PyBool_FromLong(VIR_CPU_USABLE(cpumap, cpumaplen, - i, j))) == NULL || - PyTuple_SetItem(info, j, item) < 0) - goto cleanup; + VIR_PY_TUPLE_SET_GOTO(info, j, + PyBool_FromLong(VIR_CPU_USABLE(cpumap, + cpumaplen, + i, j)), + cleanup); } } @@ -1485,9 +1491,13 @@ libvirt_virDomainGetVcpuPinInfo(PyObject *self ATTRIBUTE_UNUSED, PyList_SetItem(pycpumaps, vcpu, mapinfo); for (pcpu = 0; pcpu < cpunum; pcpu++) { - PyTuple_SetItem(mapinfo, pcpu, - PyBool_FromLong(VIR_CPU_USABLE(cpumaps, cpumaplen, - vcpu, pcpu))); + VIR_PY_TUPLE_SET_GOTO(mapinfo, + pcpu, + PyBool_FromLong(VIR_CPU_USABLE(cpumaps, + cpumaplen, + vcpu, + pcpu)), + cleanup); } } @@ -1611,13 +1621,23 @@ libvirt_virDomainGetEmulatorPinInfo(PyObject *self ATTRIBUTE_UNUSED, return NULL; } - for (pcpu = 0; pcpu < cpunum; pcpu++) - PyTuple_SET_ITEM(pycpumap, pcpu, - PyBool_FromLong(VIR_CPU_USABLE(cpumap, cpumaplen, - 0, pcpu))); + for (pcpu = 0; pcpu < cpunum; pcpu++) { + VIR_PY_TUPLE_SET_GOTO(pycpumap, + pcpu, + PyBool_FromLong(VIR_CPU_USABLE(cpumap, + cpumaplen, + 0, + pcpu)), + error); + } + cleanup: VIR_FREE(cpumap); return pycpumap; + + error: + Py_CLEAR(pycpumap); + goto cleanup; } #endif /* LIBVIR_CHECK_VERSION(0, 10, 0) */ @@ -1675,18 +1695,15 @@ libvirt_virDomainGetIOThreadInfo(PyObject *self ATTRIBUTE_UNUSED, } /* 0: IOThread ID */ - if ((iothrid = libvirt_uintWrap(iothr->iothread_id)) == NULL || - PyTuple_SetItem(iothrtpl, 0, iothrid) < 0) { - Py_XDECREF(iothrid); - goto cleanup; - } + VIR_PY_TUPLE_SET_GOTO(iothrtpl, 0, libvirt_uintWrap(iothr->iothread_id), + cleanup); /* 1: CPU map */ - if ((iothrmap = PyList_New(cpunum)) == NULL || - PyTuple_SetItem(iothrtpl, 1, iothrmap) < 0) { - Py_XDECREF(iothrmap); + if ((iothrmap = PyList_New(cpunum)) == NULL) goto cleanup; - } + + VIR_PY_TUPLE_SET_GOTO(iothrtpl, 1, iothrmap, cleanup); + for (pcpu = 0; pcpu < cpunum; pcpu++) { PyObject *pyused; if ((pyused = PyBool_FromLong(VIR_CPU_USED(iothr->cpumap, @@ -1801,17 +1818,21 @@ libvirt_virGetLastError(PyObject *self ATTRIBUTE_UNUSED, if ((info = PyTuple_New(9)) == NULL) return NULL; - PyTuple_SetItem(info, 0, libvirt_intWrap((long) err->code)); - PyTuple_SetItem(info, 1, libvirt_intWrap((long) err->domain)); - PyTuple_SetItem(info, 2, libvirt_constcharPtrWrap(err->message)); - PyTuple_SetItem(info, 3, libvirt_intWrap((long) err->level)); - PyTuple_SetItem(info, 4, libvirt_constcharPtrWrap(err->str1)); - PyTuple_SetItem(info, 5, libvirt_constcharPtrWrap(err->str2)); - PyTuple_SetItem(info, 6, libvirt_constcharPtrWrap(err->str3)); - PyTuple_SetItem(info, 7, libvirt_intWrap((long) err->int1)); - PyTuple_SetItem(info, 8, libvirt_intWrap((long) err->int2)); + VIR_PY_TUPLE_SET_GOTO(info, 0, libvirt_intWrap((long)err->code), error); + VIR_PY_TUPLE_SET_GOTO(info, 1, libvirt_intWrap((long)err->domain), error); + VIR_PY_TUPLE_SET_GOTO(info, 2, libvirt_constcharPtrWrap(err->message), error); + VIR_PY_TUPLE_SET_GOTO(info, 3, libvirt_intWrap((long)err->level), error); + VIR_PY_TUPLE_SET_GOTO(info, 4, libvirt_constcharPtrWrap(err->str1), error); + VIR_PY_TUPLE_SET_GOTO(info, 5, libvirt_constcharPtrWrap(err->str2), error); + VIR_PY_TUPLE_SET_GOTO(info, 6, libvirt_constcharPtrWrap(err->str3), error); + VIR_PY_TUPLE_SET_GOTO(info, 7, libvirt_intWrap((long)err->int1), error); + VIR_PY_TUPLE_SET_GOTO(info, 8, libvirt_intWrap((long)err->int2), error); return info; + + error: + Py_XDECREF(info); + return NULL; } static PyObject * @@ -1836,17 +1857,21 @@ libvirt_virConnGetLastError(PyObject *self ATTRIBUTE_UNUSED, if ((info = PyTuple_New(9)) == NULL) return NULL; - PyTuple_SetItem(info, 0, libvirt_intWrap((long) err->code)); - PyTuple_SetItem(info, 1, libvirt_intWrap((long) err->domain)); - PyTuple_SetItem(info, 2, libvirt_constcharPtrWrap(err->message)); - PyTuple_SetItem(info, 3, libvirt_intWrap((long) err->level)); - PyTuple_SetItem(info, 4, libvirt_constcharPtrWrap(err->str1)); - PyTuple_SetItem(info, 5, libvirt_constcharPtrWrap(err->str2)); - PyTuple_SetItem(info, 6, libvirt_constcharPtrWrap(err->str3)); - PyTuple_SetItem(info, 7, libvirt_intWrap((long) err->int1)); - PyTuple_SetItem(info, 8, libvirt_intWrap((long) err->int2)); + VIR_PY_TUPLE_SET_GOTO(info, 0, libvirt_intWrap((long)err->code), error); + VIR_PY_TUPLE_SET_GOTO(info, 1, libvirt_intWrap((long)err->domain), error); + VIR_PY_TUPLE_SET_GOTO(info, 2, libvirt_constcharPtrWrap(err->message), error); + VIR_PY_TUPLE_SET_GOTO(info, 3, libvirt_intWrap((long)err->level), error); + VIR_PY_TUPLE_SET_GOTO(info, 4, libvirt_constcharPtrWrap(err->str1), error); + VIR_PY_TUPLE_SET_GOTO(info, 5, libvirt_constcharPtrWrap(err->str2), error); + VIR_PY_TUPLE_SET_GOTO(info, 6, libvirt_constcharPtrWrap(err->str3), error); + VIR_PY_TUPLE_SET_GOTO(info, 7, libvirt_intWrap((long)err->int1), error); + VIR_PY_TUPLE_SET_GOTO(info, 8, libvirt_intWrap((long)err->int2), error); return info; + + error: + Py_XDECREF(info); + return NULL; } static void @@ -1872,22 +1897,23 @@ libvirt_virErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, goto cleanup; Py_XINCREF(libvirt_virPythonErrorFuncCtxt); - PyTuple_SetItem(list, 0, libvirt_virPythonErrorFuncCtxt); + VIR_PY_TUPLE_SET_GOTO(list, 0, libvirt_virPythonErrorFuncCtxt, cleanup); if ((info = PyTuple_New(9)) == NULL) goto cleanup; - PyTuple_SetItem(list, 1, info); - - PyTuple_SetItem(info, 0, libvirt_intWrap((long) err->code)); - PyTuple_SetItem(info, 1, libvirt_intWrap((long) err->domain)); - PyTuple_SetItem(info, 2, libvirt_constcharPtrWrap(err->message)); - PyTuple_SetItem(info, 3, libvirt_intWrap((long) err->level)); - PyTuple_SetItem(info, 4, libvirt_constcharPtrWrap(err->str1)); - PyTuple_SetItem(info, 5, libvirt_constcharPtrWrap(err->str2)); - PyTuple_SetItem(info, 6, libvirt_constcharPtrWrap(err->str3)); - PyTuple_SetItem(info, 7, libvirt_intWrap((long) err->int1)); - PyTuple_SetItem(info, 8, libvirt_intWrap((long) err->int2)); + VIR_PY_TUPLE_SET_GOTO(list, 1, info, cleanup); + + VIR_PY_TUPLE_SET_GOTO(info, 0, libvirt_intWrap((long)err->code), cleanup); + VIR_PY_TUPLE_SET_GOTO(info, 1, libvirt_intWrap((long)err->domain), cleanup); + VIR_PY_TUPLE_SET_GOTO(info, 2, libvirt_constcharPtrWrap(err->message), cleanup); + VIR_PY_TUPLE_SET_GOTO(info, 3, libvirt_intWrap((long)err->level), cleanup); + VIR_PY_TUPLE_SET_GOTO(info, 4, libvirt_constcharPtrWrap(err->str1), cleanup); + VIR_PY_TUPLE_SET_GOTO(info, 5, libvirt_constcharPtrWrap(err->str2), cleanup); + VIR_PY_TUPLE_SET_GOTO(info, 6, libvirt_constcharPtrWrap(err->str3), cleanup); + VIR_PY_TUPLE_SET_GOTO(info, 7, libvirt_intWrap((long)err->int1), cleanup); + VIR_PY_TUPLE_SET_GOTO(info, 8, libvirt_intWrap((long)err->int2), cleanup); + /* TODO pass conn and dom if available */ result = PyEval_CallObject(libvirt_virPythonErrorFuncHandler, list); Py_XDECREF(result); @@ -1959,14 +1985,15 @@ virConnectCredCallbackWrapper(virConnectCredentialPtr cred, if ((pycred = PyTuple_New(ncred)) == NULL) goto cleanup; - PyTuple_SetItem(list, 0, pycred); + VIR_PY_TUPLE_SET_GOTO(list, 0, pycred, cleanup); for (i = 0; i < ncred; i++) { PyObject *pycreditem = PyList_New(5); if (pycreditem == NULL) goto cleanup; - PyTuple_SetItem(pycred, i, pycreditem); + VIR_PY_TUPLE_SET_GOTO(pycred, i, pycreditem, cleanup); + PyList_SetItem(pycreditem, 0, libvirt_intWrap((long) cred[i].type)); PyList_SetItem(pycreditem, 1, libvirt_constcharPtrWrap(cred[i].prompt)); if (cred[i].challenge) { @@ -1985,7 +2012,7 @@ virConnectCredCallbackWrapper(virConnectCredentialPtr cred, } Py_XINCREF(pycbdata); - PyTuple_SetItem(list, 1, pycbdata); + VIR_PY_TUPLE_SET_GOTO(list, 1, pycbdata, cleanup); PyErr_Clear(); pyret = PyEval_CallObject(pycb, list); @@ -5204,9 +5231,6 @@ libvirt_virEventAddHandleFunc(int fd, virFreeCallback ff) { PyObject *result; - PyObject *cb_obj; - PyObject *ff_obj; - PyObject *opaque_obj; PyObject *python_cb = NULL; PyObject *cb_args = NULL; PyObject *pyobj_args = NULL; @@ -5217,8 +5241,8 @@ libvirt_virEventAddHandleFunc(int fd, if ((pyobj_args = PyTuple_New(4)) == NULL) goto cleanup; - PyTuple_SetItem(pyobj_args, 0, libvirt_intWrap(fd)); - PyTuple_SetItem(pyobj_args, 1, libvirt_intWrap(event)); + VIR_PY_TUPLE_SET_GOTO(pyobj_args, 0, libvirt_intWrap(fd), cleanup); + VIR_PY_TUPLE_SET_GOTO(pyobj_args, 1, libvirt_intWrap(event), cleanup); /* Lookup the python callback */ python_cb = libvirt_lookupPythonFunc("_eventInvokeHandleCallback"); @@ -5227,20 +5251,16 @@ libvirt_virEventAddHandleFunc(int fd, } Py_INCREF(python_cb); - PyTuple_SetItem(pyobj_args, 2, python_cb); + VIR_PY_TUPLE_SET_GOTO(pyobj_args, 2, python_cb, cleanup); if ((cb_args = PyTuple_New(3)) == NULL) goto cleanup; - PyTuple_SetItem(pyobj_args, 3, cb_args); + VIR_PY_TUPLE_SET_GOTO(pyobj_args, 3, cb_args, cleanup); - /* create tuple for cb */ - cb_obj = libvirt_virEventHandleCallbackWrap(cb); - ff_obj = libvirt_virFreeCallbackWrap(ff); - opaque_obj = libvirt_virVoidPtrWrap(opaque); - PyTuple_SetItem(cb_args, 0, cb_obj); - PyTuple_SetItem(cb_args, 1, opaque_obj); - PyTuple_SetItem(cb_args, 2, ff_obj); + VIR_PY_TUPLE_SET_GOTO(cb_args, 0, libvirt_virEventHandleCallbackWrap(cb), cleanup); + VIR_PY_TUPLE_SET_GOTO(cb_args, 1, libvirt_virVoidPtrWrap(opaque), cleanup); + VIR_PY_TUPLE_SET_GOTO(cb_args, 2, libvirt_virFreeCallbackWrap(ff), cleanup); result = PyEval_CallObject(addHandleObj, pyobj_args); if (!result) { @@ -5272,8 +5292,8 @@ libvirt_virEventUpdateHandleFunc(int watch, if ((pyobj_args = PyTuple_New(2)) == NULL) goto cleanup; - PyTuple_SetItem(pyobj_args, 0, libvirt_intWrap(watch)); - PyTuple_SetItem(pyobj_args, 1, libvirt_intWrap(event)); + VIR_PY_TUPLE_SET_GOTO(pyobj_args, 0, libvirt_intWrap(watch), cleanup); + VIR_PY_TUPLE_SET_GOTO(pyobj_args, 1, libvirt_intWrap(event), cleanup); result = PyEval_CallObject(updateHandleObj, pyobj_args); if (!result) { @@ -5304,7 +5324,7 @@ libvirt_virEventRemoveHandleFunc(int watch) if ((pyobj_args = PyTuple_New(1)) == NULL) goto cleanup; - PyTuple_SetItem(pyobj_args, 0, libvirt_intWrap(watch)); + VIR_PY_TUPLE_SET_GOTO(pyobj_args, 0, libvirt_intWrap(watch), cleanup); result = PyEval_CallObject(removeHandleObj, pyobj_args); if (!result) { @@ -5339,9 +5359,6 @@ libvirt_virEventAddTimeoutFunc(int timeout, void *opaque, virFreeCallback ff) { - PyObject *cb_obj; - PyObject *ff_obj; - PyObject *opaque_obj; PyObject *result = NULL; PyObject *python_cb = NULL; PyObject *cb_args = NULL; @@ -5353,7 +5370,7 @@ libvirt_virEventAddTimeoutFunc(int timeout, if ((pyobj_args = PyTuple_New(3)) == NULL) goto cleanup; - PyTuple_SetItem(pyobj_args, 0, libvirt_intWrap(timeout)); + VIR_PY_TUPLE_SET_GOTO(pyobj_args, 0, libvirt_intWrap(timeout), cleanup); /* Lookup the python callback */ python_cb = libvirt_lookupPythonFunc("_eventInvokeTimeoutCallback"); @@ -5361,20 +5378,16 @@ libvirt_virEventAddTimeoutFunc(int timeout, goto cleanup; } Py_INCREF(python_cb); - PyTuple_SetItem(pyobj_args, 1, python_cb); + VIR_PY_TUPLE_SET_GOTO(pyobj_args, 1, python_cb, cleanup); if ((cb_args = PyTuple_New(3)) == NULL) goto cleanup; - PyTuple_SetItem(pyobj_args, 2, cb_args); + VIR_PY_TUPLE_SET_GOTO(pyobj_args, 2, cb_args, cleanup); - /* create tuple for cb */ - cb_obj = libvirt_virEventTimeoutCallbackWrap(cb); - ff_obj = libvirt_virFreeCallbackWrap(ff); - opaque_obj = libvirt_virVoidPtrWrap(opaque); - PyTuple_SetItem(cb_args, 0, cb_obj); - PyTuple_SetItem(cb_args, 1, opaque_obj); - PyTuple_SetItem(cb_args, 2, ff_obj); + VIR_PY_TUPLE_SET_GOTO(cb_args, 0, libvirt_virEventTimeoutCallbackWrap(cb), cleanup); + VIR_PY_TUPLE_SET_GOTO(cb_args, 1, libvirt_virVoidPtrWrap(opaque), cleanup); + VIR_PY_TUPLE_SET_GOTO(cb_args, 2, libvirt_virFreeCallbackWrap(ff), cleanup); result = PyEval_CallObject(addTimeoutObj, pyobj_args); if (!result) { @@ -5404,8 +5417,8 @@ libvirt_virEventUpdateTimeoutFunc(int timer, if ((pyobj_args = PyTuple_New(2)) == NULL) goto cleanup; - PyTuple_SetItem(pyobj_args, 0, libvirt_intWrap(timer)); - PyTuple_SetItem(pyobj_args, 1, libvirt_intWrap(timeout)); + VIR_PY_TUPLE_SET_GOTO(pyobj_args, 0, libvirt_intWrap(timer), cleanup); + VIR_PY_TUPLE_SET_GOTO(pyobj_args, 1, libvirt_intWrap(timeout), cleanup); result = PyEval_CallObject(updateTimeoutObj, pyobj_args); if (!result) { @@ -5435,7 +5448,7 @@ libvirt_virEventRemoveTimeoutFunc(int timer) if ((pyobj_args = PyTuple_New(1)) == NULL) goto cleanup; - PyTuple_SetItem(pyobj_args, 0, libvirt_intWrap(timer)); + VIR_PY_TUPLE_SET_GOTO(pyobj_args, 0, libvirt_intWrap(timer), cleanup); result = PyEval_CallObject(removeTimeoutObj, pyobj_args); if (!result) { @@ -6103,11 +6116,12 @@ libvirt_virConnectDomainEventGraphicsCallback(virConnectPtr conn ATTRIBUTE_UNUSE PyList_SetItem(pyobj_subject, i, pair); - PyTuple_SetItem(pair, 0, - libvirt_constcharPtrWrap(subject->identities[i].type)); - PyTuple_SetItem(pair, 1, - libvirt_constcharPtrWrap(subject->identities[i].name)); - + VIR_PY_TUPLE_SET_GOTO(pair, 0, + libvirt_constcharPtrWrap(subject->identities[i].type), + cleanup); + VIR_PY_TUPLE_SET_GOTO(pair, 1, + libvirt_constcharPtrWrap(subject->identities[i].name), + cleanup); } /* Call the Callback Dispatcher */ @@ -7660,16 +7674,13 @@ libvirt_virNodeGetCPUMap(PyObject *self ATTRIBUTE_UNUSED, goto error; /* 0: number of CPUs */ - if ((pycpunum = libvirt_intWrap(i_retval)) == NULL || - PyTuple_SetItem(ret, 0, pycpunum) < 0) - goto error; + VIR_PY_TUPLE_SET_GOTO(ret, 0, libvirt_intWrap(i_retval), error); /* 1: CPU map */ if ((pycpumap = PyList_New(i_retval)) == NULL) goto error; - if (PyTuple_SetItem(ret, 1, pycpumap) < 0) - goto error; + VIR_PY_TUPLE_SET_GOTO(ret, 1, pycpumap, error); for (i = 0; i < i_retval; i++) { if ((pyused = PyBool_FromLong(VIR_CPU_USED(cpumap, i))) == NULL) @@ -7679,9 +7690,7 @@ libvirt_virNodeGetCPUMap(PyObject *self ATTRIBUTE_UNUSED, } /* 2: number of online CPUs */ - if ((pyonline = libvirt_uintWrap(online)) == NULL || - PyTuple_SetItem(ret, 2, pyonline) < 0) - goto error; + VIR_PY_TUPLE_SET_GOTO(ret, 2, libvirt_uintWrap(online), error); cleanup: VIR_FREE(cpumap); @@ -8203,20 +8212,15 @@ convertDomainStatsRecord(virDomainStatsRecordPtr *records, /* libvirt_virDomainPtrWrap steals the object */ virDomainRef(records[i]->dom); - if (!(py_record_domain = libvirt_virDomainPtrWrap(records[i]->dom))) { - virDomainFree(records[i]->dom); - goto error; - } - - if (PyTuple_SetItem(py_record, 0, py_record_domain) < 0) - goto error; + VIR_PY_TUPLE_SET_GOTO(py_record, 0, + libvirt_virDomainPtrWrap(records[i]->dom), + error); if (!(py_record_stats = getPyVirTypedParameter(records[i]->params, records[i]->nparams))) goto error; + VIR_PY_TUPLE_SET_GOTO(py_record, 1, py_record_stats, error); - if (PyTuple_SetItem(py_record, 1, py_record_stats) < 0) - goto error; } return py_retval; @@ -8451,15 +8455,17 @@ libvirt_virDomainGetFSInfo(PyObject *self ATTRIBUTE_UNUSED, PyList_SetItem(py_retval, i, info); - PyTuple_SetItem(info, 0, libvirt_constcharPtrWrap(fs->mountpoint)); - PyTuple_SetItem(info, 1, libvirt_constcharPtrWrap(fs->name)); - PyTuple_SetItem(info, 2, libvirt_constcharPtrWrap(fs->fstype)); + VIR_PY_TUPLE_SET_GOTO(info, 0, + libvirt_constcharPtrWrap(fs->mountpoint), error); + VIR_PY_TUPLE_SET_GOTO(info, 1, + libvirt_constcharPtrWrap(fs->name), error); + VIR_PY_TUPLE_SET_GOTO(info, 2, + libvirt_constcharPtrWrap(fs->fstype), error); alias = PyList_New(0); if (alias == NULL) goto error; - - PyTuple_SetItem(info, 3, alias); + VIR_PY_TUPLE_SET_GOTO(info, 3, alias, error); for (j = 0; j < fs->ndevAlias; j++) if (PyList_Append(alias, -- 2.5.3

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- libvirt-lxc-override.c | 13 +- libvirt-override.c | 615 ++++++++++++++++++++++++++++--------------------- 2 files changed, 350 insertions(+), 278 deletions(-) diff --git a/libvirt-lxc-override.c b/libvirt-lxc-override.c index b0550c7..316a500 100644 --- a/libvirt-lxc-override.c +++ b/libvirt-lxc-override.c @@ -82,17 +82,8 @@ libvirt_lxc_virDomainLxcOpenNamespace(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(0)) == NULL) goto error; - for (i = 0; i < c_retval; i++) { - PyObject *item = NULL; - - if ((item = libvirt_intWrap(fdlist[i])) == NULL) - goto error; - - if (PyList_Append(py_retval, item) < 0) { - Py_DECREF(item); - goto error; - } - } + for (i = 0; i < c_retval; i++) + VIR_PY_LIST_APPEND_GOTO(py_retval, libvirt_intWrap(fdlist[1]), error); cleanup: VIR_FREE(fdlist); diff --git a/libvirt-override.c b/libvirt-override.c index c2e9fb9..1f795d9 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -250,15 +250,10 @@ libvirt_virDomainGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, for (i = 0; i < queried_ncpus; i++) { cpuparams = &params[i * nparams]; - if ((cpu = getPyVirTypedParameter(cpuparams, i_retval)) == NULL) { - goto error; - } - - if (PyList_Append(ret, cpu) < 0) { - Py_DECREF(cpu); - goto error; - } - Py_DECREF(cpu); + VIR_PY_LIST_APPEND_GOTO(ret, + getPyVirTypedParameter(cpuparams, + i_retval), + error); } start_cpu += queried_ncpus; @@ -296,14 +291,8 @@ libvirt_virDomainGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, i_retval = 0; } - if ((total = getPyVirTypedParameter(params, i_retval)) == NULL) { - goto error; - } - if (PyList_Append(ret, total) < 0) { - Py_DECREF(total); - goto error; - } - Py_DECREF(total); + VIR_PY_LIST_APPEND_GOTO(ret, getPyVirTypedParameter(params, i_retval), + error); } virTypedParamsFree(params, sumparams); @@ -1267,8 +1256,7 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, if (info == NULL) goto cleanup; - if (PyList_SetItem(pycpuinfo, i, info) < 0) - goto cleanup; + VIR_PY_LIST_SET_GOTO(pycpuinfo, i, info, cleanup); VIR_PY_TUPLE_SET_GOTO(info, 0, libvirt_intWrap((long)cpuinfo[i].number), cleanup); @@ -1286,8 +1274,7 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, if (info == NULL) goto cleanup; - if (PyList_SetItem(pycpumap, i, info) < 0) - goto cleanup; + VIR_PY_LIST_SET_GOTO(pycpumap, i, info, cleanup); for (j = 0; j < cpunum; j++) { VIR_PY_TUPLE_SET_GOTO(info, j, @@ -1488,7 +1475,7 @@ libvirt_virDomainGetVcpuPinInfo(PyObject *self ATTRIBUTE_UNUSED, if (mapinfo == NULL) goto cleanup; - PyList_SetItem(pycpumaps, vcpu, mapinfo); + VIR_PY_LIST_SET_GOTO(pycpumaps, vcpu, mapinfo, cleanup); for (pcpu = 0; pcpu < cpunum; pcpu++) { VIR_PY_TUPLE_SET_GOTO(mapinfo, @@ -1688,11 +1675,10 @@ libvirt_virDomainGetIOThreadInfo(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; } - if ((iothrtpl = PyTuple_New(2)) == NULL || - PyList_SetItem(py_iothrinfo, i, iothrtpl) < 0) { - Py_XDECREF(iothrtpl); + if ((iothrtpl = PyTuple_New(2)) == NULL) goto cleanup; - } + + VIR_PY_LIST_SET_GOTO(py_iothrinfo, i, iothrtpl, cleanup); /* 0: IOThread ID */ VIR_PY_TUPLE_SET_GOTO(iothrtpl, 0, libvirt_uintWrap(iothr->iothread_id), @@ -1704,17 +1690,11 @@ libvirt_virDomainGetIOThreadInfo(PyObject *self ATTRIBUTE_UNUSED, VIR_PY_TUPLE_SET_GOTO(iothrtpl, 1, iothrmap, cleanup); - for (pcpu = 0; pcpu < cpunum; pcpu++) { - PyObject *pyused; - if ((pyused = PyBool_FromLong(VIR_CPU_USED(iothr->cpumap, - pcpu))) == NULL) { - goto cleanup; - } - if (PyList_SetItem(iothrmap, pcpu, pyused) < 0) { - Py_XDECREF(pyused); - goto cleanup; - } - } + for (pcpu = 0; pcpu < cpunum; pcpu++) + VIR_PY_LIST_SET_GOTO(iothrmap, pcpu, + PyBool_FromLong(VIR_CPU_USED(iothr->cpumap, + pcpu)), + cleanup); } py_retval = py_iothrinfo; @@ -1994,21 +1974,26 @@ virConnectCredCallbackWrapper(virConnectCredentialPtr cred, VIR_PY_TUPLE_SET_GOTO(pycred, i, pycreditem, cleanup); - PyList_SetItem(pycreditem, 0, libvirt_intWrap((long) cred[i].type)); - PyList_SetItem(pycreditem, 1, libvirt_constcharPtrWrap(cred[i].prompt)); + VIR_PY_LIST_SET_GOTO(pycreditem, 0, + libvirt_intWrap((long)cred[i].type), cleanup); + VIR_PY_LIST_SET_GOTO(pycreditem, 1, + libvirt_constcharPtrWrap(cred[i].prompt), cleanup); + if (cred[i].challenge) { - PyList_SetItem(pycreditem, 2, - libvirt_constcharPtrWrap(cred[i].challenge)); + VIR_PY_LIST_SET_GOTO(pycreditem, 2, + libvirt_constcharPtrWrap(cred[i].challenge), + cleanup); } else { - PyList_SetItem(pycreditem, 2, VIR_PY_NONE); + VIR_PY_LIST_SET_GOTO(pycreditem, 2, VIR_PY_NONE, cleanup); } if (cred[i].defresult) { - PyList_SetItem(pycreditem, 3, - libvirt_constcharPtrWrap(cred[i].defresult)); + VIR_PY_LIST_SET_GOTO(pycreditem, 3, + libvirt_constcharPtrWrap(cred[i].defresult), + cleanup); } else { - PyList_SetItem(pycreditem, 3, VIR_PY_NONE); + VIR_PY_LIST_SET_GOTO(pycreditem, 3, VIR_PY_NONE, cleanup); } - PyList_SetItem(pycreditem, 4, VIR_PY_NONE); + VIR_PY_LIST_SET_GOTO(pycreditem, 4, VIR_PY_NONE, cleanup); } Py_XINCREF(pycbdata); @@ -2188,13 +2173,8 @@ libvirt_virConnectGetCPUModelNames(PyObject *self ATTRIBUTE_UNUSED, if ((rv = PyList_New(c_retval)) == NULL) goto error; - for (i = 0; i < c_retval; i++) { - PyObject *str; - if ((str = libvirt_constcharPtrWrap(models[i])) == NULL) - goto error; - - PyList_SET_ITEM(rv, i, str); - } + for (i = 0; i < c_retval; i++) + VIR_PY_LIST_SET_GOTO(rv, i, libvirt_constcharPtrWrap(models[i]), error); done: if (models) { @@ -2273,13 +2253,17 @@ libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED, py_retval = PyList_New(c_retval); if (ids) { - for (i = 0; i < c_retval; i++) { - PyList_SetItem(py_retval, i, libvirt_intWrap(ids[i])); - } + for (i = 0; i < c_retval; i++) + VIR_PY_LIST_SET_GOTO(py_retval, i, libvirt_intWrap(ids[i]), error); VIR_FREE(ids); } return py_retval; + + error: + VIR_FREE(ids); + Py_XDECREF(py_retval); + return NULL; } #if LIBVIR_CHECK_VERSION(0, 9, 13) @@ -2311,12 +2295,7 @@ libvirt_virConnectListAllDomains(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; for (i = 0; i < c_retval; i++) { - if (!(tmp = libvirt_virDomainPtrWrap(doms[i])) || - PyList_SetItem(py_retval, i, tmp) < 0) { - Py_XDECREF(tmp); - Py_CLEAR(py_retval); - goto cleanup; - } + VIR_PY_LIST_SET_GOTO(py_retval, i, libvirt_virDomainPtrWrap(doms[i]), error); /* python steals the pointer */ doms[i] = NULL; } @@ -2327,6 +2306,10 @@ libvirt_virConnectListAllDomains(PyObject *self ATTRIBUTE_UNUSED, virDomainFree(doms[i]); VIR_FREE(doms); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #endif /* LIBVIR_CHECK_VERSION(0, 9, 13) */ @@ -2369,9 +2352,9 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; if (names) { - for (i = 0; i < c_retval; i++) { - PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); - } + for (i = 0; i < c_retval; i++) + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_constcharPtrWrap(names[i]), error); } cleanup: @@ -2380,6 +2363,10 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(names); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } static PyObject * @@ -2421,20 +2408,18 @@ libvirt_virDomainSnapshotListNames(PyObject *self ATTRIBUTE_UNUSED, if (!py_retval) goto cleanup; - for (i = 0; i < c_retval; i++) { - if ((pyobj_snap = libvirt_constcharPtrWrap(names[i])) == NULL || - PyList_SetItem(py_retval, i, pyobj_snap) < 0) { - Py_XDECREF(pyobj_snap); - Py_CLEAR(py_retval); - goto cleanup; - } - } + for (i = 0; i < c_retval; i++) + VIR_PY_LIST_SET_GOTO(py_retval, i, libvirt_constcharPtrWrap(names[i]), error); cleanup: for (i = 0; i < c_retval; i++) VIR_FREE(names[i]); VIR_FREE(names); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #if LIBVIR_CHECK_VERSION(0, 9, 13) @@ -2466,13 +2451,8 @@ libvirt_virDomainListAllSnapshots(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; for (i = 0; i < c_retval; i++) { - if ((pyobj_snap = libvirt_virDomainSnapshotPtrWrap(snaps[i])) == NULL || - PyList_SetItem(py_retval, i, pyobj_snap) < 0) { - Py_XDECREF(pyobj_snap); - Py_CLEAR(py_retval); - goto cleanup; - } - snaps[i] = NULL; + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_virDomainSnapshotPtrWrap(snaps[i]), error); } cleanup: @@ -2481,6 +2461,10 @@ libvirt_virDomainListAllSnapshots(PyObject *self ATTRIBUTE_UNUSED, virDomainSnapshotFree(snaps[i]); VIR_FREE(snaps); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #endif /* LIBVIR_CHECK_VERSION(0, 9, 13) */ @@ -2523,21 +2507,18 @@ libvirt_virDomainSnapshotListChildrenNames(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(c_retval)) == NULL) goto cleanup; - for (i = 0; i < c_retval; i++) { - if ((pyobj_snap = libvirt_constcharPtrWrap(names[i])) == NULL || - PyList_SetItem(py_retval, i, pyobj_snap) < 0) { - Py_XDECREF(pyobj_snap); - Py_CLEAR(py_retval); - goto cleanup; - } - VIR_FREE(names[i]); - } + for (i = 0; i < c_retval; i++) + VIR_PY_LIST_SET_GOTO(py_retval, i, libvirt_constcharPtrWrap(names[i]), error); cleanup: for (i = 0; i < c_retval; i++) VIR_FREE(names[i]); VIR_FREE(names); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #if LIBVIR_CHECK_VERSION(0, 9, 13) @@ -2568,15 +2549,9 @@ libvirt_virDomainSnapshotListAllChildren(PyObject *self ATTRIBUTE_UNUSED, if (!(py_retval = PyList_New(c_retval))) goto cleanup; - for (i = 0; i < c_retval; i++) { - if ((pyobj_snap = libvirt_virDomainSnapshotPtrWrap(snaps[i])) == NULL || - PyList_SetItem(py_retval, i, pyobj_snap) < 0) { - Py_XDECREF(pyobj_snap); - Py_CLEAR(py_retval); - goto cleanup; - } - snaps[i] = NULL; - } + for (i = 0; i < c_retval; i++) + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_virDomainSnapshotPtrWrap(snaps[i]), error); cleanup: for (i = 0; i < c_retval; i++) @@ -2584,6 +2559,10 @@ libvirt_virDomainSnapshotListAllChildren(PyObject *self ATTRIBUTE_UNUSED, virDomainSnapshotFree(snaps[i]); VIR_FREE(snaps); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #endif /* LIBVIR_CHECK_VERSION(0, 9, 13) */ @@ -2634,13 +2613,19 @@ libvirt_virDomainGetInfo(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(5)) == NULL) return NULL; - PyList_SetItem(py_retval, 0, libvirt_intWrap((int) info.state)); - PyList_SetItem(py_retval, 1, libvirt_ulongWrap(info.maxMem)); - PyList_SetItem(py_retval, 2, libvirt_ulongWrap(info.memory)); - PyList_SetItem(py_retval, 3, libvirt_intWrap((int) info.nrVirtCpu)); - PyList_SetItem(py_retval, 4, - libvirt_ulonglongWrap(info.cpuTime)); + VIR_PY_LIST_SET_GOTO(py_retval, 0, libvirt_intWrap((int) info.state), error); + VIR_PY_LIST_SET_GOTO(py_retval, 1, libvirt_ulongWrap(info.maxMem), error); + VIR_PY_LIST_SET_GOTO(py_retval, 2, libvirt_ulongWrap(info.memory), error); + VIR_PY_LIST_SET_GOTO(py_retval, 3, + libvirt_intWrap((int) info.nrVirtCpu), error); + VIR_PY_LIST_SET_GOTO(py_retval, 4, + libvirt_ulonglongWrap(info.cpuTime), error); + return py_retval; + + error: + Py_XDECREF(py_retval); + return NULL; } static PyObject * @@ -2670,9 +2655,14 @@ libvirt_virDomainGetState(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(2)) == NULL) return NULL; - PyList_SetItem(py_retval, 0, libvirt_intWrap(state)); - PyList_SetItem(py_retval, 1, libvirt_intWrap(reason)); + VIR_PY_LIST_SET_GOTO(py_retval, 0, libvirt_intWrap(state), error); + VIR_PY_LIST_SET_GOTO(py_retval, 1, libvirt_intWrap(reason), error); + return py_retval; + + error: + Py_XDECREF(py_retval); + return NULL; } static PyObject * @@ -2700,10 +2690,16 @@ libvirt_virDomainGetControlInfo(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(3)) == NULL) return NULL; - PyList_SetItem(py_retval, 0, libvirt_intWrap(info.state)); - PyList_SetItem(py_retval, 1, libvirt_intWrap(info.details)); - PyList_SetItem(py_retval, 2, libvirt_ulonglongWrap(info.stateTime)); + VIR_PY_LIST_SET_GOTO(py_retval, 0, libvirt_intWrap(info.state), error); + VIR_PY_LIST_SET_GOTO(py_retval, 1, libvirt_intWrap(info.details), error); + VIR_PY_LIST_SET_GOTO(py_retval, 2, + libvirt_ulonglongWrap(info.stateTime), error); + return py_retval; + + error: + Py_XDECREF(py_retval); + return NULL; } static PyObject * @@ -2732,10 +2728,18 @@ libvirt_virDomainGetBlockInfo(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(3)) == NULL) return NULL; - PyList_SetItem(py_retval, 0, libvirt_ulonglongWrap(info.capacity)); - PyList_SetItem(py_retval, 1, libvirt_ulonglongWrap(info.allocation)); - PyList_SetItem(py_retval, 2, libvirt_ulonglongWrap(info.physical)); + VIR_PY_LIST_SET_GOTO(py_retval, 0, + libvirt_ulonglongWrap(info.capacity), error); + VIR_PY_LIST_SET_GOTO(py_retval, 1, + libvirt_ulonglongWrap(info.allocation), error); + VIR_PY_LIST_SET_GOTO(py_retval, 2, + libvirt_ulonglongWrap(info.physical), error); + return py_retval; + + error: + Py_XDECREF(py_retval); + return NULL; } static PyObject * @@ -2761,15 +2765,22 @@ libvirt_virNodeGetInfo(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(8)) == NULL) return NULL; - PyList_SetItem(py_retval, 0, libvirt_constcharPtrWrap(&info.model[0])); - PyList_SetItem(py_retval, 1, libvirt_longWrap((long) info.memory >> 10)); - PyList_SetItem(py_retval, 2, libvirt_intWrap((int) info.cpus)); - PyList_SetItem(py_retval, 3, libvirt_intWrap((int) info.mhz)); - PyList_SetItem(py_retval, 4, libvirt_intWrap((int) info.nodes)); - PyList_SetItem(py_retval, 5, libvirt_intWrap((int) info.sockets)); - PyList_SetItem(py_retval, 6, libvirt_intWrap((int) info.cores)); - PyList_SetItem(py_retval, 7, libvirt_intWrap((int) info.threads)); + VIR_PY_LIST_SET_GOTO(py_retval, 0, + libvirt_constcharPtrWrap(&info.model[0]), error); + VIR_PY_LIST_SET_GOTO(py_retval, 1, + libvirt_longWrap((long) info.memory >> 10), error); + VIR_PY_LIST_SET_GOTO(py_retval, 2, libvirt_intWrap((int) info.cpus), error); + VIR_PY_LIST_SET_GOTO(py_retval, 3, libvirt_intWrap((int) info.mhz), error); + VIR_PY_LIST_SET_GOTO(py_retval, 4, libvirt_intWrap((int) info.nodes), error); + VIR_PY_LIST_SET_GOTO(py_retval, 5, libvirt_intWrap((int) info.sockets), error); + VIR_PY_LIST_SET_GOTO(py_retval, 6, libvirt_intWrap((int) info.cores), error); + VIR_PY_LIST_SET_GOTO(py_retval, 7, libvirt_intWrap((int) info.threads), error); + return py_retval; + + error: + Py_XDECREF(py_retval); + return NULL; } static PyObject * @@ -2796,9 +2807,16 @@ libvirt_virNodeGetSecurityModel(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(2)) == NULL) return NULL; - PyList_SetItem(py_retval, 0, libvirt_constcharPtrWrap(&model.model[0])); - PyList_SetItem(py_retval, 1, libvirt_constcharPtrWrap(&model.doi[0])); + VIR_PY_LIST_SET_GOTO(py_retval, 0, + libvirt_constcharPtrWrap(&model.model[0]), error); + VIR_PY_LIST_SET_GOTO(py_retval, 1, + libvirt_constcharPtrWrap(&model.doi[0]), error); + return py_retval; + + error: + Py_XDECREF(py_retval); + return NULL; } static PyObject * @@ -2825,9 +2843,16 @@ libvirt_virDomainGetSecurityLabel(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(2)) == NULL) return NULL; - PyList_SetItem(py_retval, 0, libvirt_constcharPtrWrap(&label.label[0])); - PyList_SetItem(py_retval, 1, libvirt_boolWrap(label.enforcing)); + VIR_PY_LIST_SET_GOTO(py_retval, 0, + libvirt_constcharPtrWrap(&label.label[0]), error); + VIR_PY_LIST_SET_GOTO(py_retval, 1, + libvirt_boolWrap(label.enforcing), error); + return py_retval; + + error: + Py_XDECREF(py_retval); + return NULL; } #if LIBVIR_CHECK_VERSION(0, 10, 0) @@ -2860,25 +2885,17 @@ libvirt_virDomainGetSecurityLabelList(PyObject *self ATTRIBUTE_UNUSED, for (i = 0 ; i < c_retval ; i++) { PyObject *entry; - PyObject *value; - if (!(entry = PyList_New(2)) || - PyList_Append(py_retval, entry) < 0) { - Py_XDECREF(entry); + if (!(entry = PyList_New(2))) goto error; - } - if (!(value = libvirt_constcharPtrWrap(&labels[i].label[0])) || - PyList_SetItem(entry, 0, value) < 0) { - Py_XDECREF(value); - goto error; - } + VIR_PY_LIST_APPEND_GOTO(py_retval, entry, error); - if (!(value = libvirt_boolWrap(labels[i].enforcing)) || - PyList_SetItem(entry, 1, value) < 0) { - Py_XDECREF(value); - goto error; - } + VIR_PY_LIST_SET_GOTO(entry, 0, + libvirt_constcharPtrWrap(&labels[i].label[0]), + error); + VIR_PY_LIST_SET_GOTO(entry, 1, + libvirt_boolWrap(labels[i].enforcing), error); } cleanup: @@ -3006,16 +3023,20 @@ libvirt_virConnectListNetworks(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(c_retval)) == NULL) goto cleanup; - if (names) { + if (names) for (i = 0; i < c_retval; i++) - PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); - } + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_constcharPtrWrap(names[i]), error); cleanup: for (i = 0; i < c_retval; i++) VIR_FREE(names[i]); VIR_FREE(names); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } @@ -3057,16 +3078,19 @@ libvirt_virConnectListDefinedNetworks(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(c_retval)) == NULL) goto cleanup; - if (names) { - for (i = 0; i < c_retval; i++) - PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); - } + for (i = 0; i < c_retval; i++) + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_constcharPtrWrap(names[i]), error); cleanup: for (i = 0; i < c_retval; i++) VIR_FREE(names[i]); VIR_FREE(names); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #if LIBVIR_CHECK_VERSION(0, 10, 2) @@ -3097,16 +3121,9 @@ libvirt_virConnectListAllNetworks(PyObject *self ATTRIBUTE_UNUSED, if (!(py_retval = PyList_New(c_retval))) goto cleanup; - for (i = 0; i < c_retval; i++) { - if (!(tmp = libvirt_virNetworkPtrWrap(nets[i])) || - PyList_SetItem(py_retval, i, tmp) < 0) { - Py_XDECREF(tmp); - Py_CLEAR(py_retval); - goto cleanup; - } - /* python steals the pointer */ - nets[i] = NULL; - } + for (i = 0; i < c_retval; i++) + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_virNetworkPtrWrap(nets[i]), error); cleanup: for (i = 0; i < c_retval; i++) @@ -3114,6 +3131,10 @@ libvirt_virConnectListAllNetworks(PyObject *self ATTRIBUTE_UNUSED, virNetworkFree(nets[i]); VIR_FREE(nets); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ @@ -3278,14 +3299,17 @@ libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(c_retval)) == NULL) goto cleanup; - for (i = 0; i < c_retval; i++) { - PyList_SetItem(py_retval, i, - libvirt_ulonglongWrap(freeMems[i])); - } + for (i = 0; i < c_retval; i++) + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_ulonglongWrap(freeMems[i]), error); cleanup: VIR_FREE(freeMems); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } static PyObject * @@ -3455,16 +3479,19 @@ libvirt_virConnectListStoragePools(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(c_retval)) == NULL) goto cleanup; - if (names) { - for (i = 0; i < c_retval; i++) - PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); - } + for (i = 0; i < c_retval; i++) + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_constcharPtrWrap(names[i]), error); cleanup: for (i = 0; i < c_retval; i++) VIR_FREE(names[i]); VIR_FREE(names); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } @@ -3507,7 +3534,8 @@ libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED, if (names) { for (i = 0; i < c_retval; i++) - PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_constcharPtrWrap(names[i]), error); } cleanup: @@ -3516,6 +3544,10 @@ libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(names); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #if LIBVIR_CHECK_VERSION(0, 10, 2) @@ -3547,12 +3579,8 @@ libvirt_virConnectListAllStoragePools(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; for (i = 0; i < c_retval; i++) { - if (!(tmp = libvirt_virStoragePoolPtrWrap(pools[i])) || - PyList_SetItem(py_retval, i, tmp) < 0) { - Py_XDECREF(tmp); - Py_CLEAR(py_retval); - goto cleanup; - } + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_virStoragePoolPtrWrap(pools[i]), error); /* python steals the pointer */ pools[i] = NULL; } @@ -3563,6 +3591,10 @@ libvirt_virConnectListAllStoragePools(PyObject *self ATTRIBUTE_UNUSED, virStoragePoolFree(pools[i]); VIR_FREE(pools); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ @@ -3604,17 +3636,22 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(c_retval)) == NULL) goto cleanup; - if (names) { + if (names) for (i = 0; i < c_retval; i++) - PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); - } + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_constcharPtrWrap(names[i]), error); cleanup: - for (i = 0; i < c_retval; i++) - VIR_FREE(names[i]); - VIR_FREE(names); - + if (names) { + for (i = 0; i < c_retval; i++) + VIR_FREE(names[i]); + VIR_FREE(names); + } return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #if LIBVIR_CHECK_VERSION(0, 10, 2) @@ -3647,12 +3684,8 @@ libvirt_virStoragePoolListAllVolumes(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; for (i = 0; i < c_retval; i++) { - if (!(tmp = libvirt_virStorageVolPtrWrap(vols[i])) || - PyList_SetItem(py_retval, i, tmp) < 0) { - Py_XDECREF(tmp); - Py_CLEAR(py_retval); - goto cleanup; - } + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_virStorageVolPtrWrap(vols[i]), error); /* python steals the pointer */ vols[i] = NULL; } @@ -3663,6 +3696,10 @@ libvirt_virStoragePoolListAllVolumes(PyObject *self ATTRIBUTE_UNUSED, virStorageVolFree(vols[i]); VIR_FREE(vols); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ @@ -3714,14 +3751,20 @@ libvirt_virStoragePoolGetInfo(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(4)) == NULL) return NULL; - PyList_SetItem(py_retval, 0, libvirt_intWrap((int) info.state)); - PyList_SetItem(py_retval, 1, - libvirt_ulonglongWrap(info.capacity)); - PyList_SetItem(py_retval, 2, - libvirt_ulonglongWrap(info.allocation)); - PyList_SetItem(py_retval, 3, - libvirt_ulonglongWrap(info.available)); + VIR_PY_LIST_SET_GOTO(py_retval, 0, + libvirt_intWrap((int) info.state), error); + VIR_PY_LIST_SET_GOTO(py_retval, 1, + libvirt_ulonglongWrap(info.capacity), error); + VIR_PY_LIST_SET_GOTO(py_retval, 2, + libvirt_ulonglongWrap(info.allocation), error); + VIR_PY_LIST_SET_GOTO(py_retval, 3, + libvirt_ulonglongWrap(info.available), error); + return py_retval; + + error: + Py_XDECREF(py_retval); + return NULL; } @@ -3748,12 +3791,18 @@ libvirt_virStorageVolGetInfo(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(3)) == NULL) return NULL; - PyList_SetItem(py_retval, 0, libvirt_intWrap((int) info.type)); - PyList_SetItem(py_retval, 1, - libvirt_ulonglongWrap(info.capacity)); - PyList_SetItem(py_retval, 2, - libvirt_ulonglongWrap(info.allocation)); + VIR_PY_LIST_SET_GOTO(py_retval, 0, + libvirt_intWrap((int) info.type), error); + VIR_PY_LIST_SET_GOTO(py_retval, 1, + libvirt_ulonglongWrap(info.capacity), error); + VIR_PY_LIST_SET_GOTO(py_retval, 2, + libvirt_ulonglongWrap(info.allocation), error); + return py_retval; + + error: + Py_DECREF(py_retval); + return NULL; } static PyObject * @@ -3873,16 +3922,20 @@ libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(c_retval)) == NULL) goto cleanup; - if (names) { + if (names) for (i = 0; i < c_retval; i++) - PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); - } + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_constcharPtrWrap(names[i]), error); cleanup: for (i = 0; i < c_retval; i++) VIR_FREE(names[i]); VIR_FREE(names); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #if LIBVIR_CHECK_VERSION(0, 10, 2) @@ -3914,12 +3967,8 @@ libvirt_virConnectListAllNodeDevices(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; for (i = 0; i < c_retval; i++) { - if (!(tmp = libvirt_virNodeDevicePtrWrap(devices[i])) || - PyList_SetItem(py_retval, i, tmp) < 0) { - Py_XDECREF(tmp); - Py_CLEAR(py_retval); - goto cleanup; - } + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_virNodeDevicePtrWrap(devices[i]), error); /* python steals the pointer */ devices[i] = NULL; } @@ -3930,6 +3979,10 @@ libvirt_virConnectListAllNodeDevices(PyObject *self ATTRIBUTE_UNUSED, virNodeDeviceFree(devices[i]); VIR_FREE(devices); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ @@ -3969,16 +4022,20 @@ libvirt_virNodeDeviceListCaps(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(c_retval)) == NULL) goto cleanup; - if (names) { + if (names) for (i = 0; i < c_retval; i++) - PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); - } + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_constcharPtrWrap(names[i]), error); cleanup: for (i = 0; i < c_retval; i++) VIR_FREE(names[i]); VIR_FREE(names); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } static PyObject * @@ -4096,7 +4153,8 @@ libvirt_virConnectListSecrets(PyObject *self ATTRIBUTE_UNUSED, if (uuids) { for (i = 0; i < c_retval; i++) - PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(uuids[i])); + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_constcharPtrWrap(uuids[i]), error); } cleanup: @@ -4104,6 +4162,10 @@ libvirt_virConnectListSecrets(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(uuids[i]); VIR_FREE(uuids); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #if LIBVIR_CHECK_VERSION(0, 10, 2) @@ -4135,12 +4197,8 @@ libvirt_virConnectListAllSecrets(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; for (i = 0; i < c_retval; i++) { - if (!(tmp = libvirt_virSecretPtrWrap(secrets[i])) || - PyList_SetItem(py_retval, i, tmp) < 0) { - Py_XDECREF(tmp); - Py_CLEAR(py_retval); - goto cleanup; - } + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_virSecretPtrWrap(secrets[i]), error); /* python steals the pointer */ secrets[i] = NULL; } @@ -4151,6 +4209,10 @@ libvirt_virConnectListAllSecrets(PyObject *self ATTRIBUTE_UNUSED, virSecretFree(secrets[i]); VIR_FREE(secrets); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ @@ -4323,16 +4385,20 @@ libvirt_virConnectListNWFilters(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(c_retval)) == NULL) goto cleanup; - if (uuids) { + if (uuids) for (i = 0; i < c_retval; i++) - PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(uuids[i])); - } + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_constcharPtrWrap(uuids[i]), error); cleanup: for (i = 0; i < c_retval; i++) VIR_FREE(uuids[i]); VIR_FREE(uuids); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #if LIBVIR_CHECK_VERSION(0, 10, 2) @@ -4364,12 +4430,8 @@ libvirt_virConnectListAllNWFilters(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; for (i = 0; i < c_retval; i++) { - if (!(tmp = libvirt_virNWFilterPtrWrap(filters[i])) || - PyList_SetItem(py_retval, i, tmp) < 0) { - Py_XDECREF(tmp); - Py_CLEAR(py_retval); - goto cleanup; - } + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_virNWFilterPtrWrap(filters[i]), error); /* python steals the pointer */ filters[i] = NULL; } @@ -4380,6 +4442,10 @@ libvirt_virConnectListAllNWFilters(PyObject *self ATTRIBUTE_UNUSED, virNWFilterFree(filters[i]); VIR_FREE(filters); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ @@ -4422,16 +4488,20 @@ libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(c_retval)) == NULL) goto cleanup; - if (names) { + if (names) for (i = 0; i < c_retval; i++) - PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); - } + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_constcharPtrWrap(names[i]), error); cleanup: for (i = 0; i < c_retval; i++) VIR_FREE(names[i]); VIR_FREE(names); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } @@ -4476,7 +4546,8 @@ libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED, if (names) { for (i = 0; i < c_retval; i++) - PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i])); + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_constcharPtrWrap(names[i]), error); } cleanup: @@ -4484,6 +4555,10 @@ libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(names[i]); VIR_FREE(names); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } @@ -4516,12 +4591,8 @@ libvirt_virConnectListAllInterfaces(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; for (i = 0; i < c_retval; i++) { - if (!(tmp = libvirt_virInterfacePtrWrap(ifaces[i])) || - PyList_SetItem(py_retval, i, tmp) < 0) { - Py_XDECREF(tmp); - Py_CLEAR(py_retval); - goto cleanup; - } + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_virInterfacePtrWrap(ifaces[i]), error); /* python steals the pointer */ ifaces[i] = NULL; } @@ -4532,6 +4603,10 @@ libvirt_virConnectListAllInterfaces(PyObject *self ATTRIBUTE_UNUSED, virInterfaceFree(ifaces[i]); VIR_FREE(ifaces); return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } #endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ @@ -4612,20 +4687,36 @@ libvirt_virDomainGetJobInfo(PyObject *self ATTRIBUTE_UNUSED, if ((py_retval = PyList_New(12)) == NULL) return NULL; - PyList_SetItem(py_retval, 0, libvirt_intWrap((int) info.type)); - PyList_SetItem(py_retval, 1, libvirt_ulonglongWrap(info.timeElapsed)); - PyList_SetItem(py_retval, 2, libvirt_ulonglongWrap(info.timeRemaining)); - PyList_SetItem(py_retval, 3, libvirt_ulonglongWrap(info.dataTotal)); - PyList_SetItem(py_retval, 4, libvirt_ulonglongWrap(info.dataProcessed)); - PyList_SetItem(py_retval, 5, libvirt_ulonglongWrap(info.dataRemaining)); - PyList_SetItem(py_retval, 6, libvirt_ulonglongWrap(info.memTotal)); - PyList_SetItem(py_retval, 7, libvirt_ulonglongWrap(info.memProcessed)); - PyList_SetItem(py_retval, 8, libvirt_ulonglongWrap(info.memRemaining)); - PyList_SetItem(py_retval, 9, libvirt_ulonglongWrap(info.fileTotal)); - PyList_SetItem(py_retval, 10, libvirt_ulonglongWrap(info.fileProcessed)); - PyList_SetItem(py_retval, 11, libvirt_ulonglongWrap(info.fileRemaining)); + VIR_PY_LIST_SET_GOTO(py_retval, 0, + libvirt_intWrap((int) info.type), error); + VIR_PY_LIST_SET_GOTO(py_retval, 1, + libvirt_ulonglongWrap(info.timeElapsed), error); + VIR_PY_LIST_SET_GOTO(py_retval, 2, + libvirt_ulonglongWrap(info.timeRemaining), error); + VIR_PY_LIST_SET_GOTO(py_retval, 3, + libvirt_ulonglongWrap(info.dataTotal), error); + VIR_PY_LIST_SET_GOTO(py_retval, 4, + libvirt_ulonglongWrap(info.dataProcessed), error); + VIR_PY_LIST_SET_GOTO(py_retval, 5, + libvirt_ulonglongWrap(info.dataRemaining), error); + VIR_PY_LIST_SET_GOTO(py_retval, 6, + libvirt_ulonglongWrap(info.memTotal), error); + VIR_PY_LIST_SET_GOTO(py_retval, 7, + libvirt_ulonglongWrap(info.memProcessed), error); + VIR_PY_LIST_SET_GOTO(py_retval, 8, + libvirt_ulonglongWrap(info.memRemaining), error); + VIR_PY_LIST_SET_GOTO(py_retval, 9, + libvirt_ulonglongWrap(info.fileTotal), error); + VIR_PY_LIST_SET_GOTO(py_retval, 10, + libvirt_ulonglongWrap(info.fileProcessed), error); + VIR_PY_LIST_SET_GOTO(py_retval, 11, + libvirt_ulonglongWrap(info.fileRemaining), error); return py_retval; + + error: + Py_DECREF(py_retval); + return NULL; } #if LIBVIR_CHECK_VERSION(1, 0, 3) @@ -4984,10 +5075,7 @@ libvirt_virDomainInterfaceAddresses(PyObject *self ATTRIBUTE_UNUSED, if (!py_addr) goto error; - if (PyList_SetItem(py_addrs, j, py_addr) < 0) { - Py_DECREF(py_addr); - goto error; - } + VIR_PY_LIST_SET_GOTO(py_addrs, j, py_addr, error); if ((py_iname = libvirt_constcharPtrWrap("addr")) == NULL || (py_ivalue = libvirt_constcharPtrWrap(addr->addr)) == NULL || @@ -6114,7 +6202,7 @@ libvirt_virConnectDomainEventGraphicsCallback(virConnectPtr conn ATTRIBUTE_UNUSE if (pair == NULL) goto cleanup; - PyList_SetItem(pyobj_subject, i, pair); + VIR_PY_LIST_SET_GOTO(pyobj_subject, i, pair, cleanup); VIR_PY_TUPLE_SET_GOTO(pair, 0, libvirt_constcharPtrWrap(subject->identities[i].type), @@ -7682,12 +7770,9 @@ libvirt_virNodeGetCPUMap(PyObject *self ATTRIBUTE_UNUSED, VIR_PY_TUPLE_SET_GOTO(ret, 1, pycpumap, error); - for (i = 0; i < i_retval; i++) { - if ((pyused = PyBool_FromLong(VIR_CPU_USED(cpumap, i))) == NULL) - goto error; - if (PyList_SetItem(pycpumap, i, pyused) < 0) - goto error; - } + for (i = 0; i < i_retval; i++) + VIR_PY_LIST_SET_GOTO(pycpumap, i, + PyBool_FromLong(VIR_CPU_USED(cpumap, i)), error); /* 2: number of online CPUs */ VIR_PY_TUPLE_SET_GOTO(ret, 2, libvirt_uintWrap(online), error); @@ -8143,8 +8228,7 @@ libvirt_virNetworkGetDHCPLeases(PyObject *self ATTRIBUTE_UNUSED, if ((py_lease = PyDict_New()) == NULL) goto error; - if (PyList_SetItem(py_retval, i, py_lease) < 0) - goto error; + VIR_PY_LIST_SET_GOTO(py_retval, i, py_lease, error); #define VIR_SET_LEASE_ITEM(NAME, VALUE_OBJ_FUNC) \ do { \ @@ -8207,11 +8291,8 @@ convertDomainStatsRecord(virDomainStatsRecordPtr *records, if (!(py_record = PyTuple_New(2))) goto error; - if (PyList_SetItem(py_retval, i, py_record) < 0) - goto error; + VIR_PY_LIST_SET_GOTO(py_retval, i, py_record, error); - /* libvirt_virDomainPtrWrap steals the object */ - virDomainRef(records[i]->dom); VIR_PY_TUPLE_SET_GOTO(py_record, 0, libvirt_virDomainPtrWrap(records[i]->dom), error); @@ -8453,7 +8534,7 @@ libvirt_virDomainGetFSInfo(PyObject *self ATTRIBUTE_UNUSED, if (info == NULL) goto error; - PyList_SetItem(py_retval, i, info); + VIR_PY_LIST_SET_GOTO(py_retval, i, info, error); VIR_PY_TUPLE_SET_GOTO(info, 0, libvirt_constcharPtrWrap(fs->mountpoint), error); @@ -8468,9 +8549,9 @@ libvirt_virDomainGetFSInfo(PyObject *self ATTRIBUTE_UNUSED, VIR_PY_TUPLE_SET_GOTO(info, 3, alias, error); for (j = 0; j < fs->ndevAlias; j++) - if (PyList_Append(alias, - libvirt_constcharPtrWrap(fs->devAlias[j])) < 0) - goto error; + VIR_PY_LIST_APPEND_GOTO(alias, + libvirt_constcharPtrWrap(fs->devAlias[j]), + error); } cleanup: -- 2.5.3

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- libvirt-override.c | 275 +++++++++++++++++++---------------------------------- libvirt-utils.c | 13 +-- 2 files changed, 99 insertions(+), 189 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 1f795d9..3192e74 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -403,18 +403,14 @@ libvirt_virDomainMemoryStats(PyObject *self ATTRIBUTE_UNUSED, } val = libvirt_ulonglongWrap(stats[i].val); - if (!key || !val || PyDict_SetItem(info, key, val) < 0) { - Py_CLEAR(info); - goto cleanup; - } - Py_CLEAR(key); - Py_CLEAR(val); + VIR_PY_DICT_SET_GOTO(info, key, val, error); } - cleanup: - Py_XDECREF(key); - Py_XDECREF(val); return info; + + error: + Py_DECREF(info); + return NULL; } static PyObject * @@ -3358,23 +3354,16 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, key = libvirt_constcharPtrWrap(stats[i].field); val = libvirt_ulonglongWrap(stats[i].value); - if (!key || !val || PyDict_SetItem(ret, key, val) < 0) { - Py_CLEAR(ret); - goto error; - } - - Py_DECREF(key); - Py_DECREF(val); + VIR_PY_DICT_SET_GOTO(ret, key, val, error); } + cleanup: VIR_FREE(stats); return ret; error: - VIR_FREE(stats); - Py_XDECREF(key); - Py_XDECREF(val); - return ret; + Py_CLEAR(ret); + goto cleanup; } static PyObject * @@ -3423,23 +3412,16 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, key = libvirt_constcharPtrWrap(stats[i].field); val = libvirt_ulonglongWrap(stats[i].value); - if (!key || !val || PyDict_SetItem(ret, key, val) < 0) { - Py_CLEAR(ret); - goto error; - } - - Py_DECREF(key); - Py_DECREF(val); + VIR_PY_DICT_SET_GOTO(ret, key, val, error); } + cleanup: VIR_FREE(stats); return ret; error: - VIR_FREE(stats); - Py_XDECREF(key); - Py_XDECREF(val); - return ret; + Py_CLEAR(ret); + goto cleanup; } static PyObject * @@ -4747,11 +4729,8 @@ libvirt_virDomainGetJobStats(PyObject *self ATTRIBUTE_UNUSED, if (!(dict = getPyVirTypedParameter(params, nparams))) goto cleanup; - if (PyDict_SetItem(dict, libvirt_constcharPtrWrap("type"), - libvirt_intWrap(type)) < 0) { - Py_CLEAR(dict); - goto cleanup; - } + VIR_PY_DICT_SET_GOTO(dict, libvirt_constcharPtrWrap("type"), + libvirt_intWrap(type), cleanup); cleanup: virTypedParamsFree(params, nparams); @@ -4790,34 +4769,19 @@ libvirt_virDomainGetBlockJobInfo(PyObject *self ATTRIBUTE_UNUSED, if (c_ret == 0) return dict; - if ((type = libvirt_intWrap(info.type)) == NULL || - PyDict_SetItemString(dict, "type", type) < 0) - goto error; - Py_DECREF(type); - - if ((bandwidth = libvirt_ulongWrap(info.bandwidth)) == NULL || - PyDict_SetItemString(dict, "bandwidth", bandwidth) < 0) - goto error; - Py_DECREF(bandwidth); - - if ((cur = libvirt_ulonglongWrap(info.cur)) == NULL || - PyDict_SetItemString(dict, "cur", cur) < 0) - goto error; - Py_DECREF(cur); - - if ((end = libvirt_ulonglongWrap(info.end)) == NULL || - PyDict_SetItemString(dict, "end", end) < 0) - goto error; - Py_DECREF(end); + VIR_PY_DICT_SET_GOTO(dict, libvirt_constcharPtrWrap("type"), + libvirt_intWrap(info.type), error); + VIR_PY_DICT_SET_GOTO(dict, libvirt_constcharPtrWrap("bandwidth"), + libvirt_ulongWrap(info.bandwidth), error); + VIR_PY_DICT_SET_GOTO(dict, libvirt_constcharPtrWrap("cur"), + libvirt_ulonglongWrap(info.cur), error); + VIR_PY_DICT_SET_GOTO(dict, libvirt_constcharPtrWrap("end"), + libvirt_ulonglongWrap(info.end), error); return dict; error: Py_DECREF(dict); - Py_XDECREF(type); - Py_XDECREF(bandwidth); - Py_XDECREF(cur); - Py_XDECREF(end); return NULL; } @@ -4983,9 +4947,10 @@ libvirt_virDomainGetDiskErrors(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; for (i = 0; i < count; i++) { - PyDict_SetItem(py_retval, - libvirt_constcharPtrWrap(disks[i].disk), - libvirt_intWrap(disks[i].error)); + VIR_PY_DICT_SET_GOTO(py_retval, + libvirt_constcharPtrWrap(disks[i].disk), + libvirt_intWrap(disks[i].error), + error); } cleanup: @@ -4995,6 +4960,10 @@ libvirt_virDomainGetDiskErrors(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(disks); } return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; } @@ -5038,12 +5007,8 @@ libvirt_virDomainInterfaceAddresses(PyObject *self ATTRIBUTE_UNUSED, if (!(py_iface = PyDict_New())) goto error; - if ((py_iname = libvirt_charPtrWrap(iface->name)) == NULL || - PyDict_SetItem(py_retval, py_iname, py_iface) < 0) { - Py_XDECREF(py_iname); - Py_DECREF(py_iface); - goto error; - } + VIR_PY_DICT_SET_GOTO(py_retval, libvirt_charPtrWrap(iface->name), + py_iface, error); if (iface->naddrs) { if (!(py_addrs = PyList_New(iface->naddrs))) { @@ -5053,20 +5018,11 @@ libvirt_virDomainInterfaceAddresses(PyObject *self ATTRIBUTE_UNUSED, py_addrs = VIR_PY_NONE; } - if ((py_iname = libvirt_constcharPtrWrap("addrs")) == NULL || - PyDict_SetItem(py_iface, py_iname, py_addrs) < 0) { - Py_XDECREF(py_iname); - Py_DECREF(py_addrs); - goto error; - } + VIR_PY_DICT_SET_GOTO(py_iface, libvirt_constcharPtrWrap("addrs"), + py_addrs, error); - if ((py_iname = libvirt_constcharPtrWrap("hwaddr")) == NULL || - (py_ivalue = libvirt_constcharPtrWrap(iface->hwaddr)) == NULL || - PyDict_SetItem(py_iface, py_iname, py_ivalue) < 0) { - Py_XDECREF(py_iname); - Py_XDECREF(py_ivalue); - goto error; - } + VIR_PY_DICT_SET_GOTO(py_iface, libvirt_constcharPtrWrap("hwaddr"), + libvirt_constcharPtrWrap(iface->hwaddr), error); for (j = 0; j < iface->naddrs; j++) { virDomainIPAddressPtr addr = &(iface->addrs[j]); @@ -5077,27 +5033,12 @@ libvirt_virDomainInterfaceAddresses(PyObject *self ATTRIBUTE_UNUSED, VIR_PY_LIST_SET_GOTO(py_addrs, j, py_addr, error); - if ((py_iname = libvirt_constcharPtrWrap("addr")) == NULL || - (py_ivalue = libvirt_constcharPtrWrap(addr->addr)) == NULL || - PyDict_SetItem(py_addr, py_iname, py_ivalue) < 0) { - Py_XDECREF(py_iname); - Py_XDECREF(py_ivalue); - goto error; - } - if ((py_iname = libvirt_constcharPtrWrap("prefix")) == NULL || - (py_ivalue = libvirt_intWrap(addr->prefix)) == NULL || - PyDict_SetItem(py_addr, py_iname, py_ivalue) < 0) { - Py_XDECREF(py_iname); - Py_XDECREF(py_ivalue); - goto error; - } - if ((py_iname = libvirt_constcharPtrWrap("type")) == NULL || - (py_ivalue = libvirt_intWrap(addr->type)) == NULL || - PyDict_SetItem(py_addr, py_iname, py_ivalue) < 0) { - Py_XDECREF(py_iname); - Py_XDECREF(py_ivalue); - goto error; - } + VIR_PY_DICT_SET_GOTO(py_addr, libvirt_constcharPtrWrap("addr"), + libvirt_constcharPtrWrap(addr->addr), error); + VIR_PY_DICT_SET_GOTO(py_addr, libvirt_constcharPtrWrap("prefix"), + libvirt_uintWrap(addr->prefix), error); + VIR_PY_DICT_SET_GOTO(py_addr, libvirt_constcharPtrWrap("type"), + libvirt_intWrap(addr->type), error); } } @@ -6171,28 +6112,34 @@ libvirt_virConnectDomainEventGraphicsCallback(virConnectPtr conn ATTRIBUTE_UNUSE if ((pyobj_local = PyDict_New()) == NULL) goto cleanup; - PyDict_SetItem(pyobj_local, - libvirt_constcharPtrWrap("family"), - libvirt_intWrap(local->family)); - PyDict_SetItem(pyobj_local, - libvirt_constcharPtrWrap("node"), - libvirt_constcharPtrWrap(local->node)); - PyDict_SetItem(pyobj_local, - libvirt_constcharPtrWrap("service"), - libvirt_constcharPtrWrap(local->service)); + VIR_PY_DICT_SET_GOTO(pyobj_local, + libvirt_constcharPtrWrap("family"), + libvirt_intWrap(local->family), + cleanup); + VIR_PY_DICT_SET_GOTO(pyobj_local, + libvirt_constcharPtrWrap("node"), + libvirt_constcharPtrWrap(local->node), + cleanup); + VIR_PY_DICT_SET_GOTO(pyobj_local, + libvirt_constcharPtrWrap("service"), + libvirt_constcharPtrWrap(local->service), + cleanup); if ((pyobj_remote = PyDict_New()) == NULL) goto cleanup; - PyDict_SetItem(pyobj_remote, - libvirt_constcharPtrWrap("family"), - libvirt_intWrap(remote->family)); - PyDict_SetItem(pyobj_remote, - libvirt_constcharPtrWrap("node"), - libvirt_constcharPtrWrap(remote->node)); - PyDict_SetItem(pyobj_remote, - libvirt_constcharPtrWrap("service"), - libvirt_constcharPtrWrap(remote->service)); + VIR_PY_DICT_SET_GOTO(pyobj_remote, + libvirt_constcharPtrWrap("family"), + libvirt_intWrap(remote->family), + cleanup); + VIR_PY_DICT_SET_GOTO(pyobj_remote, + libvirt_constcharPtrWrap("node"), + libvirt_constcharPtrWrap(remote->node), + cleanup); + VIR_PY_DICT_SET_GOTO(pyobj_remote, + libvirt_constcharPtrWrap("service"), + libvirt_constcharPtrWrap(remote->service), + cleanup); if ((pyobj_subject = PyList_New(subject->nidentity)) == NULL) goto cleanup; @@ -8011,15 +7958,10 @@ libvirt_virDomainGetTime(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; } - if (!(pyobj_seconds = libvirt_longlongWrap(seconds)) || - PyDict_SetItemString(dict, "seconds", pyobj_seconds) < 0) - goto cleanup; - Py_DECREF(pyobj_seconds); - - if (!(pyobj_nseconds = libvirt_uintWrap(nseconds)) || - PyDict_SetItemString(dict, "nseconds", pyobj_nseconds) < 0) - goto cleanup; - Py_DECREF(pyobj_nseconds); + VIR_PY_DICT_SET_GOTO(dict, libvirt_constcharPtrWrap("seconds"), + libvirt_longlongWrap(seconds), cleanup); + VIR_PY_DICT_SET_GOTO(dict, libvirt_constcharPtrWrap("nseconds"), + libvirt_longlongWrap(nseconds), cleanup); py_retval = dict; dict = NULL; @@ -8148,35 +8090,18 @@ libvirt_virNodeGetFreePages(PyObject *self ATTRIBUTE_UNUSED, for (i = 0; i < c_retval;) { PyObject *per_node = NULL; - PyObject *node = NULL; - if (!(per_node = PyDict_New()) || - !(node = libvirt_intWrap(startCell + i/pyobj_pagesize_size))) { - Py_XDECREF(per_node); - Py_XDECREF(node); + if (!(per_node = PyDict_New())) goto cleanup; - } - if (PyDict_SetItem(pyobj_counts, node, per_node) < 0) { - Py_XDECREF(per_node); - Py_XDECREF(node); - goto cleanup; - } + VIR_PY_DICT_SET_GOTO(pyobj_counts, + libvirt_intWrap(startCell + i/pyobj_pagesize_size), + per_node, cleanup); + + for (j = 0; j < pyobj_pagesize_size; j ++) + VIR_PY_DICT_SET_GOTO(per_node, libvirt_intWrap(pages[j]), + libvirt_intWrap(counts[i + j]), cleanup); - for (j = 0; j < pyobj_pagesize_size; j ++) { - PyObject *page = NULL; - PyObject *count = NULL; - - if (!(page = libvirt_intWrap(pages[j])) || - !(count = libvirt_intWrap(counts[i + j])) || - PyDict_SetItem(per_node, page, count) < 0) { - Py_XDECREF(page); - Py_XDECREF(count); - Py_XDECREF(per_node); - Py_XDECREF(node); - goto cleanup; - } - } i += pyobj_pagesize_size; } @@ -8230,30 +8155,24 @@ libvirt_virNetworkGetDHCPLeases(PyObject *self ATTRIBUTE_UNUSED, VIR_PY_LIST_SET_GOTO(py_retval, i, py_lease, error); -#define VIR_SET_LEASE_ITEM(NAME, VALUE_OBJ_FUNC) \ - do { \ - PyObject *tmp_val; \ - \ - if (!(tmp_val = VALUE_OBJ_FUNC)) \ - goto error; \ - \ - if (PyDict_SetItemString(py_lease, NAME, tmp_val) < 0) { \ - Py_DECREF(tmp_val); \ - goto error; \ - } \ - } while (0) - - VIR_SET_LEASE_ITEM("iface", libvirt_charPtrWrap(lease->iface)); - VIR_SET_LEASE_ITEM("expirytime", libvirt_longlongWrap(lease->expirytime)); - VIR_SET_LEASE_ITEM("type", libvirt_intWrap(lease->type)); - VIR_SET_LEASE_ITEM("mac", libvirt_charPtrWrap(lease->mac)); - VIR_SET_LEASE_ITEM("ipaddr", libvirt_charPtrWrap(lease->ipaddr)); - VIR_SET_LEASE_ITEM("prefix", libvirt_uintWrap(lease->prefix)); - VIR_SET_LEASE_ITEM("hostname", libvirt_charPtrWrap(lease->hostname)); - VIR_SET_LEASE_ITEM("clientid", libvirt_charPtrWrap(lease->clientid)); - VIR_SET_LEASE_ITEM("iaid", libvirt_charPtrWrap(lease->iaid)); - -#undef VIR_SET_LEASE_ITEM + VIR_PY_DICT_SET_GOTO(py_lease, libvirt_constcharPtrWrap("iface"), + libvirt_charPtrWrap(lease->iface), error); + VIR_PY_DICT_SET_GOTO(py_lease, libvirt_constcharPtrWrap("expirytime"), + libvirt_longlongWrap(lease->expirytime), error); + VIR_PY_DICT_SET_GOTO(py_lease, libvirt_constcharPtrWrap("type"), + libvirt_intWrap(lease->type), error); + VIR_PY_DICT_SET_GOTO(py_lease, libvirt_constcharPtrWrap("mac"), + libvirt_charPtrWrap(lease->mac), error); + VIR_PY_DICT_SET_GOTO(py_lease, libvirt_constcharPtrWrap("ipaddr"), + libvirt_charPtrWrap(lease->ipaddr), error); + VIR_PY_DICT_SET_GOTO(py_lease, libvirt_constcharPtrWrap("prefix"), + libvirt_uintWrap(lease->prefix), error); + VIR_PY_DICT_SET_GOTO(py_lease, libvirt_constcharPtrWrap("hostname"), + libvirt_charPtrWrap(lease->hostname), error); + VIR_PY_DICT_SET_GOTO(py_lease, libvirt_constcharPtrWrap("clientid"), + libvirt_charPtrWrap(lease->clientid), error); + VIR_PY_DICT_SET_GOTO(py_lease, libvirt_constcharPtrWrap("iaid"), + libvirt_charPtrWrap(lease->iaid), error); } cleanup: diff --git a/libvirt-utils.c b/libvirt-utils.c index 02a28ac..2bf7519 100644 --- a/libvirt-utils.c +++ b/libvirt-utils.c @@ -267,22 +267,13 @@ getPyVirTypedParameter(const virTypedParameter *params, } key = libvirt_constcharPtrWrap(params[i].field); - if (!key || !val) - goto cleanup; - - if (PyDict_SetItem(info, key, val) < 0) { - Py_DECREF(info); - goto cleanup; - } - Py_DECREF(key); - Py_DECREF(val); + VIR_PY_DICT_SET_GOTO(info, key, val, cleanup); } return info; cleanup: - Py_XDECREF(key); - Py_XDECREF(val); + Py_DECREF(info); return NULL; } -- 2.5.3

On Sat, Sep 26, 2015 at 10:46:13AM -0400, John Ferlan wrote: Right, I'll fix that. If you are sure, that dict != NULL, you can use Py_DECREF, if dict can by null, you must use Py_XDECREF. Py_CLEAR is used only in case, that you need to decrement the dict and also set it to NULL. The correct one is Py_DECREF, becasue we know, that dict != null and we don't need to set it to null. Pavel

On 09/24/2015 10:02 AM, Pavel Hrdina wrote: My turn to make the obvious question... Have you asked the Coverity folks? This just seems very strange. I agree it seems to be a false positive, but something isn't adding up. John