diff options
author | 2011-12-29 16:20:00 +0800 | |
---|---|---|
committer | 2011-12-29 16:20:00 +0800 | |
commit | f0293edc3f2f147e04a837d47288253a9991677a (patch) | |
tree | 985aa733e6d5ae5a4778782945df65a9cfd15bbd /python | |
parent | python: Fix problems of virDomain{Set, Get}BlockIoTune bindings (diff) | |
download | libvirt-f0293edc3f2f147e04a837d47288253a9991677a.tar.gz libvirt-f0293edc3f2f147e04a837d47288253a9991677a.tar.bz2 libvirt-f0293edc3f2f147e04a837d47288253a9991677a.zip |
remove a static limit on max domains in python bindings
* python/libvirt-override.c: remove the predefined array in the
virConnectListDomainsID binding and call virConnectNumOfDomains
to do a proper allocation
Diffstat (limited to 'python')
-rw-r--r-- | python/libvirt-override.c | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/python/libvirt-override.c b/python/libvirt-override.c index a704e7824..d2aad0f8d 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1616,7 +1616,7 @@ static PyObject * libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; - int ids[500], c_retval, i; + int *ids = NULL, c_retval, i; virConnectPtr conn; PyObject *pyobj_conn; @@ -1626,14 +1626,33 @@ libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED, conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); LIBVIRT_BEGIN_ALLOW_THREADS; - c_retval = virConnectListDomains(conn, &ids[0], 500); + c_retval = virConnectNumOfDomains(conn); LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) return VIR_PY_NONE; + + if (c_retval) { + ids = malloc(sizeof(*ids) * c_retval); + if (!ids) + return VIR_PY_NONE; + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virConnectListDomains(conn, ids, c_retval); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) { + free(ids); + return VIR_PY_NONE; + } + } py_retval = PyList_New(c_retval); - for (i = 0;i < c_retval;i++) { - PyList_SetItem(py_retval, i, libvirt_intWrap(ids[i])); + + if (ids) { + for (i = 0;i < c_retval;i++) { + PyList_SetItem(py_retval, i, libvirt_intWrap(ids[i])); + } + free(ids); } + return(py_retval); } |