From nobody Mon Feb 9 03:12:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1586526952; cv=none; d=zohomail.com; s=zohoarc; b=ek8yWQDowd98Xi69CFgcFn/TORIEGuJbHz29uc1A4P63WcLj0LJm751ulBcXiqwNMjvpyyK7LIMX04KKg8L9jMm2fQGhsmGFw8qxaWMmJapJlx6bkmbItxgZ2JCjHzfWMhQzY1kqcZYWai1cmYfMHqiOGFx5kSQFcyKtusznjaM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586526952; 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=S1ECwdDxVoFUeK42/S12heDTgfhIhhreZ5jMpamUiU0=; b=VIU9Ofsn64uu4M/KKJeLa2XKVLUFWLU6QN1EZmXAWfCZQvi9k4/yKjLBKwfEALaug/WjMaSpts5/jxLr1SLU//0OvxatEkJrVasOKS2qGtU09U1NvyofSuu2yH6Ra0lYR3+VzOvWV6GpSv/TC3lLa86cZaJpcGbATT85V4aONRE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1586526952545769.0543549042004; Fri, 10 Apr 2020 06:55:52 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-194-2UpVd3LOPy-MbswI_uJTHA-1; Fri, 10 Apr 2020 09:55:49 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A76B8104FB63; Fri, 10 Apr 2020 13:55:43 +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 58271D7696; Fri, 10 Apr 2020 13:55:43 +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 A817718089CD; Fri, 10 Apr 2020 13:55:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03ADtc9U022878 for ; Fri, 10 Apr 2020 09:55:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id E5885127515; Fri, 10 Apr 2020 13:55:37 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E1147127510 for ; Fri, 10 Apr 2020 13:55:36 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3A961101A55F for ; Fri, 10 Apr 2020 13:55:36 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-61-fFT1YnlNN7mismilF7c_kg-1; Fri, 10 Apr 2020 09:55:34 -0400 Received: by mail-wr1-f67.google.com with SMTP id u13so1901723wrp.3 for ; Fri, 10 Apr 2020 06:55:33 -0700 (PDT) Received: from localhost.localdomain (public-gprs377075.centertel.pl. [37.47.104.52]) by smtp.gmail.com with ESMTPSA id c11sm3066319wrt.24.2020.04.10.06.55.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2020 06:55:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586526951; 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=S1ECwdDxVoFUeK42/S12heDTgfhIhhreZ5jMpamUiU0=; b=PIeO4KIyn+Vuu4ibHMONtHl2mWixqqGxHMeUv2pp0/zk07SuJmOKbdcaFZ03oABox52xjk OCslljlroNvaYrH15tvfmlWFQCdwq/krd4tGF0Il3DJ5IWsRZ72gZBaKidBE7caQg5ucYb LYXDkM2HnjRBVY3UrgtPxkElLGsfU2Q= X-MC-Unique: 2UpVd3LOPy-MbswI_uJTHA-1 X-MC-Unique: fFT1YnlNN7mismilF7c_kg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iuPXMwxiv2uUR+fWvreVncQ2fJIUyABx8axd9LoviVs=; b=jeEZ7PzjZyaoDxHzZrLdka+gXm4Tz9Y9V6qy3/QpZHS2nlbrwSWdHaVwadpcTfZqwA X+OUh/ADoCXYwvEp09kjL5Yd6vTVbd/+67+6VIxj2ly2QPILQjsD2kP0mwBxiKXE8qs/ zNS5LLut4W/fhUYoDy/BcMAYVw7K/YNbeMIe3Av4HVsLAcqk8e/8nSpQ3B8wALIpdUhn TBfJZnNEUEjg4x459H6MHFPBpaGUtodhmjz5rRKkBV+2a9g64ugh1/vpAYwVbyyNYf/h GdYuCcnVG/pSr6d6DxD28W3cvMdnUjBtA+mxLceeSdoS513XNsQlBqV9AQKcoKXOvLuo 4YNA== X-Gm-Message-State: AGi0PuavWuCULqIbjlPzXbW400/yF6meBw6bJZGWtGOcfN7muzwdHSjj WJ1TD3D4IoZ6cV/AgRpz4YcsZIhaKIk= X-Google-Smtp-Source: APiQypKewfx+/SunOtGkKa+kNJPEieZELLfYyEylwSATGfwjh/dvftlLUdt+Wb5jLgEdF1zGBxvq8g== X-Received: by 2002:a5d:658e:: with SMTP id q14mr4937768wru.92.1586526932562; Fri, 10 Apr 2020 06:55:32 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH 03/43] conf: nwfilter_ipaddrmap: convert virMutex to GMutex Date: Fri, 10 Apr 2020 15:54:30 +0200 Message-Id: <20200410135510.2148319-4-r4f4rfs@gmail.com> In-Reply-To: <20200410135510.2148319-1-r4f4rfs@gmail.com> References: <20200410135510.2148319-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 03ADtc9U022878 X-loop: libvir-list@redhat.com Cc: Rafael Fonseca 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.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Rafael Fonseca --- src/conf/nwfilter_ipaddrmap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/conf/nwfilter_ipaddrmap.c b/src/conf/nwfilter_ipaddrmap.c index 672a58be3a..3c1927f9ff 100644 --- a/src/conf/nwfilter_ipaddrmap.c +++ b/src/conf/nwfilter_ipaddrmap.c @@ -32,7 +32,7 @@ =20 #define VIR_FROM_THIS VIR_FROM_NWFILTER =20 -static virMutex ipAddressMapLock =3D VIR_MUTEX_INITIALIZER; +G_LOCK_DEFINE_STATIC(ipAddressMapLock); static virHashTablePtr ipAddressMap; =20 =20 @@ -55,7 +55,7 @@ virNWFilterIPAddrMapAddIPAddr(const char *ifname, char *a= ddr) =20 addrCopy =3D g_strdup(addr); =20 - virMutexLock(&ipAddressMapLock); + G_LOCK(ipAddressMapLock); =20 val =3D virHashLookup(ipAddressMap, ifname); if (!val) { @@ -76,7 +76,7 @@ virNWFilterIPAddrMapAddIPAddr(const char *ifname, char *a= ddr) ret =3D 0; =20 cleanup: - virMutexUnlock(&ipAddressMapLock); + G_UNLOCK(ipAddressMapLock); VIR_FREE(addrCopy); =20 return ret; @@ -102,7 +102,7 @@ virNWFilterIPAddrMapDelIPAddr(const char *ifname, const= char *ipaddr) int ret =3D -1; virNWFilterVarValuePtr val =3D NULL; =20 - virMutexLock(&ipAddressMapLock); + G_LOCK(ipAddressMapLock); =20 if (ipaddr !=3D NULL) { val =3D virHashLookup(ipAddressMap, ifname); @@ -121,7 +121,7 @@ virNWFilterIPAddrMapDelIPAddr(const char *ifname, const= char *ipaddr) ret =3D 0; } =20 - virMutexUnlock(&ipAddressMapLock); + G_UNLOCK(ipAddressMapLock); =20 return ret; } @@ -137,11 +137,11 @@ virNWFilterIPAddrMapGetIPAddr(const char *ifname) { virNWFilterVarValuePtr res; =20 - virMutexLock(&ipAddressMapLock); + G_LOCK(ipAddressMapLock); =20 res =3D virHashLookup(ipAddressMap, ifname); =20 - virMutexUnlock(&ipAddressMapLock); + G_UNLOCK(ipAddressMapLock); =20 return res; } --=20 2.25.2