From nobody Fri May 10 08:36:49 2024 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=1645803329; cv=none; d=zohomail.com; s=zohoarc; b=fCfZGAxd5Zr8glSzhMHiLAVzgqP+YHxtctjOxhInVwY/jI/wrALK+ITDu0ogjMt2LruZrmLkH6gpKe7ffXJEi+hvHN7iL7f0BMPnPpbvMrudz/Dr0PuE+bPTUgPvzZYrrmlG1apHz6t9lpRE5/uH840df64OnrJM6Ai19WxhnY0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645803329; h=Content-Type:Content-Transfer-Encoding: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=iLwjZ/6CITAHSTULSuNjN0vh4yVkAU5cWXDpBAt9ews=; b=Kmo9rA39mKtR6XWQgs0nnbYadGjmAPTOMrSrvhm7mnmy8MIVq8ye0+tpAh/7jema0wCw0Dlb8Ds0Lbb7FTlJ3vW2M3H4NY0VcMP8oSypyS8Qzkiy+clGHx9+3yY23rbVeJhsjENLK/9NHn5R3vSbH5nB42DPzpiCKp0lhVXdJbQ= 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 1645803329324820.3506078721151; Fri, 25 Feb 2022 07:35:29 -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-171-eKD1Jbw7P6mRPtIiqotRjg-1; Fri, 25 Feb 2022 10:35:23 -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 86C271091DA2; Fri, 25 Feb 2022 15:35:17 +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 635F47DE2C; Fri, 25 Feb 2022 15:35:17 +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 25C851809CB2; Fri, 25 Feb 2022 15:35:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21PFUu7t024497 for ; Fri, 25 Feb 2022 10:30:56 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0EE3A7C027; Fri, 25 Feb 2022 15:30:56 +0000 (UTC) Received: from domokun.gsslab.fab.redhat.com (gx270-2.gsslab.fab.redhat.com [10.33.8.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80B967C025; Fri, 25 Feb 2022 15:30:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645803327; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=iLwjZ/6CITAHSTULSuNjN0vh4yVkAU5cWXDpBAt9ews=; b=YMSUNbSalCimDBLeCX1NkvXUNGBC15ZpOz0xb2Hq/eN/n3eSqkRGQN3CaAgNI0XNcqGqxA Y+skMeF6v4REvyhJrhE7S7dMQ4GTi9J242T0t3pWNhVrQfgh07QTKSGEUktt2U+jRo9HU0 v81f2Jh4xxK+THvFbIFOeYBelu+j7aM= X-MC-Unique: eKD1Jbw7P6mRPtIiqotRjg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/5] nwfilter: stop using recursive mutex for IP learning Date: Fri, 25 Feb 2022 15:30:49 +0000 Message-Id: <20220225153053.3241652-2-berrange@redhat.com> In-Reply-To: <20220225153053.3241652-1-berrange@redhat.com> References: <20220225153053.3241652-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1645803330395100001 The virNWFilterLockIface method is only called from one place, the learnIPAddressThread method. This is the entry point for the learning thread on the interface in question. As such there is never any recursive locking on this mutex from the same thread. This appears to have been the case since the code was first introduced. Thus a plain mutex is sufficient. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/nwfilter/nwfilter_learnipaddr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_le= arnipaddr.c index fb552bd1e6..4840b0539f 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -151,7 +151,7 @@ virNWFilterLockIface(const char *ifname) if (!ifaceLock) { ifaceLock =3D g_new0(virNWFilterIfaceLock, 1); =20 - if (virMutexInitRecursive(&ifaceLock->lock) < 0) { + if (virMutexInit(&ifaceLock->lock) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("mutex initialization failed")); g_free(ifaceLock); --=20 2.35.1 From nobody Fri May 10 08:36:49 2024 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=1645803198; cv=none; d=zohomail.com; s=zohoarc; b=W8kGOMsTKt3ZlBRzBZkOFj0Npw9/AQB2QzPQWoCBL9+48TMytLri8Msk9KdUR+YA2Fe1jadMg9V51nXpI+E6wX6frmExIVvdt3uaL/6g9kgLwE7bQ3gQ+rZoJSopXBoV6DRiGRHmQwvFkeo1BUzdNJvwfjmCQfVUTzaan1oZhzM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645803198; h=Content-Type:Content-Transfer-Encoding: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=/JmnA57FgtCdY9e6Ls4CospbKdzDQEcLOavGoERJtYw=; b=W0wfAEAivNGobF85d1UC9plfuGvuNnGJVHsep72G1md5XGiNcWAHDDngjb2/5fAISN9NlYs8oxyGBl+l7sjkdcEkjTE+1ErmvqU/ZS5mVuB9Hv6kH/6lKNwMYdioaUSYPCnZ1Sm4rQc+QUWmBhT6YOIiYdtEvRdv7JMm7N8L1CU= 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 1645803198240357.33781108009873; Fri, 25 Feb 2022 07:33:18 -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-279-MTPtBTfTMY2y-9y2FZbzkg-1; Fri, 25 Feb 2022 10:33:13 -0500 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 CFD50800476; Fri, 25 Feb 2022 15:33:07 +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 32BE47F0CF; Fri, 25 Feb 2022 15:33:05 +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 6BF0A4ED28; Fri, 25 Feb 2022 15:33:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21PFUuMT024507 for ; Fri, 25 Feb 2022 10:30:57 -0500 Received: by smtp.corp.redhat.com (Postfix) id D1EA87C027; Fri, 25 Feb 2022 15:30:56 +0000 (UTC) Received: from domokun.gsslab.fab.redhat.com (gx270-2.gsslab.fab.redhat.com [10.33.8.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F6B57C026; Fri, 25 Feb 2022 15:30:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645803197; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=/JmnA57FgtCdY9e6Ls4CospbKdzDQEcLOavGoERJtYw=; b=MBu17M2SPUib1cTG7jIBRyJf2D6qVPWJxy8vzRjUbBsVIZWXvc/UjY7InugEFihKva5jC4 W6MUCgYAvdY5lyW6y9fPXn4zHQ0wxYqlkNth28hHnf+33sDYPDktppmlpvxXWgDMlFZgkH JR/LLOZirRMLkaIQzZyJaB2P2JU1fg0= X-MC-Unique: MTPtBTfTMY2y-9y2FZbzkg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/5] nwfilter: hold filter update lock when creating/deleting bindings Date: Fri, 25 Feb 2022 15:30:50 +0000 Message-Id: <20220225153053.3241652-3-berrange@redhat.com> In-Reply-To: <20220225153053.3241652-1-berrange@redhat.com> References: <20220225153053.3241652-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com 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 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1645803199085100001 The nwfilter update lock is historically acquired by the virt drivers in order to achieve serialization between nwfilter define/undefine, and instantiation/teardown of filters. When running in the modular daemons, however, the mutex that the virt drivers are locking is in a completely different process from the mutex that the nwfilter driver is locking. Serialization is lost and thus call from the virt driver to virNWFilterBindingCreateXML can deadlock with a concurrent call to the virNWFilterDefineXML method. The solution is surprisingly easy, the update lock simply needs acquiring in the virNWFilterBindingCreateXML method and virNWFilterBindingUndefine method instead of in the virt drivers. The only semantic difference here is that when a virtual machine has multiple NICs, the instantiation and teardown of filters is no longer serialized for the whole VM, but rather for each NIC. This should not be a problem since the virt drivers already need to cope with tearing down a partially created VM where only some of the NICs are setup. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- src/nwfilter/nwfilter_driver.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 08f138dd79..3ce8fce7f9 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -760,11 +760,14 @@ nwfilterBindingCreateXML(virConnectPtr conn, if (!(ret =3D virGetNWFilterBinding(conn, def->portdevname, def->filte= r))) goto cleanup; =20 + virNWFilterReadLockFilterUpdates(); if (virNWFilterInstantiateFilter(driver, def) < 0) { + virNWFilterUnlockFilterUpdates(); virNWFilterBindingObjListRemove(driver->bindings, obj); g_clear_pointer(&ret, virObjectUnref); goto cleanup; } + virNWFilterUnlockFilterUpdates(); virNWFilterBindingObjSave(obj, driver->bindingDir); =20 cleanup: @@ -801,7 +804,9 @@ nwfilterBindingDelete(virNWFilterBindingPtr binding) if (virNWFilterBindingDeleteEnsureACL(binding->conn, def) < 0) goto cleanup; =20 + virNWFilterReadLockFilterUpdates(); virNWFilterTeardownFilter(def); + virNWFilterUnlockFilterUpdates(); virNWFilterBindingObjDelete(obj, driver->bindingDir); virNWFilterBindingObjListRemove(driver->bindings, obj); =20 --=20 2.35.1 From nobody Fri May 10 08:36:49 2024 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=1645803217; cv=none; d=zohomail.com; s=zohoarc; b=Iic7IffseJb9OLZL3xheSXg6ZF+eK76xyVdz/5xj9iQ4/V6gKS6y4rT0dkO7Orjlz83U8PtDm2ueLrg/WzsTZmTTrgCu7/fPHfSYq3AUEj/VOmRmbvnaFxBXzjckhpQ2aJ+lUZSodbZjeh8q2sM2WpqjWMMLUxn1iKeuGKbWm88= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645803217; h=Content-Type:Content-Transfer-Encoding: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=E740e1l8hUH4hcGSThu2u3IDsbSJ2PMnKMMEc9Hd6e0=; b=JaRej4etUL/kBL22ONz9vx7vQx6/3RXXctxzE68Og76an8AkQcBvHIg1zaQ6LEnuDibUHCT3AzW+9vzm+ZbB9JMjZvz+09T65COc0ZEXlaRiuPuwLE6bo9B8aWCg7pPNZ9woUUoDu6f6iacawQ9RGCZb6ExFXAk18JLq9zATgZY= 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 164580321705679.07227566224697; Fri, 25 Feb 2022 07:33:37 -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-260-qnM3pjMcOCGFuBX3bAg6Rg-1; Fri, 25 Feb 2022 10:33:31 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EEB175123; Fri, 25 Feb 2022 15:33:26 +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 A8F087C034; Fri, 25 Feb 2022 15:33:26 +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 F091E4ED79; Fri, 25 Feb 2022 15:33:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21PFUvkF024512 for ; Fri, 25 Feb 2022 10:30:57 -0500 Received: by smtp.corp.redhat.com (Postfix) id A08DF7C026; Fri, 25 Feb 2022 15:30:57 +0000 (UTC) Received: from domokun.gsslab.fab.redhat.com (gx270-2.gsslab.fab.redhat.com [10.33.8.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E24F7C029; Fri, 25 Feb 2022 15:30:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645803215; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=E740e1l8hUH4hcGSThu2u3IDsbSJ2PMnKMMEc9Hd6e0=; b=HM2q4eP4ZxyHInWRo7KHdg1ssb1eecmnGjMxZD3igTq/6bPa+1z0Ogk3fE4PIDic42wcsA 8YYi4vP+LAEPNm0CQgrNzG1zy5QzvfzS5D2QpQts53ek0raGmn2FJx63zasaUl6CxC8uVR X5Z+e3cVWBUai/3Sdiw3cUTbgkW+e8U= X-MC-Unique: qnM3pjMcOCGFuBX3bAg6Rg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/5] qemu,lxc: remove use to nwfilter update lock Date: Fri, 25 Feb 2022 15:30:51 +0000 Message-Id: <20220225153053.3241652-4-berrange@redhat.com> In-Reply-To: <20220225153053.3241652-1-berrange@redhat.com> References: <20220225153053.3241652-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com 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.14 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1645803219249100001 Now that the virNWFilterBinding APIs are using the nwfilter update lock directly, there is no need for the virt drivers to do it themselves. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- src/lxc/lxc_driver.c | 6 ------ src/qemu/qemu_driver.c | 18 ------------------ src/qemu/qemu_migration.c | 3 --- src/qemu/qemu_process.c | 4 ---- 4 files changed, 31 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 020ec257ae..4185a61267 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -971,8 +971,6 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom, =20 virCheckFlags(VIR_DOMAIN_START_AUTODESTROY, -1); =20 - virNWFilterReadLockFilterUpdates(); - if (!(vm =3D lxcDomObjFromDomain(dom))) goto cleanup; =20 @@ -1014,7 +1012,6 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); - virNWFilterUnlockFilterUpdates(); return ret; } =20 @@ -1080,8 +1077,6 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, if (flags & VIR_DOMAIN_START_VALIDATE) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 - virNWFilterReadLockFilterUpdates(); - if (!(caps =3D virLXCDriverGetCapabilities(driver, false))) goto cleanup; =20 @@ -1138,7 +1133,6 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, cleanup: virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); - virNWFilterUnlockFilterUpdates(); return dom; } =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b74b0375a7..e4e1cd7bdf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1606,8 +1606,6 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, if (flags & VIR_DOMAIN_START_RESET_NVRAM) start_flags |=3D VIR_QEMU_PROCESS_START_RESET_NVRAM; =20 - virNWFilterReadLockFilterUpdates(); - if (!(def =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags))) goto cleanup; @@ -1661,7 +1659,6 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event2); - virNWFilterUnlockFilterUpdates(); return dom; } =20 @@ -5776,8 +5773,6 @@ qemuDomainRestoreFlags(virConnectPtr conn, if (flags & VIR_DOMAIN_SAVE_RESET_NVRAM) reset_nvram =3D true; =20 - virNWFilterReadLockFilterUpdates(); - fd =3D qemuSaveImageOpen(driver, NULL, path, &def, &data, (flags & VIR_DOMAIN_SAVE_BYPASS_CACHE) !=3D 0, &wrapperFd, false, false); @@ -5849,7 +5844,6 @@ qemuDomainRestoreFlags(virConnectPtr conn, if (vm && ret < 0) qemuDomainRemoveInactiveJob(driver, vm); virDomainObjEndAPI(&vm); - virNWFilterUnlockFilterUpdates(); return ret; } =20 @@ -6403,8 +6397,6 @@ qemuDomainCreateWithFlags(virDomainPtr dom, unsigned = int flags) VIR_DOMAIN_START_FORCE_BOOT | VIR_DOMAIN_START_RESET_NVRAM, -1); =20 - virNWFilterReadLockFilterUpdates(); - if (!(vm =3D qemuDomainObjFromDomain(dom))) goto cleanup; =20 @@ -6433,7 +6425,6 @@ qemuDomainCreateWithFlags(virDomainPtr dom, unsigned = int flags) =20 cleanup: virDomainObjEndAPI(&vm); - virNWFilterUnlockFilterUpdates(); return ret; } =20 @@ -7815,8 +7806,6 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, virDomainObj *vm =3D NULL; int ret =3D -1; =20 - virNWFilterReadLockFilterUpdates(); - if (!(vm =3D qemuDomainObjFromDomain(dom))) goto cleanup; =20 @@ -7839,7 +7828,6 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virNWFilterUnlockFilterUpdates(); return ret; } =20 @@ -7869,8 +7857,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, VIR_DOMAIN_AFFECT_CONFIG | VIR_DOMAIN_DEVICE_MODIFY_FORCE, -1); =20 - virNWFilterReadLockFilterUpdates(); - cfg =3D virQEMUDriverGetConfig(driver); =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) @@ -7947,7 +7933,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, if (dev !=3D dev_copy) virDomainDeviceDefFree(dev_copy); virDomainObjEndAPI(&vm); - virNWFilterUnlockFilterUpdates(); return ret; } =20 @@ -13654,8 +13639,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, virDomainObj *vm =3D NULL; int ret =3D -1; =20 - virNWFilterReadLockFilterUpdates(); - if (!(vm =3D qemuDomObjFromSnapshot(snapshot))) goto cleanup; =20 @@ -13666,7 +13649,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, =20 cleanup: virDomainObjEndAPI(&vm); - virNWFilterUnlockFilterUpdates(); return ret; } =20 diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 5aecdddff0..43ee094486 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2782,8 +2782,6 @@ qemuMigrationDstPrepareAny(virQEMUDriver *driver, int rv; g_autofree char *tlsAlias =3D NULL; =20 - virNWFilterReadLockFilterUpdates(); - if (flags & VIR_MIGRATE_OFFLINE) { if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)) { @@ -3103,7 +3101,6 @@ qemuMigrationDstPrepareAny(virQEMUDriver *driver, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); qemuMigrationCookieFree(mig); - virNWFilterUnlockFilterUpdates(); virErrorRestore(&origErr); return ret; =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 5af925e521..b19a6218d0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -9004,7 +9004,6 @@ qemuProcessReconnect(void *opaque) qemuDomainRemoveInactiveJob(driver, obj); } virDomainObjEndAPI(&obj); - virNWFilterUnlockFilterUpdates(); virIdentitySetCurrent(NULL); return; =20 @@ -9056,8 +9055,6 @@ qemuProcessReconnectHelper(virDomainObj *obj, data->obj =3D obj; data->identity =3D virIdentityGetCurrent(); =20 - virNWFilterReadLockFilterUpdates(); - /* this lock and reference will be eventually transferred to the thread * that handles the reconnect */ virObjectLock(obj); @@ -9080,7 +9077,6 @@ qemuProcessReconnectHelper(virDomainObj *obj, qemuDomainRemoveInactiveJobLocked(src->driver, obj); =20 virDomainObjEndAPI(&obj); - virNWFilterUnlockFilterUpdates(); g_clear_object(&data->identity); VIR_FREE(data); return -1; --=20 2.35.1 From nobody Fri May 10 08:36:49 2024 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=1645803219; cv=none; d=zohomail.com; s=zohoarc; b=mWp294+r0w8mHET1RplsKmxJ0rDu2Idgnmel+tiYSCle0HZoHcyRQFTruYWiuY/x/sJii9Up+FDQcq1FN2l6SUA18ZVIuZpVFtIt6HdO6F+eIABme2UKf++Eo1uvr5G7Iyjh21GYjv/F1m2XnkF+NkFJwATVIGDY6b5B79PgZKs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645803219; h=Content-Type:Content-Transfer-Encoding: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=Q+UsKCff7eO7If1GfKB7p5zw9GGDW64dOA0P5JnVIpU=; b=DQa+o6aQD8zSLPAnhm8+Fo3KMQnNvbP+6+ayHHlMg3Qw3KZojZfMdA8WAvHEbGmfz0lBi+E3+JGuxxCrqWR7pRjh23MB9Q3B9B9/yGZ5kYgDZBETdSiBIRZHUxo7HWep5TOzihdmX0oEnSJtR7Uy+qFEKF/+9M4iF715Y8aIqoI= 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 1645803219786959.0823769370974; Fri, 25 Feb 2022 07:33:39 -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-357-Vz0zmqK3N9ekkAo9isXH4g-1; Fri, 25 Feb 2022 10:33:37 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E7E831006AA6; Fri, 25 Feb 2022 15:33:31 +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 C9D83106D5D1; Fri, 25 Feb 2022 15:33: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 9A8C81809C98; Fri, 25 Feb 2022 15:33:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21PFUwUj024520 for ; Fri, 25 Feb 2022 10:30:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6F6DE7C025; Fri, 25 Feb 2022 15:30:58 +0000 (UTC) Received: from domokun.gsslab.fab.redhat.com (gx270-2.gsslab.fab.redhat.com [10.33.8.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id E14EA7C029; Fri, 25 Feb 2022 15:30:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645803219; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=Q+UsKCff7eO7If1GfKB7p5zw9GGDW64dOA0P5JnVIpU=; b=QZC+qMdxV0DdNKL5W7+ncigJYrTyA4CAKEXasR7ezFCJR8qPvLUMvYMio1LNqVL9Sbc6ZY d+qGSQKaYCdJOh/jRA+XoQNSlci/gI5WfYgcOY+p2VVCul8wHhN2YvoCpA0pvsblrtKO2N aN/hjU0OZybZ9aJwNL9OSFVJNfeGF5s= X-MC-Unique: Vz0zmqK3N9ekkAo9isXH4g-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/5] nwfilter: remove decl of virNWFilterCreateVarHashmap Date: Fri, 25 Feb 2022 15:30:52 +0000 Message-Id: <20220225153053.3241652-5-berrange@redhat.com> In-Reply-To: <20220225153053.3241652-1-berrange@redhat.com> References: <20220225153053.3241652-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com 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.84 on 10.5.11.22 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1645803221371100001 This method doesn't exist since commit d1a7c08eb145d8b9d9c4a268f4ffff3b1590049a Author: Daniel P. Berrang=C3=A9 Date: Thu Apr 26 12:26:51 2018 +0100 nwfilter: convert the gentech driver code to use virNWFilterBindingDefP= tr Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- src/nwfilter/nwfilter_gentech_driver.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter= _gentech_driver.h index 56d1d7a80a..74f8a4496b 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -49,8 +49,5 @@ int virNWFilterInstantiateFilterLate(virNWFilterDriverSta= te *driver, =20 int virNWFilterTeardownFilter(virNWFilterBindingDef *binding); =20 -GHashTable *virNWFilterCreateVarHashmap(const char *macaddr, - const virNWFilterVarValue *val= ue); - int virNWFilterBuildAll(virNWFilterDriverState *driver, bool newFilters); --=20 2.35.1 From nobody Fri May 10 08:36:49 2024 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=1645803226; cv=none; d=zohomail.com; s=zohoarc; b=KU0g2m9zjH/xJZMn7dTiD7veN4sIqa0IVsDvdym3KPpZTu35Cy2eQczZq8djeaUuLcJMbSisD3tf3GbEg1/rJLwGAwtNlClZ6mZQixSgOu7JrzCk4PqX1bw0sEjgmyE3FIQdH90i0QVT5c81Ie7RXRer/90peYsSvAlZm9MlvTg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645803226; h=Content-Type:Content-Transfer-Encoding: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=TWPka5G8KagYMG0OE2K3wEoKOZ++Dw81AVf5W1RYxmk=; b=cwDy4KooW2wUk1y9sgFNTf6Owd6dYTZ77sOBXQLkztwQe6m1XyibJkitKC5d1RPw4B+V+lDqSIc7TAin+MdyGPClJOPlbKrsS6X9W9nCuKPbEow9EzMSFROlckV3kD/hmXRY1T728r9byX00x/jCfhiFldpdlq1ThaRMpqJlvqU= 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 1645803226057192.6035665997548; Fri, 25 Feb 2022 07:33:46 -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-612-M8kTDbLxMsSiaq_ruY3yTA-1; Fri, 25 Feb 2022 10:33:41 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D1BFF80575D; Fri, 25 Feb 2022 15:33:34 +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 B39C87C032; Fri, 25 Feb 2022 15:33:34 +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 853BA1809CB4; Fri, 25 Feb 2022 15:33:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21PFUxN3024532 for ; Fri, 25 Feb 2022 10:30:59 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3EC467C026; Fri, 25 Feb 2022 15:30:59 +0000 (UTC) Received: from domokun.gsslab.fab.redhat.com (gx270-2.gsslab.fab.redhat.com [10.33.8.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id B03A67C025; Fri, 25 Feb 2022 15:30:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645803225; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=TWPka5G8KagYMG0OE2K3wEoKOZ++Dw81AVf5W1RYxmk=; b=d3e9SwvQFvLTsoLJk1UB1JeJInQhEU8GMMiZ3a0uJPyLXps/UA5VZiTyBhEd6aUPszHnmq QVGDjEtdJg4NZtq1BFC4rj0qrODeAT75/YeRxa93MniqXz/N4uTKqToNurDj4nmsLYK7KH PjDZZfP8JWXTpkK+fg2/wLNUIRLFGVI= X-MC-Unique: M8kTDbLxMsSiaq_ruY3yTA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 5/5] nwfilter: make some gentech driver methods static Date: Fri, 25 Feb 2022 15:30:53 +0000 Message-Id: <20220225153053.3241652-6-berrange@redhat.com> In-Reply-To: <20220225153053.3241652-1-berrange@redhat.com> References: <20220225153053.3241652-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com 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.14 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1645803227364100001 The virNWFilterTechDriverForName & virNWFilterUpdateInstantiateFilter methods are only used within the same source file, so don't need to be exported. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- src/nwfilter/nwfilter_gentech_driver.c | 4 ++-- src/nwfilter/nwfilter_gentech_driver.h | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter= _gentech_driver.c index 20ecd299bf..7bbf1e12fb 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -99,7 +99,7 @@ void virNWFilterTechDriversShutdown(void) } =20 =20 -virNWFilterTechDriver * +static virNWFilterTechDriver * virNWFilterTechDriverForName(const char *name) { size_t i =3D 0; @@ -791,7 +791,7 @@ virNWFilterInstantiateFilter(virNWFilterDriverState *dr= iver, } =20 =20 -int +static int virNWFilterUpdateInstantiateFilter(virNWFilterDriverState *driver, virNWFilterBindingDef *binding, bool *skipIface) diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter= _gentech_driver.h index 74f8a4496b..969ab76966 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -26,8 +26,6 @@ #include "virnwfilterbindingdef.h" #include "nwfilter_tech_driver.h" =20 -virNWFilterTechDriver *virNWFilterTechDriverForName(const char *name); - int virNWFilterTechDriversInit(bool privileged); void virNWFilterTechDriversShutdown(void); =20 @@ -39,9 +37,6 @@ enum instCase { =20 int virNWFilterInstantiateFilter(virNWFilterDriverState *driver, virNWFilterBindingDef *binding); -int virNWFilterUpdateInstantiateFilter(virNWFilterDriverState *driver, - virNWFilterBindingDef *binding, - bool *skipIface); =20 int virNWFilterInstantiateFilterLate(virNWFilterDriverState *driver, virNWFilterBindingDef *binding, --=20 2.35.1