[PATCHv3] virNodeGetCPUMap: Add python binding

[Viktor Mihajlovski <mihajlov@xxxxxxxxxxxxxxxxxx>]

Added a method getCPUMap to virConnect.
It can be used as follows:

import libvirt
import sys
import os

conn = libvirt.openReadOnly(None)
if conn == None:
    print 'Failed to open connection to the hypervisor'
    sys.exit(1)

try:
    (cpus, cpumap, online) = conn.getCPUMap(0)
except:
    print 'Failed to extract the node cpu map information'
    sys.exit(1)

print 'CPUs total %d, online %d' % (cpus, online)
print 'CPU map %s' % str(cpumap)

del conn
print "OK"

sys.exit(0)

Signed-off-by: Viktor Mihajlovski <mihajlov@xxxxxxxxxxxxxxxxxx>
---

Rework of patch 9/9 of initial virNodeGetCPUMap series.
 squashed in Eric Blake's changes
 added missing error handling
 reordered return value processing
Note: The code is a bit verbose, e.g. the NULL checks,
but that seems to be the prevailing style here.

---
 python/libvirt-override-api.xml |    6 +++
 python/libvirt-override.c       |   70 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 0 deletions(-)

diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml
index b76fb4e..e54701c 100644
--- a/python/libvirt-override-api.xml
+++ b/python/libvirt-override-api.xml
@@ -542,5 +542,11 @@
       <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/>
       <arg name='flags' type='int' info='unused, always pass 0'/>
     </function>
+    <function name='virNodeGetCPUMap' file='python'>
+      <info>Get node CPU information</info>
+      <return type='str *' info='(cpunum, online, cpumap) on success, None on error'/>
+      <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/>
+      <arg name='flags' type='int' info='unused, pass 0'/>
+    </function>
   </symbols>
 </api>
diff --git a/python/libvirt-override.c b/python/libvirt-override.c
index 83dc925..0609803 100644
--- a/python/libvirt-override.c
+++ b/python/libvirt-override.c
@@ -6397,6 +6397,75 @@ cleanup:
     return ret;
 }
 
+static PyObject *
+libvirt_virNodeGetCPUMap(PyObject *self ATTRIBUTE_UNUSED,
+                         PyObject *args)
+{
+    virConnectPtr conn;
+    PyObject *pyobj_conn;
+    PyObject *ret = NULL;
+    PyObject *pycpumap = NULL;
+    PyObject *pyused = NULL;
+    PyObject *pycpunum = NULL;
+    PyObject *pyonline = NULL;
+    int i_retval;
+    unsigned char *cpumap = NULL;
+    unsigned int online = 0;
+    unsigned int flags;
+    int i;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oi:virNodeGetCPUMap",
+                          &pyobj_conn, &flags))
+        return NULL;
+    conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
+
+    LIBVIRT_BEGIN_ALLOW_THREADS;
+    i_retval = virNodeGetCPUMap(conn, &cpumap, &online, flags);
+    LIBVIRT_END_ALLOW_THREADS;
+
+    if (i_retval < 0)
+        return VIR_PY_NONE;
+
+    if ((ret = PyTuple_New(3)) == NULL)
+        goto error;
+
+    /* 0: number of CPUs */
+    if ((pycpunum = PyLong_FromLong(i_retval)) == NULL ||
+        PyTuple_SetItem(ret, 0, pycpunum) < 0)
+        goto error;
+
+    /* 1: CPU map */
+    if ((pycpumap = PyList_New(i_retval)) == NULL)
+        goto 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;
+    }
+
+    if (PyTuple_SetItem(ret, 1, pycpumap) < 0)
+        goto error;
+
+    /* 2: number of online CPUs */
+    if((pyonline = PyLong_FromLong(online)) == NULL ||
+       PyTuple_SetItem(ret, 2, pyonline) < 0)
+        goto error;
+
+cleanup:
+    VIR_FREE(cpumap);
+    return ret;
+error:
+    Py_XDECREF(ret);
+    Py_XDECREF(pycpumap);
+    Py_XDECREF(pyused);
+    Py_XDECREF(pycpunum);
+    Py_XDECREF(pyonline);
+    ret = NULL;
+    goto cleanup;
+}
+
 
 /************************************************************************
  *									*
@@ -6514,6 +6583,7 @@ static PyMethodDef libvirtMethods[] = {
     {(char *) "virDomainGetDiskErrors", libvirt_virDomainGetDiskErrors, METH_VARARGS, NULL},
     {(char *) "virNodeGetMemoryParameters", libvirt_virNodeGetMemoryParameters, METH_VARARGS, NULL},
     {(char *) "virNodeSetMemoryParameters", libvirt_virNodeSetMemoryParameters, METH_VARARGS, NULL},
+    {(char *) "virNodeGetCPUMap", libvirt_virNodeGetCPUMap, METH_VARARGS, NULL},
     {NULL, NULL, 0, NULL}
 };
 
-- 
1.7.0.4

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list