mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-22 11:22:23 +00:00
test: Finalize removal of locking from driver->eventState
Don't lock the driver when registering event callbacks.
This commit is contained in:
parent
678059c064
commit
caf5aef4c5
@ -5915,11 +5915,9 @@ testConnectDomainEventRegister(virConnectPtr conn,
|
|||||||
testDriverPtr driver = conn->privateData;
|
testDriverPtr driver = conn->privateData;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
testDriverLock(driver);
|
|
||||||
if (virDomainEventStateRegister(conn, driver->eventState,
|
if (virDomainEventStateRegister(conn, driver->eventState,
|
||||||
callback, opaque, freecb) < 0)
|
callback, opaque, freecb) < 0)
|
||||||
ret = -1;
|
ret = -1;
|
||||||
testDriverUnlock(driver);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@ -5932,11 +5930,9 @@ testConnectDomainEventDeregister(virConnectPtr conn,
|
|||||||
testDriverPtr driver = conn->privateData;
|
testDriverPtr driver = conn->privateData;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
testDriverLock(driver);
|
|
||||||
if (virDomainEventStateDeregister(conn, driver->eventState,
|
if (virDomainEventStateDeregister(conn, driver->eventState,
|
||||||
callback) < 0)
|
callback) < 0)
|
||||||
ret = -1;
|
ret = -1;
|
||||||
testDriverUnlock(driver);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@ -5953,12 +5949,10 @@ testConnectDomainEventRegisterAny(virConnectPtr conn,
|
|||||||
testDriverPtr driver = conn->privateData;
|
testDriverPtr driver = conn->privateData;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
testDriverLock(driver);
|
|
||||||
if (virDomainEventStateRegisterID(conn, driver->eventState,
|
if (virDomainEventStateRegisterID(conn, driver->eventState,
|
||||||
dom, eventID,
|
dom, eventID,
|
||||||
callback, opaque, freecb, &ret) < 0)
|
callback, opaque, freecb, &ret) < 0)
|
||||||
ret = -1;
|
ret = -1;
|
||||||
testDriverUnlock(driver);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@ -5970,11 +5964,9 @@ testConnectDomainEventDeregisterAny(virConnectPtr conn,
|
|||||||
testDriverPtr driver = conn->privateData;
|
testDriverPtr driver = conn->privateData;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
testDriverLock(driver);
|
|
||||||
if (virObjectEventStateDeregisterID(conn, driver->eventState,
|
if (virObjectEventStateDeregisterID(conn, driver->eventState,
|
||||||
callbackID) < 0)
|
callbackID) < 0)
|
||||||
ret = -1;
|
ret = -1;
|
||||||
testDriverUnlock(driver);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@ -5991,12 +5983,10 @@ testConnectNetworkEventRegisterAny(virConnectPtr conn,
|
|||||||
testDriverPtr driver = conn->privateData;
|
testDriverPtr driver = conn->privateData;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
testDriverLock(driver);
|
|
||||||
if (virNetworkEventStateRegisterID(conn, driver->eventState,
|
if (virNetworkEventStateRegisterID(conn, driver->eventState,
|
||||||
net, eventID, callback,
|
net, eventID, callback,
|
||||||
opaque, freecb, &ret) < 0)
|
opaque, freecb, &ret) < 0)
|
||||||
ret = -1;
|
ret = -1;
|
||||||
testDriverUnlock(driver);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@ -6008,11 +5998,9 @@ testConnectNetworkEventDeregisterAny(virConnectPtr conn,
|
|||||||
testDriverPtr driver = conn->privateData;
|
testDriverPtr driver = conn->privateData;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
testDriverLock(driver);
|
|
||||||
if (virObjectEventStateDeregisterID(conn, driver->eventState,
|
if (virObjectEventStateDeregisterID(conn, driver->eventState,
|
||||||
callbackID) < 0)
|
callbackID) < 0)
|
||||||
ret = -1;
|
ret = -1;
|
||||||
testDriverUnlock(driver);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user