From nobody Mon Feb 9 19:52:13 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=1644575542; cv=none; d=zohomail.com; s=zohoarc; b=iGX+sB+ZDBMoK1tyxnqsh4zL3zi8Cg3RewBsXWeH5huLDw7wGXKuwu4vhes2BtEBxmHUo4Oio/eA3Fe7DIRmcYtsQrIrqJdfM9QBSnN6QMaG6pj+GyO8TF8VHgCqYahHWEvOzQDtzEidJXGley/6ZgHHWa1pwRnyW+qFxmDaISQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644575542; 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=sJqsW4W12mPIDLkuKVZchfmrYDWtWxAJB2wnJt1LUYQ=; b=GPZw0IZnVJ+mbKhwIn2uKiWySyBQ1kTWvLSy26SxM97d4yMvpQHTitjJq8P/tnfSkiKCcb45cyQWRMRLwtTNeIrQrShAIaIVAY2/P9IlzD9qrL6PlSvh5lJ3ksxc5XWxTHWU0SSRx1F2lB5LRQurhKGciVyM0/PVGtMyDk/iMbs= 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 1644575542635941.5099755544494; Fri, 11 Feb 2022 02:32:22 -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-203-tB4S9NHINNOwQo_rbOXkBQ-1; Fri, 11 Feb 2022 05:32:18 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 309DE10A2652; Fri, 11 Feb 2022 10:31:01 +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 0E0077C0DB; Fri, 11 Feb 2022 10:31:01 +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 D201D1809CBF; Fri, 11 Feb 2022 10:31:00 +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 21BAUoFB031706 for ; Fri, 11 Feb 2022 05:30:50 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8F7A77C0E8; Fri, 11 Feb 2022 10:30:50 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.193.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB11B7C0DC; Fri, 11 Feb 2022 10:30:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644575542; 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=sJqsW4W12mPIDLkuKVZchfmrYDWtWxAJB2wnJt1LUYQ=; b=KXJkpBaO6KihQmZhPnn+j/E7sLMlOQnzTKi3kvX390JelS4O/FPWFAXc8tpMdd/2hrJ/xR B2P1Y+hEzNOyiW5XfDBTt5tzgeIjHifcHUSBtvxa4sQWrKSMwocYQ3RnC8too1/SLl780n GWTuGF1BjEqOV/54ZubwXphQHJL6J84= X-MC-Unique: tB4S9NHINNOwQo_rbOXkBQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 02/10] vmware: Use automatic mutex management Date: Fri, 11 Feb 2022 11:30:38 +0100 Message-Id: <20220211103046.34651-3-twiederh@redhat.com> In-Reply-To: <20220211103046.34651-1-twiederh@redhat.com> References: <20220211103046.34651-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.16 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: 1644575544751100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/vmware/vmware_driver.c | 100 ++++++++++++------------------------- 1 file changed, 31 insertions(+), 69 deletions(-) diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 998ecdb546..da66f98db0 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -47,19 +47,6 @@ static const char * const vmrun_candidates[] =3D { #endif /* __APPLE__ */ }; =20 -static void -vmwareDriverLock(struct vmware_driver *driver) -{ - virMutexLock(&driver->lock); -} - -static void -vmwareDriverUnlock(struct vmware_driver *driver) -{ - virMutexUnlock(&driver->lock); -} - - static virDomainObj * vmwareDomObjFromDomainLocked(struct vmware_driver *driver, const unsigned char *uuid) @@ -83,12 +70,9 @@ static virDomainObj * vmwareDomObjFromDomain(struct vmware_driver *driver, const unsigned char *uuid) { - virDomainObj *vm; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 - vmwareDriverLock(driver); - vm =3D vmwareDomObjFromDomainLocked(driver, uuid); - vmwareDriverUnlock(driver); - return vm; + return vmwareDomObjFromDomainLocked(driver, uuid); } =20 =20 @@ -274,10 +258,9 @@ static int vmwareConnectGetVersion(virConnectPtr conn, unsigned long *version) { struct vmware_driver *driver =3D conn->privateData; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 - vmwareDriverLock(driver); *version =3D driver->version; - vmwareDriverUnlock(driver); return 0; } =20 @@ -395,6 +378,7 @@ vmwareDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int fla vmwareDomainPtr pDomain =3D NULL; virVMXContext ctx; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 virCheckFlags(VIR_DOMAIN_DEFINE_VALIDATE, NULL); =20 @@ -406,7 +390,6 @@ vmwareDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int fla ctx.autodetectSCSIControllerModel =3D NULL; ctx.datacenterPath =3D NULL; =20 - vmwareDriverLock(driver); if ((vmdef =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags)) =3D=3D NULL) goto cleanup; @@ -451,7 +434,6 @@ vmwareDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int fla VIR_FREE(vmxPath); if (vm) virObjectUnlock(vm); - vmwareDriverUnlock(driver); return dom; } =20 @@ -468,11 +450,10 @@ vmwareDomainShutdownFlags(virDomainPtr dom, struct vmware_driver *driver =3D dom->conn->privateData; virDomainObj *vm; int ret =3D -1; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 virCheckFlags(0, -1); =20 - vmwareDriverLock(driver); - if (!(vm =3D vmwareDomObjFromDomainLocked(driver, dom->uuid))) goto cleanup; =20 @@ -494,7 +475,6 @@ vmwareDomainShutdownFlags(virDomainPtr dom, ret =3D 0; cleanup: virDomainObjEndAPI(&vm); - vmwareDriverUnlock(driver); return ret; } =20 @@ -646,6 +626,7 @@ vmwareDomainCreateXML(virConnectPtr conn, const char *x= ml, vmwareDomainPtr pDomain =3D NULL; virVMXContext ctx; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 virCheckFlags(VIR_DOMAIN_START_VALIDATE, NULL); =20 @@ -657,8 +638,6 @@ vmwareDomainCreateXML(virConnectPtr conn, const char *x= ml, ctx.autodetectSCSIControllerModel =3D NULL; ctx.datacenterPath =3D NULL; =20 - vmwareDriverLock(driver); - if ((vmdef =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags)) =3D=3D NULL) goto cleanup; @@ -704,7 +683,6 @@ vmwareDomainCreateXML(virConnectPtr conn, const char *x= ml, VIR_FREE(vmx); VIR_FREE(vmxPath); virDomainObjEndAPI(&vm); - vmwareDriverUnlock(driver); return dom; } =20 @@ -715,10 +693,10 @@ vmwareDomainCreateWithFlags(virDomainPtr dom, struct vmware_driver *driver =3D dom->conn->privateData; virDomainObj *vm; int ret =3D -1; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 virCheckFlags(0, -1); =20 - vmwareDriverLock(driver); if (!(vm =3D vmwareDomObjFromDomainLocked(driver, dom->uuid))) goto cleanup; =20 @@ -735,7 +713,6 @@ vmwareDomainCreateWithFlags(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - vmwareDriverUnlock(driver); return ret; } =20 @@ -752,10 +729,10 @@ vmwareDomainUndefineFlags(virDomainPtr dom, struct vmware_driver *driver =3D dom->conn->privateData; virDomainObj *vm; int ret =3D -1; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 virCheckFlags(0, -1); =20 - vmwareDriverLock(driver); if (!(vm =3D vmwareDomObjFromDomainLocked(driver, dom->uuid))) goto cleanup; =20 @@ -777,7 +754,6 @@ vmwareDomainUndefineFlags(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - vmwareDriverUnlock(driver); return ret; } =20 @@ -791,12 +767,12 @@ static virDomainPtr vmwareDomainLookupByID(virConnectPtr conn, int id) { struct vmware_driver *driver =3D conn->privateData; - virDomainObj *vm; + virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; =20 - vmwareDriverLock(driver); - vm =3D virDomainObjListFindByID(driver->domains, id); - vmwareDriverUnlock(driver); + VIR_WITH_MUTEX_LOCK_GUARD(&driver->lock) { + vm =3D virDomainObjListFindByID(driver->domains, id); + } =20 if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, @@ -848,12 +824,12 @@ static virDomainPtr vmwareDomainLookupByName(virConnectPtr conn, const char *name) { struct vmware_driver *driver =3D conn->privateData; - virDomainObj *vm; + virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; =20 - vmwareDriverLock(driver); - vm =3D virDomainObjListFindByName(driver->domains, name); - vmwareDriverUnlock(driver); + VIR_WITH_MUTEX_LOCK_GUARD(&driver->lock) { + vm =3D virDomainObjListFindByName(driver->domains, name); + } =20 if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, @@ -972,28 +948,20 @@ static int vmwareConnectNumOfDefinedDomains(virConnectPtr conn) { struct vmware_driver *driver =3D conn->privateData; - int n; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 - vmwareDriverLock(driver); vmwareDomainObjListUpdateAll(driver->domains, driver); - n =3D virDomainObjListNumOfDomains(driver->domains, false, NULL, NULL); - vmwareDriverUnlock(driver); - - return n; + return virDomainObjListNumOfDomains(driver->domains, false, NULL, NULL= ); } =20 static int vmwareConnectNumOfDomains(virConnectPtr conn) { struct vmware_driver *driver =3D conn->privateData; - int n; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 - vmwareDriverLock(driver); vmwareDomainObjListUpdateAll(driver->domains, driver); - n =3D virDomainObjListNumOfDomains(driver->domains, true, NULL, NULL); - vmwareDriverUnlock(driver); - - return n; + return virDomainObjListNumOfDomains(driver->domains, true, NULL, NULL); } =20 =20 @@ -1001,14 +969,10 @@ static int vmwareConnectListDomains(virConnectPtr conn, int *ids, int nids) { struct vmware_driver *driver =3D conn->privateData; - int n; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 - vmwareDriverLock(driver); vmwareDomainObjListUpdateAll(driver->domains, driver); - n =3D virDomainObjListGetActiveIDs(driver->domains, ids, nids, NULL, N= ULL); - vmwareDriverUnlock(driver); - - return n; + return virDomainObjListGetActiveIDs(driver->domains, ids, nids, NULL, = NULL); } =20 static int @@ -1016,14 +980,11 @@ vmwareConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames) { struct vmware_driver *driver =3D conn->privateData; - int n; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 - vmwareDriverLock(driver); vmwareDomainObjListUpdateAll(driver->domains, driver); - n =3D virDomainObjListGetInactiveNames(driver->domains, names, nnames, - NULL, NULL); - vmwareDriverUnlock(driver); - return n; + return virDomainObjListGetInactiveNames(driver->domains, names, nnames, + NULL, NULL); } =20 static int @@ -1093,11 +1054,12 @@ vmwareConnectListAllDomains(virConnectPtr conn, =20 virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); =20 - vmwareDriverLock(driver); - vmwareDomainObjListUpdateAll(driver->domains, driver); - ret =3D virDomainObjListExport(driver->domains, conn, domains, - NULL, flags); - vmwareDriverUnlock(driver); + VIR_WITH_MUTEX_LOCK_GUARD(&driver->lock) { + vmwareDomainObjListUpdateAll(driver->domains, driver); + ret =3D virDomainObjListExport(driver->domains, conn, domains, + NULL, flags); + } + return ret; } =20 --=20 2.31.1