提交 caf5aef4 编写于 作者: P Peter Krempa

test: Finalize removal of locking from driver->eventState

Don't lock the driver when registering event callbacks.
上级 678059c0
......@@ -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;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册