From nobody Thu Nov 28 10:44:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1524842908437408.02946240327026; Fri, 27 Apr 2018 08:28:28 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D8F097D4E3; Fri, 27 Apr 2018 15:28: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 A2C8D314EE61; Fri, 27 Apr 2018 15:28: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 52FF44CA9F; Fri, 27 Apr 2018 15:28:26 +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 w3RFPLC5032278 for ; Fri, 27 Apr 2018 11:25:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3AC8783B77; Fri, 27 Apr 2018 15:25:21 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id C67CC83B76; Fri, 27 Apr 2018 15:25:20 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Fri, 27 Apr 2018 16:25:04 +0100 Message-Id: <20180427152513.28928-6-berrange@redhat.com> In-Reply-To: <20180427152513.28928-1-berrange@redhat.com> References: <20180427152513.28928-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 05/14] nwfilter: remove obsolete code related to firewalld 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 27 Apr 2018 15:28:27 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 There is a bunch of left over code in the nwfilter driver related to monitoring firewalld over dbus, that is no longer used since the conversion to use virFirewall APIs. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Jiri Denemark --- src/conf/virnwfilterobj.h | 1 - src/nwfilter/nwfilter_driver.c | 18 ------------------ src/nwfilter/nwfilter_driver.h | 2 -- 3 files changed, 21 deletions(-) diff --git a/src/conf/virnwfilterobj.h b/src/conf/virnwfilterobj.h index 8e79518ed3..433b0402d0 100644 --- a/src/conf/virnwfilterobj.h +++ b/src/conf/virnwfilterobj.h @@ -38,7 +38,6 @@ struct _virNWFilterDriverState { virNWFilterObjListPtr nwfilters; =20 char *configDir; - bool watchingFirewallD; }; =20 virNWFilterDefPtr diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 542de03596..fef3aa272b 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -186,8 +186,6 @@ nwfilterStateInitialize(bool privileged, if (virMutexInit(&driver->lock) < 0) goto err_free_driverstate; =20 - /* remember that we are going to use firewalld */ - driver->watchingFirewallD =3D (sysbus !=3D NULL); driver->privileged =3D privileged; if (!(driver->nwfilters =3D virNWFilterObjListNew())) goto error; @@ -311,22 +309,6 @@ nwfilterStateReload(void) } =20 =20 -/** - * virNWFilterIsWatchingFirewallD: - * - * Checks if the nwfilter has the DBus watches for FirewallD installed. - * - * Returns true if it is watching firewalld, false otherwise - */ -bool -virNWFilterDriverIsWatchingFirewallD(void) -{ - if (!driver) - return false; - - return driver->watchingFirewallD; -} - /** * nwfilterStateCleanup: * diff --git a/src/nwfilter/nwfilter_driver.h b/src/nwfilter/nwfilter_driver.h index 06d7572d21..ad56e7bb2f 100644 --- a/src/nwfilter/nwfilter_driver.h +++ b/src/nwfilter/nwfilter_driver.h @@ -33,6 +33,4 @@ =20 int nwfilterRegister(void); =20 -bool virNWFilterDriverIsWatchingFirewallD(void); - #endif /* __VIR_NWFILTER_DRIVER_H__ */ --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list