From: Don Dugger <n0ano@n0ano.com>
Date: Sat, 23 Nov 2013 21:15:38 +0000 (-0700)
Subject: Return right error code for baselineCPU
X-Git-Tag: v1.1.3.2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=085e2fe021c5e4c64ca19f0b6ebed51d96c79dc4;p=thirdparty%2Flibvirt.git

Return right error code for baselineCPU

This Python interface code is returning a -1 on errors for the
`baselineCPU' API.  Since this API is supposed to return a pointer
the error return value should really be VIR_PY_NONE.

NB:  I've checked all the other APIs in this file and this is the
only pointer API that is returning -1.

Signed-off-by: Don Dugger <donald.d.dugger@intel.com>

(crobinso: Upstream in libvirt-python.git)
---

diff --git a/python/libvirt-override.c b/python/libvirt-override.c
index 6ae44afe99..3389656b50 100644
--- a/python/libvirt-override.c
+++ b/python/libvirt-override.c
@@ -4471,13 +4471,13 @@ libvirt_virConnectBaselineCPU(PyObject *self ATTRIBUTE_UNUSED,
 
         ncpus = PyList_Size(list);
         if (VIR_ALLOC_N_QUIET(xmlcpus, ncpus) < 0)
-            return VIR_PY_INT_FAIL;
+            return VIR_PY_NONE;
 
         for (i = 0; i < ncpus; i++) {
             xmlcpus[i] = PyString_AsString(PyList_GetItem(list, i));
             if (xmlcpus[i] == NULL) {
                 VIR_FREE(xmlcpus);
-                return VIR_PY_INT_FAIL;
+                return VIR_PY_NONE;
             }
         }
     }
@@ -4489,13 +4489,13 @@ libvirt_virConnectBaselineCPU(PyObject *self ATTRIBUTE_UNUSED,
     VIR_FREE(xmlcpus);
 
     if (base_cpu == NULL)
-        return VIR_PY_INT_FAIL;
+        return VIR_PY_NONE;
 
     pybase_cpu = PyString_FromString(base_cpu);
     VIR_FREE(base_cpu);
 
     if (pybase_cpu == NULL)
-        return VIR_PY_INT_FAIL;
+        return VIR_PY_NONE;
 
     return pybase_cpu;
 }