[libvirt] [PATCH v2 15/15] test: Refactor testNodeGetCPUMap

Peter Krempa pkrempa at redhat.com
Wed Jun 24 14:11:57 UTC 2015


Drop locking of the driver since it is not accessed and simplify the
code flow.
---
 src/test/test_driver.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index ed67dca..25de641 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -5611,31 +5611,23 @@ static int testConnectListAllDomains(virConnectPtr conn,
 }

 static int
-testNodeGetCPUMap(virConnectPtr conn,
+testNodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUSED,
                   unsigned char **cpumap,
                   unsigned int *online,
                   unsigned int flags)
 {
-    testDriverPtr privconn = conn->privateData;
-    int ret = -1;
-
     virCheckFlags(0, -1);

-    testDriverLock(privconn);
     if (cpumap) {
         if (VIR_ALLOC_N(*cpumap, 1) < 0)
-            goto cleanup;
+            return -1;
         *cpumap[0] = 0x15;
     }

     if (online)
         *online = 3;

-    ret = 8;
-
- cleanup:
-    testDriverUnlock(privconn);
-    return ret;
+    return  8;
 }

 static char *
-- 
2.4.1




More information about the libvir-list mailing list