From nobody Mon Feb 9 18:18:06 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=1649775495; cv=none; d=zohomail.com; s=zohoarc; b=JcE9Pbqf8I3vj2jxOSwqydjOkTOHbepoAP3wn4qzoqIEUAV3y9GiDMeM8y6aM+lFjYb//bZpVs0Hd31ws05gtlgHyDZd6nbTZ9XT0/1PYk1bESp9MBc604aCojfYgbpYTKxHyjrOs75DEmqIP7pKb8wkJtwc+ceLAfSftoyOjKo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1649775495; 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=h8ocscd3lChP1udQsk2Ti8LgrkjCTAvX5Zo4DdiH0+M=; b=Nw+sg/BtT6SvnWM1G6CI1wOPr2nuefP7uBC2r7o1WXO8oyzHnINcuZ9FDseQv318k9D8sRk7gdh69ogKgbu+LGHR3B97nM1gwiEVJVSlYWwmIw2XfvJNRcE2N+a7ra3SpHeMZ+M5sPXKT/xR9Ubx93r9CJ0Dit/Dcz1YALoD9wc= 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 1649775495799884.697490789063; Tue, 12 Apr 2022 07:58:15 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-658-1lz0u_VaMBiUzBH1YYYtyg-1; Tue, 12 Apr 2022 10:58:11 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 036211C1298E; Tue, 12 Apr 2022 14:57:39 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFDB4482CFC; Tue, 12 Apr 2022 14:57:38 +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 B4F5C193F6E0; Tue, 12 Apr 2022 14:57:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 42924193F50A for ; Tue, 12 Apr 2022 14:57:37 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3461A432039; Tue, 12 Apr 2022 14:57:37 +0000 (UTC) Received: from work.redhat.com (unknown [10.39.194.239]) by smtp.corp.redhat.com (Postfix) with ESMTP id B91A9406793; Tue, 12 Apr 2022 14:57:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649775494; 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=h8ocscd3lChP1udQsk2Ti8LgrkjCTAvX5Zo4DdiH0+M=; b=UZZ80hr1576ufg95ccckyVOqMW+H7pBNs77hC5iEPZbgrUm2SP09A4rItu2VmMQIqyt7TZ D5KV+omhwtgpMTqiip08DwuhDWxW0AUECd26Ln54wV6wc1O715Yyk4vLMJQSv1NblLAYE2 C0dc0L2pjMs1vgttimbdYDCbpP3dk7E= X-MC-Unique: 1lz0u_VaMBiUzBH1YYYtyg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 10/10] vz_driver: Use automatic mutex management Date: Tue, 12 Apr 2022 16:57:27 +0200 Message-Id: <20220412145727.69564-11-twiederh@redhat.com> In-Reply-To: <20220412145727.69564-1-twiederh@redhat.com> References: <20220412145727.69564-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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: , Cc: Tim Wiederhake Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 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: 1649775497251100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Tim Wiederhake --- src/vz/vz_driver.c | 50 +++++++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 2107785ab2..82323cb1b2 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2018,53 +2018,43 @@ vzConnectRegisterCloseCallback(virConnectPtr conn, virFreeCallback freecb) { struct _vzConn *privconn =3D conn->privateData; - int ret =3D -1; =20 if (virConnectRegisterCloseCallbackEnsureACL(conn) < 0) return -1; =20 - virObjectLock(privconn->driver); + VIR_WITH_OBJECT_LOCK_GUARD(privconn->driver) { + if (virConnectCloseCallbackDataGetCallback(privconn->closeCallback= ) !=3D NULL) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("A close callback is already registered")); + return -1; + } =20 - if (virConnectCloseCallbackDataGetCallback(privconn->closeCallback) != =3D NULL) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("A close callback is already registered")); - goto cleanup; + virConnectCloseCallbackDataRegister(privconn->closeCallback, conn,= cb, + opaque, freecb); } =20 - virConnectCloseCallbackDataRegister(privconn->closeCallback, conn, cb, - opaque, freecb); - ret =3D 0; - - cleanup: - virObjectUnlock(privconn->driver); - - return ret; + return 0; } =20 static int vzConnectUnregisterCloseCallback(virConnectPtr conn, virConnectCloseFunc c= b) { struct _vzConn *privconn =3D conn->privateData; - int ret =3D -1; =20 if (virConnectUnregisterCloseCallbackEnsureACL(conn) < 0) return -1; =20 - virObjectLock(privconn->driver); + VIR_WITH_OBJECT_LOCK_GUARD(privconn->driver) { + if (virConnectCloseCallbackDataGetCallback(privconn->closeCallback= ) !=3D cb) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("A different callback was requested")); + return -1; + } =20 - if (virConnectCloseCallbackDataGetCallback(privconn->closeCallback) != =3D cb) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("A different callback was requested")); - goto cleanup; + virConnectCloseCallbackDataUnregister(privconn->closeCallback, cb); } =20 - virConnectCloseCallbackDataUnregister(privconn->closeCallback, cb); - ret =3D 0; - - cleanup: - virObjectUnlock(privconn->driver); - - return ret; + return 0; } =20 static int vzDomainSetMemoryFlags(virDomainPtr domain, unsigned long memor= y, @@ -3795,9 +3785,9 @@ vzConnectGetAllDomainStats(virConnectPtr conn, virDomainStatsRecordPtr tmp; virDomainObj *dom =3D doms[i]; =20 - virObjectLock(dom); - tmp =3D vzDomainGetAllStats(conn, dom); - virObjectUnlock(dom); + VIR_WITH_OBJECT_LOCK_GUARD(dom) { + tmp =3D vzDomainGetAllStats(conn, dom); + } =20 if (!tmp) goto cleanup; --=20 2.31.1