]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
test: Finalize removal of locking from driver->eventState
authorPeter Krempa <pkrempa@redhat.com>
Wed, 24 Jun 2015 10:56:21 +0000 (12:56 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 25 Jun 2015 12:09:48 +0000 (14:09 +0200)
Don't lock the driver when registering event callbacks.

src/test/test_driver.c

index 2ab0402c2da833d347b517c0d7a31872aaf08424..b08c1e5bc1bc3dce9486e4993388c56265c032e2 100644 (file)
@@ -5915,11 +5915,9 @@ testConnectDomainEventRegister(virConnectPtr conn,
     testDriverPtr driver = conn->privateData;
     int ret = 0;
 
-    testDriverLock(driver);
     if (virDomainEventStateRegister(conn, driver->eventState,
                                     callback, opaque, freecb) < 0)
         ret = -1;
-    testDriverUnlock(driver);
 
     return ret;
 }
@@ -5932,11 +5930,9 @@ testConnectDomainEventDeregister(virConnectPtr conn,
     testDriverPtr driver = conn->privateData;
     int ret = 0;
 
-    testDriverLock(driver);
     if (virDomainEventStateDeregister(conn, driver->eventState,
                                       callback) < 0)
         ret = -1;
-    testDriverUnlock(driver);
 
     return ret;
 }
@@ -5953,12 +5949,10 @@ testConnectDomainEventRegisterAny(virConnectPtr conn,
     testDriverPtr driver = conn->privateData;
     int ret;
 
-    testDriverLock(driver);
     if (virDomainEventStateRegisterID(conn, driver->eventState,
                                       dom, eventID,
                                       callback, opaque, freecb, &ret) < 0)
         ret = -1;
-    testDriverUnlock(driver);
 
     return ret;
 }
@@ -5970,11 +5964,9 @@ testConnectDomainEventDeregisterAny(virConnectPtr conn,
     testDriverPtr driver = conn->privateData;
     int ret = 0;
 
-    testDriverLock(driver);
     if (virObjectEventStateDeregisterID(conn, driver->eventState,
                                         callbackID) < 0)
         ret = -1;
-    testDriverUnlock(driver);
 
     return ret;
 }
@@ -5991,12 +5983,10 @@ testConnectNetworkEventRegisterAny(virConnectPtr conn,
     testDriverPtr driver = conn->privateData;
     int ret;
 
-    testDriverLock(driver);
     if (virNetworkEventStateRegisterID(conn, driver->eventState,
                                        net, eventID, callback,
                                        opaque, freecb, &ret) < 0)
         ret = -1;
-    testDriverUnlock(driver);
 
     return ret;
 }
@@ -6008,11 +5998,9 @@ testConnectNetworkEventDeregisterAny(virConnectPtr conn,
     testDriverPtr driver = conn->privateData;
     int ret = 0;
 
-    testDriverLock(driver);
     if (virObjectEventStateDeregisterID(conn, driver->eventState,
                                         callbackID) < 0)
         ret = -1;
-    testDriverUnlock(driver);
 
     return ret;
 }