From a3676b6cb6028b25d9b463be9174a563a8ce7353 Mon Sep 17 00:00:00 2001
From: Osier Yang <jyang@redhat.com>
Date: Wed, 5 Sep 2012 13:34:11 +0800
Subject: [PATCH] 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.
---
 python/libvirt-override-api.xml       |  6 ++++
 python/libvirt-override-virConnect.py | 12 +++++++
 python/libvirt-override.c             | 48 +++++++++++++++++++++++++++
 3 files changed, 66 insertions(+)

diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml
index ab6f407126..a3d6bbb89a 100644
--- a/python/libvirt-override-api.xml
+++ b/python/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/python/libvirt-override-virConnect.py b/python/libvirt-override-virConnect.py
index ffa1a3cbd0..0859c361af 100644
--- a/python/libvirt-override-virConnect.py
+++ b/python/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/python/libvirt-override.c b/python/libvirt-override.c
index d07e7cb452..426d57e317 100644
--- a/python/libvirt-override.c
+++ b/python/libvirt-override.c
@@ -3386,6 +3386,53 @@ libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED,
     return py_retval;
 }
 
+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) {
@@ -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},