From nobody Tue Feb 10 04:13:54 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=1644359604; cv=none; d=zohomail.com; s=zohoarc; b=Zl2D3urbCRq+vA/c7nKtAGGU9k8ktnCzqHmXSlA+qx32mmfGgHb9AarIj24KAy094kbUewI5UO+NPR5bW0sSQpzhBvuugBjZcYkXW6PzsTYHaIvWeKB1ni6CF15rXaplpvn5OnqK9H6iforikJUo93wQCA5DsMPSKdP4RdI8/Co= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644359604; 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=98AvDDqt5r6KCUNrc4nNjFq4xQ/68Ot+PRZHom6I1ek=; b=C/1wICLiy4uuiRgeqCgI8xdEb2MrIZlQpyyLJBdlli1xOUFSyY3ncBf3t4Xay/AhFN4735ybe6C7dkvSNF/IZnVNeu2hlez+ZWYWAI7P/CD0/kelyey48ZBYI5BZkHAwvkKUKUCcfNeiujD2AMIloVUL4zhL9Z4eU0rUSR8qQAw= 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 1644359604186266.6004232182212; Tue, 8 Feb 2022 14:33:24 -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-611-NjpwOkKkOnO7oT_GWudLXw-1; Tue, 08 Feb 2022 17:33:19 -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 7E52A1091DA6; Tue, 8 Feb 2022 22:33:12 +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 5F7B74CEF8; Tue, 8 Feb 2022 22:33:12 +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 307684A700; Tue, 8 Feb 2022 22:33:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 217DCPSH006371 for ; Mon, 7 Feb 2022 08:12:25 -0500 Received: by smtp.corp.redhat.com (Postfix) id D9ED41038AC9; Mon, 7 Feb 2022 13:12:25 +0000 (UTC) Received: from work.redhat.com (unknown [10.39.192.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2EB321079DC2; Mon, 7 Feb 2022 13:12:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644359603; 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=98AvDDqt5r6KCUNrc4nNjFq4xQ/68Ot+PRZHom6I1ek=; b=Lrv1OMwWVGaALOIim0Pg1N0FImFfkhp5OgYlGA9S4KeLISy3XD+jF+B/NysV0ZBSVHhFD8 2SWS8rVOiY4QTP5z99qj5tGP6o6lTPLKFVqtwjkdm2bA9FM4VKwXHKwbwLzC7aK3TEtqKW GaRGd3X7KF76dUKYFMf45G939KHNRro= X-MC-Unique: NjpwOkKkOnO7oT_GWudLXw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 09/11] network: Use automatic mutex management Date: Mon, 7 Feb 2022 14:12:12 +0100 Message-Id: <20220207131214.54855-10-twiederh@redhat.com> In-Reply-To: <20220207131214.54855-1-twiederh@redhat.com> References: <20220207131214.54855-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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: 1644359604976100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/network/bridge_driver.c | 41 +++++++++---------------------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 23d9ed4226..3750da7962 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -100,28 +100,11 @@ networkGetDriver(void) } =20 =20 -static void -networkDriverLock(virNetworkDriverState *driver) -{ - virMutexLock(&driver->lock); -} - - -static void -networkDriverUnlock(virNetworkDriverState *driver) -{ - virMutexUnlock(&driver->lock); -} - - static dnsmasqCaps * networkGetDnsmasqCaps(virNetworkDriverState *driver) { - dnsmasqCaps *ret; - networkDriverLock(driver); - ret =3D virObjectRef(driver->dnsmasqCaps); - networkDriverUnlock(driver); - return ret; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&driver->lock); + return virObjectRef(driver->dnsmasqCaps); } =20 =20 @@ -133,10 +116,11 @@ networkDnsmasqCapsRefresh(virNetworkDriverState *driv= er) if (!(caps =3D dnsmasqCapsNewFromBinary())) return -1; =20 - networkDriverLock(driver); - virObjectUnref(driver->dnsmasqCaps); - driver->dnsmasqCaps =3D caps; - networkDriverUnlock(driver); + VIR_WITH_MUTEX_LOCK_GUARD(&driver->lock) { + virObjectUnref(driver->dnsmasqCaps); + driver->dnsmasqCaps =3D caps; + } + return 0; } =20 @@ -2725,27 +2709,22 @@ static int networkBridgeNameValidate(virNetworkObjList *nets, virNetworkDef *def) { - virMutexLock(&bridgeNameValidateMutex); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&bridgeNameValidateMutex); =20 if (def->bridge && !strstr(def->bridge, "%d")) { if (virNetworkObjBridgeInUse(nets, def->bridge, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("bridge name '%s' already in use."), def->bridge); - goto error; + return -1; } } else { /* Allocate a bridge name */ if (networkFindUnusedBridgeName(nets, def) < 0) - goto error; + return -1; } =20 - virMutexUnlock(&bridgeNameValidateMutex); return 0; - - error: - virMutexUnlock(&bridgeNameValidateMutex); - return -1; } =20 =20 --=20 2.31.1