From nobody Mon Feb 9 17:22:36 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=1646415040; cv=none; d=zohomail.com; s=zohoarc; b=edrqLlWo7E/hiBUeeWqf6yfhywpiPX71Zkm8seJr+D6ClD2MHZWQagwbtnWk/n6jJGvZnUWSRrh/KKdzlViqLDwDOsJMa2KnzCrx+zDUBolJucFigqPBnXTA4zd9W2bIChKYtjNSmnYYNhjcbc+clOLBQYYCdSS1Bbb+2Zpw3L4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646415040; 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=S7U3OotaIBRFLTt3VrLhn/kYES7j2vBGhVGu7WP9U9I=; b=UqC2rUodM1/Ge6fkhFGKB1RMSw+LBkZQ909AYP2hgZqAQnD24w/4/+Unzr70Tad+ryBJ+s7NQUM7RKe5jrxZeaYGlHLrBCRl6R4w5T+x7iAdL8CTucTgmwHNv1ZFLJ+3Q8S2IL9e5+sC6m9py76J4Q9Iwx3oT8tN0arISPI2emE= 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 1646415040940292.0903035241432; Fri, 4 Mar 2022 09:30:40 -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-102-ssE1is64Pf-YOvYU_9zXFw-1; Fri, 04 Mar 2022 12:30:36 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 55D281856A74; Fri, 4 Mar 2022 17:30:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 36B1E837B9; Fri, 4 Mar 2022 17:30:31 +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 F12D344A5A; Fri, 4 Mar 2022 17:30:30 +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 224HT69e024553 for ; Fri, 4 Mar 2022 12:29:06 -0500 Received: by smtp.corp.redhat.com (Postfix) id 19C8E7DE57; Fri, 4 Mar 2022 17:29:06 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.195.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6134386B48; Fri, 4 Mar 2022 17:28:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646415039; 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=S7U3OotaIBRFLTt3VrLhn/kYES7j2vBGhVGu7WP9U9I=; b=Hoo8WD45W9WT89i0b8jiGbz2vSjQc06s5syJ4KaCgHfc0+w6pReMZc4POfXnOzj5lxfbvi E19VSaQzr2pcQeucSbcuu5jPsBRT0dZ7a52wAU1zlzE47u2/bdU3Kg3rfqv8XnVjAEomSi XLoRlnCHieQuv5jCgsMZrwORtb6YmYQ= X-MC-Unique: ssE1is64Pf-YOvYU_9zXFw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 02/10] openvz: Use automatic mutex management Date: Fri, 4 Mar 2022 18:28:32 +0100 Message-Id: <20220304172840.66057-3-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.15 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: 1646415042525100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/openvz/openvz_driver.c | 91 ++++++++++++-------------------------- 1 file changed, 28 insertions(+), 63 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index aa1db09540..d8e4dd7f8b 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -65,16 +65,6 @@ static int openvzDomainSetMemoryInternal(virDomainObj *v= m, unsigned long long memory); static int openvzGetVEStatus(virDomainObj *vm, int *status, int *reason); =20 -static void openvzDriverLock(struct openvz_driver *driver) -{ - virMutexLock(&driver->lock); -} - -static void openvzDriverUnlock(struct openvz_driver *driver) -{ - virMutexUnlock(&driver->lock); -} - struct openvz_driver ovz_driver; =20 =20 @@ -101,12 +91,9 @@ static virDomainObj * openvzDomObjFromDomain(struct openvz_driver *driver, const unsigned char *uuid) { - virDomainObj *vm; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 - openvzDriverLock(driver); - vm =3D openvzDomObjFromDomainLocked(driver, uuid); - openvzDriverUnlock(driver); - return vm; + return openvzDomObjFromDomainLocked(driver, uuid); } =20 =20 @@ -262,12 +249,12 @@ static virDomainPtr openvzDomainLookupByID(virConnect= Ptr conn, int id) { struct openvz_driver *driver =3D conn->privateData; - virDomainObj *vm; + virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; =20 - openvzDriverLock(driver); - vm =3D virDomainObjListFindByID(driver->domains, id); - openvzDriverUnlock(driver); + VIR_WITH_MUTEX_LOCK_GUARD(&driver->lock) { + vm =3D virDomainObjListFindByID(driver->domains, id); + } =20 if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, @@ -285,9 +272,9 @@ static virDomainPtr openvzDomainLookupByID(virConnectPt= r conn, static int openvzConnectGetVersion(virConnectPtr conn, unsigned long *vers= ion) { struct openvz_driver *driver =3D conn->privateData; - openvzDriverLock(driver); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); + *version =3D driver->version; - openvzDriverUnlock(driver); return 0; } =20 @@ -334,12 +321,12 @@ static virDomainPtr openvzDomainLookupByName(virConne= ctPtr conn, const char *name) { struct openvz_driver *driver =3D conn->privateData; - virDomainObj *vm; + virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; =20 - openvzDriverLock(driver); - vm =3D virDomainObjListFindByName(driver->domains, name); - openvzDriverUnlock(driver); + VIR_WITH_MUTEX_LOCK_GUARD(&driver->lock) { + vm =3D virDomainObjListFindByName(driver->domains, name); + } =20 if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, @@ -808,13 +795,13 @@ openvzDomainDefineXMLFlags(virConnectPtr conn, const = char *xml, unsigned int fla virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; 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 if (flags & VIR_DOMAIN_DEFINE_VALIDATE) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 - openvzDriverLock(driver); if ((vmdef =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags)) =3D=3D NULL) goto cleanup; @@ -876,7 +863,6 @@ openvzDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int fla =20 cleanup: virDomainObjEndAPI(&vm); - openvzDriverUnlock(driver); return dom; } =20 @@ -896,13 +882,13 @@ openvzDomainCreateXML(virConnectPtr conn, const char = *xml, virDomainObj *vm =3D NULL; virDomainPtr dom =3D NULL; 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 if (flags & VIR_DOMAIN_START_VALIDATE) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 - openvzDriverLock(driver); if ((vmdef =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags)) =3D=3D NULL) goto cleanup; @@ -963,7 +949,6 @@ openvzDomainCreateXML(virConnectPtr conn, const char *x= ml, =20 cleanup: virDomainObjEndAPI(&vm); - openvzDriverUnlock(driver); return dom; } =20 @@ -972,15 +957,15 @@ openvzDomainCreateWithFlags(virDomainPtr dom, unsigne= d int flags) { g_autoptr(virCommand) cmd =3D virCommandNewArgList(VZCTL, "--quiet", "= start", NULL); struct openvz_driver *driver =3D dom->conn->privateData; - virDomainObj *vm; + virDomainObj *vm =3D NULL; int ret =3D -1; int status; =20 virCheckFlags(0, -1); =20 - openvzDriverLock(driver); - vm =3D virDomainObjListFindByName(driver->domains, dom->name); - openvzDriverUnlock(driver); + VIR_WITH_MUTEX_LOCK_GUARD(&driver->lock) { + vm =3D virDomainObjListFindByName(driver->domains, dom->name); + } =20 if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, @@ -1028,10 +1013,10 @@ openvzDomainUndefineFlags(virDomainPtr dom, virDomainObj *vm; int ret =3D -1; int status; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 virCheckFlags(0, -1); =20 - openvzDriverLock(driver); if (!(vm =3D openvzDomObjFromDomainLocked(driver, dom->uuid))) goto cleanup; =20 @@ -1052,7 +1037,6 @@ openvzDomainUndefineFlags(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - openvzDriverUnlock(driver); return ret; } =20 @@ -1321,13 +1305,9 @@ openvzConnectIsAlive(virConnectPtr conn G_GNUC_UNUSE= D) =20 static char *openvzConnectGetCapabilities(virConnectPtr conn) { struct openvz_driver *driver =3D conn->privateData; - char *ret; - - openvzDriverLock(driver); - ret =3D virCapabilitiesFormatXML(driver->caps); - openvzDriverUnlock(driver); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 - return ret; + return virCapabilitiesFormatXML(driver->caps); } =20 static int openvzConnectListDomains(virConnectPtr conn G_GNUC_UNUSED, @@ -1370,13 +1350,9 @@ static int openvzConnectListDomains(virConnectPtr co= nn G_GNUC_UNUSED, static int openvzConnectNumOfDomains(virConnectPtr conn) { struct openvz_driver *driver =3D conn->privateData; - int n; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 - openvzDriverLock(driver); - n =3D virDomainObjListNumOfDomains(driver->domains, true, NULL, NULL); - openvzDriverUnlock(driver); - - return n; + return virDomainObjListNumOfDomains(driver->domains, true, NULL, NULL); } =20 static int openvzConnectListDefinedDomains(virConnectPtr conn G_GNUC_UNUSE= D, @@ -1480,13 +1456,9 @@ Version: 2.2 static int openvzConnectNumOfDefinedDomains(virConnectPtr conn) { struct openvz_driver *driver =3D conn->privateData; - int n; - - openvzDriverLock(driver); - n =3D virDomainObjListNumOfDomains(driver->domains, false, NULL, NULL); - openvzDriverUnlock(driver); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 - return n; + return virDomainObjListNumOfDomains(driver->domains, false, NULL, NULL= ); } =20 static int @@ -1818,11 +1790,11 @@ openvzDomainUpdateDeviceFlags(virDomainPtr dom, con= st char *xml, virDomainObj *vm =3D NULL; virDomainDef *def =3D NULL; bool persist =3D false; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 virCheckFlags(VIR_DOMAIN_DEVICE_MODIFY_LIVE | VIR_DOMAIN_DEVICE_MODIFY_CONFIG, -1); =20 - openvzDriverLock(driver); if (!(vm =3D openvzDomObjFromDomainLocked(driver, dom->uuid))) goto cleanup; =20 @@ -1849,7 +1821,6 @@ openvzDomainUpdateDeviceFlags(virDomainPtr dom, const= char *xml, ret =3D 0; =20 cleanup: - openvzDriverUnlock(driver); virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); return ret; @@ -1861,16 +1832,10 @@ openvzConnectListAllDomains(virConnectPtr conn, unsigned int flags) { struct openvz_driver *driver =3D conn->privateData; - int ret =3D -1; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); =20 virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); - - openvzDriverLock(driver); - ret =3D virDomainObjListExport(driver->domains, conn, domains, - NULL, flags); - openvzDriverUnlock(driver); - - return ret; + return virDomainObjListExport(driver->domains, conn, domains, NULL, fl= ags); } =20 =20 --=20 2.31.1