summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOsier Yang <jyang@redhat.com>2012-09-04 23:32:58 +0800
committerOsier Yang <jyang@redhat.com>2012-09-10 10:41:18 +0800
commit9b64533be6efc412f6daf9461a3fc0301c351be3 (patch)
treeab3a018eaaaf11ac61512426a31273f607138a1c
parentcc4225c8aceaeb0be9b7a04393f780ecc67ad5f4 (diff)
downloadlibvirt-python-split-9b64533be6efc412f6daf9461a3fc0301c351be3.zip
libvirt-python-split-9b64533be6efc412f6daf9461a3fc0301c351be3.tar.gz
libvirt-python-split-9b64533be6efc412f6daf9461a3fc0301c351be3.tar.xz
list: Expose virStoragePoolListAllVolumes to Python binding
The implementation is done manually as the generator does not support wrapping lists of C pointers into Python objects. python/libvirt-override-api.xml: Document python/libvirt-override-virStoragePool.py: * New file, includes implementation of listAllVolumes. python/libvirt-override.c: Implementation for the wrapper.
-rw-r--r--libvirt-override-api.xml8
-rw-r--r--libvirt-override-virStoragePool.py11
-rw-r--r--libvirt-override.c50
3 files changed, 68 insertions, 1 deletions
diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml
index d16755c..8a228fb 100644
--- a/libvirt-override-api.xml
+++ b/libvirt-override-api.xml
@@ -315,7 +315,13 @@
<function name='virStoragePoolListVolumes' file='python'>
<info>list the storage volumes, stores the pointers to the names in @names</info>
<arg name='pool' type='virStoragePoolPtr' info='pointer to the storage pool'/>
- <return type='str *' info='the list of Names of None in case of error'/>
+ <return type='str *' info='the list of Names or None in case of error'/>
+ </function>
+ <function name='virStoragePoolListAllVolumes' file='python'>
+ <info>return list of storage volume objects</info>
+ <arg name='pool' type='virStoragePoolPtr' info='pointer to the storage pool'/>
+ <arg name='flags' type='unsigned int' info='optional flags'/>
+ <return type='volume *' info='the list of volumes or None in case of error'/>
</function>
<function name='virStoragePoolGetInfo' file='python'>
<info>Extract information about a storage pool. Note that if the connection used to get the domain is limited only a partial set of the information can be extracted.</info>
diff --git a/libvirt-override-virStoragePool.py b/libvirt-override-virStoragePool.py
new file mode 100644
index 0000000..ffe160c
--- /dev/null
+++ b/libvirt-override-virStoragePool.py
@@ -0,0 +1,11 @@
+ def listAllVolumes(self, flags):
+ """List all storage volumes and returns a list of storage volume objects"""
+ ret = libvirtmod.virStoragePoolListAllVolumes(self._o, flags)
+ if ret is None:
+ raise libvirtError("virStoragePoolListAllVolumes() failed", conn=self)
+
+ retlist = list()
+ for volptr in ret:
+ retlist.append(virStorageVol(self, _obj=volptr))
+
+ return retlist
diff --git a/libvirt-override.c b/libvirt-override.c
index ee6a776..c1f8938 100644
--- a/libvirt-override.c
+++ b/libvirt-override.c
@@ -3083,6 +3083,55 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED,
}
static PyObject *
+libvirt_virStoragePoolListAllVolumes(PyObject *self ATTRIBUTE_UNUSED,
+ PyObject *args)
+{
+ PyObject *py_retval = NULL;
+ PyObject *tmp = NULL;
+ virStoragePoolPtr pool;
+ virStorageVolPtr *vols = NULL;
+ int c_retval = 0;
+ int i;
+ unsigned int flags;
+ PyObject *pyobj_pool;
+
+ if (!PyArg_ParseTuple(args, (char *)"Oi:virStoragePoolListAllVolumes",
+ &pyobj_pool, &flags))
+ return NULL;
+
+ pool = (virStoragePoolPtr) PyvirStoragePool_Get(pyobj_pool);
+
+ LIBVIRT_BEGIN_ALLOW_THREADS;
+ c_retval = virStoragePoolListAllVolumes(pool, &vols, flags);
+ LIBVIRT_END_ALLOW_THREADS;
+ if (c_retval < 0)
+ return VIR_PY_NONE;
+
+ if (!(py_retval = PyList_New(c_retval)))
+ 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_DECREF(py_retval);
+ py_retval = NULL;
+ goto cleanup;
+ }
+ /* python steals the pointer */
+ vols[i] = NULL;
+ }
+
+cleanup:
+ for (i = 0; i < c_retval; i++)
+ if (vols[i])
+ virStorageVolFree(vols[i]);
+ VIR_FREE(vols);
+ return py_retval;
+}
+
+
+static PyObject *
libvirt_virStoragePoolGetAutostart(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
PyObject *py_retval;
int c_retval, autostart;
@@ -5927,6 +5976,7 @@ static PyMethodDef libvirtMethods[] = {
{(char *) "virConnectListAllStoragePools", libvirt_virConnectListAllStoragePools, METH_VARARGS, NULL},
{(char *) "virStoragePoolGetAutostart", libvirt_virStoragePoolGetAutostart, METH_VARARGS, NULL},
{(char *) "virStoragePoolListVolumes", libvirt_virStoragePoolListVolumes, METH_VARARGS, NULL},
+ {(char *) "virStoragePoolListAllVolumes", libvirt_virStoragePoolListAllVolumes, METH_VARARGS, NULL},
{(char *) "virStoragePoolGetInfo", libvirt_virStoragePoolGetInfo, METH_VARARGS, NULL},
{(char *) "virStorageVolGetInfo", libvirt_virStorageVolGetInfo, METH_VARARGS, NULL},
{(char *) "virStoragePoolGetUUID", libvirt_virStoragePoolGetUUID, METH_VARARGS, NULL},