[PATCH 15/43] test: convert virMutex to GMutex

Rafael Fonseca r4f4rfs at gmail.com
Fri Apr 10 13:54:42 UTC 2020


Signed-off-by: Rafael Fonseca <r4f4rfs at gmail.com>
---
 src/test/test_driver.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 7759847c2d..1c23d569d5 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -125,7 +125,7 @@ typedef struct _testDriver testDriver;
 typedef testDriver *testDriverPtr;
 
 static testDriverPtr defaultPrivconn;
-static virMutex defaultLock = VIR_MUTEX_INITIALIZER;
+G_LOCK_DEFINE_STATIC(defaultLock);
 
 static virClassPtr testDriverClass;
 static void testDriverDispose(void *obj);
@@ -1334,10 +1334,10 @@ testOpenDefault(virConnectPtr conn)
     xmlXPathContextPtr ctxt = NULL;
     size_t i;
 
-    virMutexLock(&defaultLock);
+    G_LOCK(defaultLock);
     if (defaultPrivconn) {
         conn->privateData = virObjectRef(defaultPrivconn);
-        virMutexUnlock(&defaultLock);
+        G_UNLOCK(defaultLock);
         return VIR_DRV_OPEN_SUCCESS;
     }
 
@@ -1379,7 +1379,7 @@ testOpenDefault(virConnectPtr conn)
     defaultPrivconn = privconn;
     ret = VIR_DRV_OPEN_SUCCESS;
  cleanup:
-    virMutexUnlock(&defaultLock);
+    G_UNLOCK(defaultLock);
     xmlXPathFreeContext(ctxt);
     xmlFreeDoc(doc);
     return ret;
@@ -1445,11 +1445,11 @@ testConnectAuthenticate(virConnectPtr conn,
 static void
 testDriverCloseInternal(testDriverPtr driver)
 {
-    virMutexLock(&defaultLock);
+    G_LOCK(defaultLock);
     bool disposed = !virObjectUnref(driver);
     if (disposed && driver == defaultPrivconn)
         defaultPrivconn = NULL;
-    virMutexUnlock(&defaultLock);
+    G_UNLOCK(defaultLock);
 }
 
 
-- 
2.25.2





More information about the libvir-list mailing list