From nobody Tue Feb 10 06:05:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1673358974; cv=none; d=zohomail.com; s=zohoarc; b=bcqv3fmLH4eaYGYYOEbCwkL60r51Mv1PiX5grJwSVpHIqrNFDeUFI4xZiHax32ctO6kcD5u+cvbAPOgmKXQaHZx1LRd0I2J8+O1wyWGj5acoOHVtucIquM0NHPzs2jUjsITLW30cqBwb+KjDyZQv9qu2yDZlSEM+9wivZAxIXDM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673358974; h=Content-Type:Content-Transfer-Encoding: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=DrmAugBCQ4jxggG9TBgqjgOUH4oF3DcgML15KhrrAEo=; b=VNBBnGz92UBblThmYQPRtjUekYwM/z4A1Xh0dOQCGjjr8KpVabNJ/p/HJovW4jKmv8zOD5l2Be3mp/6yHC6sowRlTlouc5fiUAfhNU5ey9e9GgslSP7bEDzZpzfodJWmHQK8ZT1PZRMzmKjzTFLi1xU9z1/UmXN90MEI7dZvXFY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1673358974951922.3066405020317; Tue, 10 Jan 2023 05:56:14 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-543-pXQW9f2YNsmFFbv8h-dHEw-1; Tue, 10 Jan 2023 08:54:33 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8784585CBF4; Tue, 10 Jan 2023 13:54:28 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6828240C2005; Tue, 10 Jan 2023 13:54:28 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3F201194E101; Tue, 10 Jan 2023 13:54:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CFC6D194E114 for ; Tue, 10 Jan 2023 13:54:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C282940C2064; Tue, 10 Jan 2023 13:54:24 +0000 (UTC) Received: from virtlab420.virt.lab.eng.bos.redhat.com (virtlab420.virt.lab.eng.bos.redhat.com [10.19.152.148]) by smtp.corp.redhat.com (Postfix) with ESMTP id A744740C2004; Tue, 10 Jan 2023 13:54:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673358974; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=DrmAugBCQ4jxggG9TBgqjgOUH4oF3DcgML15KhrrAEo=; b=WdPaz19fNcPGry6T68Mx1sXkewHQEJyTli+o68sKa+07FV/4QP/y5nWIJZtHbIwtDZrafq 1Nkup5tvD57jGvps3v5IWooD4xZvVdgJKEJGmyATnv8G5U61VTUPzrSHfHPPxxHJQ0gpVR zdGM01eqMgt9gIdsw+GvsmtaTu28+b8= X-MC-Unique: pXQW9f2YNsmFFbv8h-dHEw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 6/9] admin: use VIR_LOCK_GUARD in client code Date: Tue, 10 Jan 2023 08:54:20 -0500 Message-Id: <20230110135423.2576907-7-berrange@redhat.com> In-Reply-To: <20230110135423.2576907-1-berrange@redhat.com> References: <20230110135423.2576907-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673358976954100005 Using VIR_LOCK_GUARD enables the 'done' goto label to be eliminated. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/admin/admin_remote.c | 72 ++++++++++++---------------------------- 1 file changed, 22 insertions(+), 50 deletions(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index f99b93eef6..5322f087ec 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -133,8 +133,7 @@ remoteAdminClientCloseFunc(virNetClient *client G_GNUC_= UNUSED, void *opaque) { virAdmConnectCloseCallbackData *cbdata =3D opaque; - - virObjectLock(cbdata); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(cbdata); =20 if (cbdata->callback) { VIR_DEBUG("Triggering connection close callback %p reason=3D%d, op= aque=3D%p", @@ -142,17 +141,14 @@ remoteAdminClientCloseFunc(virNetClient *client G_GNU= C_UNUSED, cbdata->callback(cbdata->conn, reason, cbdata->opaque); virAdmConnectCloseCallbackDataReset(cbdata); } - virObjectUnlock(cbdata); } =20 static int remoteAdminConnectOpen(virAdmConnectPtr conn, unsigned int flags) { - int rv =3D -1; remoteAdminPriv *priv =3D conn->privateData; admin_connect_open_args args; - - virObjectLock(priv); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(priv); =20 args.flags =3D flags & ~VIR_CONNECT_NO_ALIASES; =20 @@ -169,40 +165,28 @@ remoteAdminConnectOpen(virAdmConnectPtr conn, unsigne= d int flags) =20 if (call(conn, 0, ADMIN_PROC_CONNECT_OPEN, (xdrproc_t)xdr_admin_connect_open_args, (char *)&args, - (xdrproc_t)xdr_void, (char *)NULL) =3D=3D -1) { - goto done; - } + (xdrproc_t)xdr_void, (char *)NULL) =3D=3D -1) + return -1; =20 - rv =3D 0; - - done: - virObjectUnlock(priv); - return rv; + return 0; } =20 static int remoteAdminConnectClose(virAdmConnectPtr conn) { - int rv =3D -1; remoteAdminPriv *priv =3D conn->privateData; - - virObjectLock(priv); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(priv); =20 if (call(conn, 0, ADMIN_PROC_CONNECT_CLOSE, (xdrproc_t)xdr_void, (char *)NULL, - (xdrproc_t)xdr_void, (char *)NULL) =3D=3D -1) { - goto done; - } + (xdrproc_t)xdr_void, (char *)NULL) =3D=3D -1) + return -1; =20 virNetClientSetCloseCallback(priv->client, NULL, conn->closeCallback, virObjectUnref); virNetClientClose(priv->client); =20 - rv =3D 0; - - done: - virObjectUnlock(priv); - return rv; + return 0; } =20 static void @@ -249,17 +233,17 @@ remoteAdminServerGetThreadPoolParameters(virAdmServer= Ptr srv, remoteAdminPriv *priv =3D srv->conn->privateData; admin_server_get_threadpool_parameters_args args; admin_server_get_threadpool_parameters_ret ret; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(priv); =20 args.flags =3D flags; make_nonnull_server(&args.srv, srv); =20 memset(&ret, 0, sizeof(ret)); - virObjectLock(priv); =20 if (call(srv->conn, 0, ADMIN_PROC_SERVER_GET_THREADPOOL_PARAMETERS, (xdrproc_t)xdr_admin_server_get_threadpool_parameters_args, (= char *) &args, (xdrproc_t)xdr_admin_server_get_threadpool_parameters_ret, (c= har *) &ret) =3D=3D -1) - goto cleanup; + return -1; =20 if (virTypedParamsDeserialize((struct _virTypedParameterRemote *) ret.= params.params_val, ret.params.params_len, @@ -272,7 +256,6 @@ remoteAdminServerGetThreadPoolParameters(virAdmServerPt= r srv, =20 cleanup: xdr_free((xdrproc_t)xdr_admin_server_get_threadpool_parameters_ret, (c= har *) &ret); - virObjectUnlock(priv); return rv; } =20 @@ -285,12 +268,11 @@ remoteAdminServerSetThreadPoolParameters(virAdmServer= Ptr srv, int rv =3D -1; remoteAdminPriv *priv =3D srv->conn->privateData; admin_server_set_threadpool_parameters_args args; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(priv); =20 args.flags =3D flags; make_nonnull_server(&args.srv, srv); =20 - virObjectLock(priv); - if (virTypedParamsSerialize(params, nparams, ADMIN_SERVER_THREADPOOL_PARAMETERS_MAX, (struct _virTypedParameterRemote **) &args= .params.params_val, @@ -308,7 +290,6 @@ remoteAdminServerSetThreadPoolParameters(virAdmServerPt= r srv, cleanup: virTypedParamsRemoteFree((struct _virTypedParameterRemote *) args.para= ms.params_val, args.params.params_len); - virObjectUnlock(priv); return rv; } =20 @@ -322,17 +303,17 @@ remoteAdminClientGetInfo(virAdmClientPtr client, remoteAdminPriv *priv =3D client->srv->conn->privateData; admin_client_get_info_args args; admin_client_get_info_ret ret; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(priv); =20 args.flags =3D flags; make_nonnull_client(&args.clnt, client); =20 memset(&ret, 0, sizeof(ret)); - virObjectLock(priv); =20 if (call(client->srv->conn, 0, ADMIN_PROC_CLIENT_GET_INFO, (xdrproc_t)xdr_admin_client_get_info_args, (char *) &args, (xdrproc_t)xdr_admin_client_get_info_ret, (char *) &ret) =3D= =3D -1) - goto cleanup; + return -1; =20 if (virTypedParamsDeserialize((struct _virTypedParameterRemote *) ret.= params.params_val, ret.params.params_len, @@ -345,7 +326,6 @@ remoteAdminClientGetInfo(virAdmClientPtr client, =20 cleanup: xdr_free((xdrproc_t)xdr_admin_client_get_info_ret, (char *) &ret); - virObjectUnlock(priv); return rv; } =20 @@ -359,18 +339,19 @@ remoteAdminServerGetClientLimits(virAdmServerPtr srv, admin_server_get_client_limits_args args; admin_server_get_client_limits_ret ret; remoteAdminPriv *priv =3D srv->conn->privateData; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(priv); + args.flags =3D flags; make_nonnull_server(&args.srv, srv); =20 memset(&ret, 0, sizeof(ret)); - virObjectLock(priv); =20 if (call(srv->conn, 0, ADMIN_PROC_SERVER_GET_CLIENT_LIMITS, (xdrproc_t) xdr_admin_server_get_client_limits_args, (char *) &args, (xdrproc_t) xdr_admin_server_get_client_limits_ret, (char *) &ret) =3D=3D -1) - goto cleanup; + return -1; =20 if (virTypedParamsDeserialize((struct _virTypedParameterRemote *) ret.= params.params_val, ret.params.params_len, @@ -384,7 +365,6 @@ remoteAdminServerGetClientLimits(virAdmServerPtr srv, cleanup: xdr_free((xdrproc_t) xdr_admin_server_get_client_limits_ret, (char *) &ret); - virObjectUnlock(priv); return rv; } =20 @@ -397,12 +377,11 @@ remoteAdminServerSetClientLimits(virAdmServerPtr srv, int rv =3D -1; admin_server_set_client_limits_args args; remoteAdminPriv *priv =3D srv->conn->privateData; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(priv); =20 args.flags =3D flags; make_nonnull_server(&args.srv, srv); =20 - virObjectLock(priv); - if (virTypedParamsSerialize(params, nparams, ADMIN_SERVER_CLIENT_LIMITS_MAX, (struct _virTypedParameterRemote **) &args= .params.params_val, @@ -420,7 +399,6 @@ remoteAdminServerSetClientLimits(virAdmServerPtr srv, cleanup: virTypedParamsRemoteFree((struct _virTypedParameterRemote *) args.para= ms.params_val, args.params.params_len); - virObjectUnlock(priv); return rv; } =20 @@ -433,11 +411,11 @@ remoteAdminConnectGetLoggingOutputs(virAdmConnectPtr = conn, remoteAdminPriv *priv =3D conn->privateData; admin_connect_get_logging_outputs_args args; admin_connect_get_logging_outputs_ret ret; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(priv); =20 args.flags =3D flags; =20 memset(&ret, 0, sizeof(ret)); - virObjectLock(priv); =20 if (call(conn, 0, @@ -446,16 +424,13 @@ remoteAdminConnectGetLoggingOutputs(virAdmConnectPtr = conn, (char *) &args, (xdrproc_t) xdr_admin_connect_get_logging_outputs_ret, (char *) &ret) =3D=3D -1) - goto done; + return -1; =20 if (outputs) *outputs =3D g_steal_pointer(&ret.outputs); =20 rv =3D ret.noutputs; xdr_free((xdrproc_t) xdr_admin_connect_get_logging_outputs_ret, (char = *) &ret); - - done: - virObjectUnlock(priv); return rv; } =20 @@ -468,11 +443,11 @@ remoteAdminConnectGetLoggingFilters(virAdmConnectPtr = conn, remoteAdminPriv *priv =3D conn->privateData; admin_connect_get_logging_filters_args args; admin_connect_get_logging_filters_ret ret; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(priv); =20 args.flags =3D flags; =20 memset(&ret, 0, sizeof(ret)); - virObjectLock(priv); =20 if (call(conn, 0, @@ -481,15 +456,12 @@ remoteAdminConnectGetLoggingFilters(virAdmConnectPtr = conn, (char *) &args, (xdrproc_t) xdr_admin_connect_get_logging_filters_ret, (char *) &ret) =3D=3D -1) - goto done; + return -1; =20 if (filters) *filters =3D ret.filters ? *ret.filters : NULL; =20 rv =3D ret.nfilters; VIR_FREE(ret.filters); - - done: - virObjectUnlock(priv); return rv; } --=20 2.38.1