From nobody Mon Feb 9 11:28:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646414991; cv=none; d=zohomail.com; s=zohoarc; b=lsMIrThFff0tAEiTP9KqjZ8it4cxKkvobf3JvzsyVBDJj7u00h4bFlkTyYPp+xvjvQcm47BLiJB6gn8S9/Krm/FeeSiwa+GWBBf/O0MLgZO90vvJfwLNxOxI385MgamMCooJc6OvhZjpiCv0Whgy/cGOIeUYICaMlILyXjj8DSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646414991; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=10jWOqwQEuj1w5dxVUUIqfaqBxnKn5GMRlirNo2cpTw=; b=K1jPw0HEKFKyJHZb9BC5DFSdwVBYs8/hmGFtBEFnLOA4z/jHtfGyGAtCVu5dZ2AFHLJzaMl3qIoyxnYcfRswH/HoAnjFBaVABrFmN0IUb8KkRsBAA97baAF1pO1s3HeEWYLaXSpFaILFzzFyWWD+C/IVCTVrChT4oWdbEuLDgcA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1646414991146545.9245063111366; Fri, 4 Mar 2022 09:29:51 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-278-Jrq1PpH7NOOw94ymDlSyBQ-1; Fri, 04 Mar 2022 12:29:48 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C82E9521C; Fri, 4 Mar 2022 17:29:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A6D03865A2; Fri, 4 Mar 2022 17:29:42 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 792F51809CB5; Fri, 4 Mar 2022 17:29:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 224HT7mg024558 for ; Fri, 4 Mar 2022 12:29:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5B4B586B48; Fri, 4 Mar 2022 17:29:07 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.195.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F4478479A; Fri, 4 Mar 2022 17:29:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646414989; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=10jWOqwQEuj1w5dxVUUIqfaqBxnKn5GMRlirNo2cpTw=; b=Lr2n1iXtruRbNEsbsz3mi9ftYsVr/b/n/DtNVotNnxR3qr2SqCW06f5HN9CfgYDwt9QJ5V iXHtAdP3c4SGiWARPOoxMsTpah+dcK+TmZ0qDgV8FmpRVkscwiiw4cEtzI7L0A2GTnCDNb ocKT6YN3WrjDKsLnom3oNRafW4cFoMY= X-MC-Unique: Jrq1PpH7NOOw94ymDlSyBQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 03/10] remote_daemon_dispatch: Use automatic mutex management Date: Fri, 4 Mar 2022 18:28:33 +0100 Message-Id: <20220304172840.66057-4-twiederh@redhat.com> In-Reply-To: <20220304172840.66057-1-twiederh@redhat.com> References: <20220304172840.66057-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646414992128100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/remote/remote_daemon_dispatch.c | 187 +++++++++------------------- 1 file changed, 58 insertions(+), 129 deletions(-) diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 510856024c..1a73976831 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -2057,14 +2057,13 @@ remoteDispatchConnectOpen(virNetServer *server G_GN= UC_UNUSED, #endif unsigned int flags; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(= client); - int rv =3D -1; #ifdef MODULE_NAME const char *type =3D NULL; #endif /* !MODULE_NAME */ bool preserveIdentity =3D false; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 VIR_DEBUG("priv=3D%p conn=3D%p", priv, priv->conn); - virMutexLock(&priv->lock); /* Already opened? */ if (priv->conn) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection already= open")); @@ -2184,17 +2183,14 @@ remoteDispatchConnectOpen(virNetServer *server G_GN= UC_UNUSED, * by default, but do accept RO flags, e.g. TCP */ virNetServerClientSetReadonly(client, (flags & VIR_CONNECT_RO)); - rv =3D 0; + return 0; =20 cleanup: - if (rv < 0) { - virNetMessageSaveError(rerr); - if (priv->conn) { - g_clear_pointer(&priv->conn, virObjectUnref); - } + virNetMessageSaveError(rerr); + if (priv->conn) { + g_clear_pointer(&priv->conn, virObjectUnref); } - virMutexUnlock(&priv->lock); - return rv; + return -1; } =20 =20 @@ -3656,8 +3652,7 @@ remoteDispatchAuthSaslInit(virNetServer *server G_GNU= C_UNUSED, virNetSASLSession *sasl =3D NULL; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 VIR_DEBUG("Initialize SASL auth %d", virNetServerClientGetFD(client)); if (virNetServerClientGetAuth(client) !=3D VIR_NET_SERVER_SERVICE_AUTH= _SASL || @@ -3702,7 +3697,6 @@ remoteDispatchAuthSaslInit(virNetServer *server G_GNU= C_UNUSED, VIR_DEBUG("Available mechanisms for client: '%s'", ret->mechlist); =20 priv->sasl =3D sasl; - virMutexUnlock(&priv->lock); return 0; =20 authfail: @@ -3714,7 +3708,6 @@ remoteDispatchAuthSaslInit(virNetServer *server G_GNU= C_UNUSED, "client=3D%p auth=3D%d", client, REMOTE_AUTH_SASL); virObjectUnref(sasl); - virMutexUnlock(&priv->lock); return -1; } =20 @@ -3783,8 +3776,7 @@ remoteDispatchAuthSaslStart(virNetServer *server, struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); const char *identity; - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 VIR_DEBUG("Start SASL auth %d", virNetServerClientGetFD(client)); if (virNetServerClientGetAuth(client) !=3D VIR_NET_SERVER_SERVICE_AUTH= _SASL || @@ -3836,7 +3828,6 @@ remoteDispatchAuthSaslStart(virNetServer *server, ret->complete =3D 1; } =20 - virMutexUnlock(&priv->lock); return 0; =20 authfail: @@ -3858,7 +3849,6 @@ remoteDispatchAuthSaslStart(virNetServer *server, virReportError(VIR_ERR_AUTH_FAILED, "%s", _("authentication failed")); virNetMessageSaveError(rerr); - virMutexUnlock(&priv->lock); return -1; } =20 @@ -3877,8 +3867,7 @@ remoteDispatchAuthSaslStep(virNetServer *server, struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); const char *identity; - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 VIR_DEBUG("Step SASL auth %d", virNetServerClientGetFD(client)); if (virNetServerClientGetAuth(client) !=3D VIR_NET_SERVER_SERVICE_AUTH= _SASL || @@ -3930,7 +3919,6 @@ remoteDispatchAuthSaslStep(virNetServer *server, ret->complete =3D 1; } =20 - virMutexUnlock(&priv->lock); return 0; =20 authfail: @@ -3952,7 +3940,6 @@ remoteDispatchAuthSaslStep(virNetServer *server, virReportError(VIR_ERR_AUTH_FAILED, "%s", _("authentication failed")); virNetMessageSaveError(rerr); - virMutexUnlock(&priv->lock); return -1; } #else @@ -4017,8 +4004,8 @@ remoteDispatchAuthPolkit(virNetServer *server, struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); int rv; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 - virMutexLock(&priv->lock); action =3D virNetServerClientGetReadonly(client) ? "org.libvirt.unix.monitor" : "org.libvirt.unix.manage"; @@ -4062,13 +4049,10 @@ remoteDispatchAuthPolkit(virNetServer *server, ret->complete =3D 1; =20 virNetServerSetClientAuthenticated(server, client); - virMutexUnlock(&priv->lock); - return 0; =20 error: virNetMessageSaveError(rerr); - virMutexUnlock(&priv->lock); return -1; =20 authfail: @@ -4129,12 +4113,10 @@ remoteDispatchConnectRegisterCloseCallback(virNetSe= rver *server G_GNUC_UNUSED, virNetMessage *msg G_GNUC_UNUSE= D, struct virNetMessageError *rerr) { - int rv =3D -1; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -4145,13 +4127,11 @@ remoteDispatchConnectRegisterCloseCallback(virNetSe= rver *server G_GNUC_UNUSED, goto cleanup; =20 priv->closeRegistered =3D true; - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 static int @@ -4160,12 +4140,10 @@ remoteDispatchConnectUnregisterCloseCallback(virNet= Server *server G_GNUC_UNUSED, virNetMessage *msg G_GNUC_UNU= SED, struct virNetMessageError *re= rr) { - int rv =3D -1; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -4175,13 +4153,11 @@ remoteDispatchConnectUnregisterCloseCallback(virNet= Server *server G_GNUC_UNUSED, goto cleanup; =20 priv->closeRegistered =3D false; - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 static int @@ -4198,8 +4174,7 @@ remoteDispatchConnectDomainEventRegister(virNetServer= *server G_GNUC_UNUSED, struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -4240,7 +4215,6 @@ remoteDispatchConnectDomainEventRegister(virNetServer= *server G_GNUC_UNUSED, rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -4255,13 +4229,11 @@ remoteDispatchConnectDomainEventDeregister(virNetSe= rver *server G_GNUC_UNUSED, remote_connect_domain_event_der= egister_ret *ret G_GNUC_UNUSED) { int callbackID =3D -1; - int rv =3D -1; size_t i; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -4286,13 +4258,11 @@ remoteDispatchConnectDomainEventDeregister(virNetSe= rver *server G_GNUC_UNUSED, VIR_DELETE_ELEMENT(priv->domainEventCallbacks, i, priv->ndomainEventCallbacks); =20 - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 static void @@ -4417,8 +4387,7 @@ remoteDispatchConnectDomainEventRegisterAny(virNetSer= ver *server G_GNUC_UNUSED, struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -4467,7 +4436,6 @@ remoteDispatchConnectDomainEventRegisterAny(virNetSer= ver *server G_GNUC_UNUSED, rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -4491,8 +4459,7 @@ remoteDispatchConnectDomainEventCallbackRegisterAny(v= irNetServer *server G_GNUC_ virNetServerClientGetPrivateData(client); virDomainPtr dom =3D NULL; virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -4541,7 +4508,6 @@ remoteDispatchConnectDomainEventCallbackRegisterAny(v= irNetServer *server G_GNUC_ rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -4558,13 +4524,11 @@ remoteDispatchConnectDomainEventDeregisterAny(virNe= tServer *server G_GNUC_UNUSED remote_connect_domain_event_= deregister_any_args *args) { int callbackID =3D -1; - int rv =3D -1; size_t i; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -4597,13 +4561,11 @@ remoteDispatchConnectDomainEventDeregisterAny(virNe= tServer *server G_GNUC_UNUSED VIR_DELETE_ELEMENT(priv->domainEventCallbacks, i, priv->ndomainEventCallbacks); =20 - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 =20 @@ -4614,13 +4576,11 @@ remoteDispatchConnectDomainEventCallbackDeregisterA= ny(virNetServer *server G_GNU struct virNetMessage= Error *rerr G_GNUC_UNUSED, remote_connect_domai= n_event_callback_deregister_any_args *args) { - int rv =3D -1; size_t i; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -4642,13 +4602,11 @@ remoteDispatchConnectDomainEventCallbackDeregisterA= ny(virNetServer *server G_GNU VIR_DELETE_ELEMENT(priv->domainEventCallbacks, i, priv->ndomainEventCallbacks); =20 - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 =20 @@ -6027,8 +5985,7 @@ remoteDispatchConnectNetworkEventRegisterAny(virNetSe= rver *server G_GNUC_UNUSED, struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetNetworkConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6077,7 +6034,6 @@ remoteDispatchConnectNetworkEventRegisterAny(virNetSe= rver *server G_GNUC_UNUSED, rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -6093,13 +6049,11 @@ remoteDispatchConnectNetworkEventDeregisterAny(virN= etServer *server G_GNUC_UNUSE struct virNetMessageError *= rerr G_GNUC_UNUSED, remote_connect_network_even= t_deregister_any_args *args) { - int rv =3D -1; size_t i; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetNetworkConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6121,13 +6075,11 @@ remoteDispatchConnectNetworkEventDeregisterAny(virN= etServer *server G_GNUC_UNUSE VIR_DELETE_ELEMENT(priv->networkEventCallbacks, i, priv->nnetworkEventCallbacks); =20 - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 static int @@ -6146,8 +6098,7 @@ remoteDispatchConnectStoragePoolEventRegisterAny(virN= etServer *server G_GNUC_UNU virNetServerClientGetPrivateData(client); virStoragePoolPtr pool =3D NULL; virConnectPtr conn =3D remoteGetStorageConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6196,7 +6147,6 @@ remoteDispatchConnectStoragePoolEventRegisterAny(virN= etServer *server G_GNUC_UNU rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -6211,13 +6161,12 @@ remoteDispatchConnectStoragePoolEventDeregisterAny(= virNetServer *server G_GNUC_U struct virNetMessageError *= rerr G_GNUC_UNUSED, remote_connect_storage_pool= _event_deregister_any_args *args) { - int rv =3D -1; size_t i; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetStorageConn(client); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 - virMutexLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6239,13 +6188,11 @@ remoteDispatchConnectStoragePoolEventDeregisterAny(= virNetServer *server G_GNUC_U VIR_DELETE_ELEMENT(priv->storageEventCallbacks, i, priv->nstorageEventCallbacks); =20 - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 static int @@ -6264,8 +6211,7 @@ remoteDispatchConnectNodeDeviceEventRegisterAny(virNe= tServer *server G_GNUC_UNUS virNetServerClientGetPrivateData(client); virNodeDevicePtr dev =3D NULL; virConnectPtr conn =3D remoteGetNodeDevConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6314,7 +6260,6 @@ remoteDispatchConnectNodeDeviceEventRegisterAny(virNe= tServer *server G_GNUC_UNUS rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -6329,13 +6274,11 @@ remoteDispatchConnectNodeDeviceEventDeregisterAny(v= irNetServer *server G_GNUC_UN struct virNetMessageErro= r *rerr G_GNUC_UNUSED, remote_connect_node_devi= ce_event_deregister_any_args *args) { - int rv =3D -1; size_t i; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetNodeDevConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6357,13 +6300,11 @@ remoteDispatchConnectNodeDeviceEventDeregisterAny(v= irNetServer *server G_GNUC_UN VIR_DELETE_ELEMENT(priv->nodeDeviceEventCallbacks, i, priv->nnodeDeviceEventCallbacks); =20 - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 static int @@ -6382,8 +6323,7 @@ remoteDispatchConnectSecretEventRegisterAny(virNetSer= ver *server G_GNUC_UNUSED, virNetServerClientGetPrivateData(client); virSecretPtr secret =3D NULL; virConnectPtr conn =3D remoteGetSecretConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6432,7 +6372,6 @@ remoteDispatchConnectSecretEventRegisterAny(virNetSer= ver *server G_GNUC_UNUSED, rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -6447,13 +6386,11 @@ remoteDispatchConnectSecretEventDeregisterAny(virNe= tServer *server G_GNUC_UNUSED struct virNetMessageErro= r *rerr G_GNUC_UNUSED, remote_connect_secret_ev= ent_deregister_any_args *args) { - int rv =3D -1; size_t i; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetSecretConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6475,13 +6412,11 @@ remoteDispatchConnectSecretEventDeregisterAny(virNe= tServer *server G_GNUC_UNUSED VIR_DELETE_ELEMENT(priv->secretEventCallbacks, i, priv->nsecretEventCallbacks); =20 - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 static int @@ -6501,8 +6436,7 @@ qemuDispatchConnectDomainMonitorEventRegister(virNetS= erver *server G_GNUC_UNUSED virDomainPtr dom =3D NULL; const char *event =3D args->event ? *args->event : NULL; virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6546,7 +6480,6 @@ qemuDispatchConnectDomainMonitorEventRegister(virNetS= erver *server G_GNUC_UNUSED rv =3D 0; =20 cleanup: - virMutexUnlock(&priv->lock); remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); @@ -6562,13 +6495,11 @@ qemuDispatchConnectDomainMonitorEventDeregister(vir= NetServer *server G_GNUC_UNUS struct virNetMessageError = *rerr G_GNUC_UNUSED, qemu_connect_domain_monito= r_event_deregister_args *args) { - int rv =3D -1; size_t i; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetHypervisorConn(client); - - virMutexLock(&priv->lock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->lock); =20 if (!conn) goto cleanup; @@ -6591,13 +6522,11 @@ qemuDispatchConnectDomainMonitorEventDeregister(vir= NetServer *server G_GNUC_UNUS VIR_DELETE_ELEMENT(priv->qemuEventCallbacks, i, priv->nqemuEventCallbacks); =20 - rv =3D 0; + return 0; =20 cleanup: - virMutexUnlock(&priv->lock); - if (rv < 0) - virNetMessageSaveError(rerr); - return rv; + virNetMessageSaveError(rerr); + return -1; } =20 static int --=20 2.31.1