summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOsier Yang <jyang@redhat.com>2012-09-05 13:34:11 +0800
committerOsier Yang <jyang@redhat.com>2012-09-17 10:41:03 +0800
commitc9f08903d4bc4ebada4280781ea41fa61f5e8b2d (patch)
treea4c3868938f19835f3a567214827b9f7ffe5c943
parentcb41d86c6c79dac1ab6440a5ce49945e09b0322d (diff)
downloadlibvirt-python-split-c9f08903d4bc4ebada4280781ea41fa61f5e8b2d.zip
libvirt-python-split-c9f08903d4bc4ebada4280781ea41fa61f5e8b2d.tar.gz
libvirt-python-split-c9f08903d4bc4ebada4280781ea41fa61f5e8b2d.tar.xz
list: Expose virConnectListAllNodeDevices 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-virConnect.py: * Implementation for listAllNodeDevices. python/libvirt-override.c: Implementation for the wrapper.
-rw-r--r--libvirt-override-api.xml6
-rw-r--r--libvirt-override-virConnect.py12
-rw-r--r--libvirt-override.c48
3 files changed, 66 insertions, 0 deletions
diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml
index ab6f407..a3d6bbb 100644
--- a/libvirt-override-api.xml
+++ b/libvirt-override-api.xml
@@ -346,6 +346,12 @@
<arg name='flags' type='unsigned int' info='flags (unused; pass 0)'/>
<return type='str *' info='the list of Names or None in case of error'/>
</function>
+ <function name='virConnectListAllNodeDevices' file='python'>
+ <info>returns list of all host node devices</info>
+ <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/>
+ <arg name='flags' type='unsigned int' info='optional flags'/>
+ <return type='device *' info='the list of host node device or None in case of error'/>
+ </function>
<function name='virNodeDeviceListCaps' file='python'>
<info>list the node device's capabilities</info>
<arg name='dev' type='virNodeDevicePtr' info='pointer to the node device'/>
diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py
index ffa1a3c..0859c36 100644
--- a/libvirt-override-virConnect.py
+++ b/libvirt-override-virConnect.py
@@ -242,3 +242,15 @@
retlist.append(virInterface(self, _obj=ifaceptr))
return retlist
+
+ def listAllDevices(self, flags):
+ """Returns a list of host node device objects"""
+ ret = libvirtmod.virConnectListAllNodeDevices(self._o, flags)
+ if ret is None:
+ raise libvirtError("virConnectListAllNodeDevices() failed", conn=self)
+
+ retlist = list()
+ for devptr in ret:
+ retlist.append(virNodeDevice(self, _obj=devptr))
+
+ return retlist
diff --git a/libvirt-override.c b/libvirt-override.c
index d07e7cb..426d57e 100644
--- a/libvirt-override.c
+++ b/libvirt-override.c
@@ -3387,6 +3387,53 @@ libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED,
}
static PyObject *
+libvirt_virConnectListAllNodeDevices(PyObject *self ATTRIBUTE_UNUSED,
+ PyObject *args)
+{
+ PyObject *pyobj_conn;
+ PyObject *py_retval = NULL;
+ PyObject *tmp = NULL;
+ virConnectPtr conn;
+ virNodeDevicePtr *devices = NULL;
+ int c_retval = 0;
+ int i;
+ unsigned int flags;
+
+ if (!PyArg_ParseTuple(args, (char *)"Oi:virConnectListAllNodeDevices",
+ &pyobj_conn, &flags))
+ return NULL;
+ conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
+
+ LIBVIRT_BEGIN_ALLOW_THREADS;
+ c_retval = virConnectListAllNodeDevices(conn, &devices, 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_virNodeDevicePtrWrap(devices[i])) ||
+ PyList_SetItem(py_retval, i, tmp) < 0) {
+ Py_XDECREF(tmp);
+ Py_DECREF(py_retval);
+ py_retval = NULL;
+ goto cleanup;
+ }
+ /* python steals the pointer */
+ devices[i] = NULL;
+ }
+
+cleanup:
+ for (i = 0; i < c_retval; i++)
+ if (devices[i])
+ virNodeDeviceFree(devices[i]);
+ VIR_FREE(devices);
+ return py_retval;
+}
+
+static PyObject *
libvirt_virNodeDeviceListCaps(PyObject *self ATTRIBUTE_UNUSED,
PyObject *args) {
PyObject *py_retval;
@@ -6087,6 +6134,7 @@ static PyMethodDef libvirtMethods[] = {
{(char *) "virEventInvokeHandleCallback", libvirt_virEventInvokeHandleCallback, METH_VARARGS, NULL},
{(char *) "virEventInvokeTimeoutCallback", libvirt_virEventInvokeTimeoutCallback, METH_VARARGS, NULL},
{(char *) "virNodeListDevices", libvirt_virNodeListDevices, METH_VARARGS, NULL},
+ {(char *) "virConnectListAllNodeDevices", libvirt_virConnectListAllNodeDevices, METH_VARARGS, NULL},
{(char *) "virNodeDeviceListCaps", libvirt_virNodeDeviceListCaps, METH_VARARGS, NULL},
{(char *) "virSecretGetUUID", libvirt_virSecretGetUUID, METH_VARARGS, NULL},
{(char *) "virSecretGetUUIDString", libvirt_virSecretGetUUIDString, METH_VARARGS, NULL},