[libvirt PATCH 06/10] qemu_agent: Use automatic mutex management

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com&gt; --- src/qemu/qemu_agent.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 4909fb336f..4156cb0dca 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -679,9 +679,9 @@ qemuAgentNotifyClose(qemuAgent *agent) VIR_DEBUG("agent=%p", agent); - virObjectLock(agent); - qemuAgentNotifyCloseLocked(agent); - virObjectUnlock(agent); + VIR_WITH_OBJECT_LOCK_GUARD(agent) { + qemuAgentNotifyCloseLocked(agent); + } } @@ -692,17 +692,16 @@ void qemuAgentClose(qemuAgent *agent) VIR_DEBUG("agent=%p", agent); - virObjectLock(agent); + VIR_WITH_OBJECT_LOCK_GUARD(agent) { + if (agent->socket) { + qemuAgentUnregister(agent); + g_clear_pointer(&agent->socket, g_object_unref); + agent->fd = -1; + } - if (agent->socket) { - qemuAgentUnregister(agent); - g_clear_pointer(&agent->socket, g_object_unref); - agent->fd = -1; + qemuAgentNotifyCloseLocked(agent); } - qemuAgentNotifyCloseLocked(agent); - virObjectUnlock(agent); - virObjectUnref(agent); } @@ -1125,7 +1124,7 @@ qemuAgentMakeStringsArray(const char **strings, unsigned int len) void qemuAgentNotifyEvent(qemuAgent *agent, qemuAgentEvent event) { - virObjectLock(agent); + VIR_LOCK_GUARD lock = virObjectLockGuard(agent); VIR_DEBUG("agent=%p event=%d await_event=%d", agent, event, agent->await_event); if (agent->await_event == event) { @@ -1136,8 +1135,6 @@ void qemuAgentNotifyEvent(qemuAgent *agent, virCondSignal(&agent->notify); } } - - virObjectUnlock(agent); } VIR_ENUM_DECL(qemuAgentShutdownMode); -- 2.31.1