From nobody Thu Mar 28 20:22:44 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 ARC-Seal: i=1; a=rsa-sha256; t=1565365619; cv=none; d=zoho.com; s=zohoarc; b=EI88xaWYJSW2uNuAzd0auJ7O1BHHM4k3he9/hJ9nC9ldXvurBGRrXHtanW2H82AcgOSko7c/oCZ39xW3pSoYOVBDdU3OW/rmi7jij9FIt9pBhRFl26IQi2+n6erq6e8d/Ln0wKHuZO/sCwcZUn8tOKdzFz8y5YnOi6w63kL9vBw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565365619; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=cwVunskhBR24gIrBSJCwT5V+YZUFCHYBl04umBgyh6k=; b=SbeSJjZi7WYR/7WOXp+gEquN7zzbrXDraDaY0aJv++0A96lZnH08ptLCdD+PbkJY5g4ZyHY0G34XhHerUVbsOGhLLw87aLGu9PVk0PdaQC5EP68hvqnEOGrxpfhzXj3ftaG7Eh2ykGwc9On2MGTwe2aOH9QpYC7o0WsU1py5BVA= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565365619167116.19693252892864; Fri, 9 Aug 2019 08:46:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6A4C530C62AC; Fri, 9 Aug 2019 15:46:54 +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 CCC85608C2; Fri, 9 Aug 2019 15:46:53 +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 7D24E180B536; Fri, 9 Aug 2019 15:46:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x79FkoBA010875 for ; Fri, 9 Aug 2019 11:46:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8A4E55D772; Fri, 9 Aug 2019 15:46:50 +0000 (UTC) Received: from domokun.gsslab.fab.redhat.com (dhcp-94.gsslab.fab.redhat.com [10.33.9.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1A8B5D6A5; Fri, 9 Aug 2019 15:46:46 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Fri, 9 Aug 2019 16:46:43 +0100 Message-Id: <20190809154643.24542-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] nwfilter: move standard XML configs out of examples dir 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.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 09 Aug 2019 15:46:58 +0000 (UTC) The nwfilter XML configs are not merely examples, they are data that is actively shipped and used in production by users. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Erik Skultety --- examples/Makefile.am | 10 ---------- src/nwfilter/Makefile.inc.am | 8 ++++++++ .../xml/nwfilter =3D> src/nwfilter/xml}/allow-arp.xml | 0 .../nwfilter/xml}/allow-dhcp-server.xml | 0 .../xml/nwfilter =3D> src/nwfilter/xml}/allow-dhcp.xml | 0 .../nwfilter/xml}/allow-incoming-ipv4.xml | 0 .../xml/nwfilter =3D> src/nwfilter/xml}/allow-ipv4.xml | 0 .../nwfilter/xml}/clean-traffic-gateway.xml | 0 .../nwfilter =3D> src/nwfilter/xml}/clean-traffic.xml | 0 .../nwfilter/xml}/no-arp-ip-spoofing.xml | 0 .../nwfilter/xml}/no-arp-mac-spoofing.xml | 0 .../nwfilter =3D> src/nwfilter/xml}/no-arp-spoofing.xml | 0 .../nwfilter =3D> src/nwfilter/xml}/no-ip-multicast.xml | 0 .../nwfilter =3D> src/nwfilter/xml}/no-ip-spoofing.xml | 0 .../nwfilter =3D> src/nwfilter/xml}/no-mac-broadcast.xml | 0 .../nwfilter =3D> src/nwfilter/xml}/no-mac-spoofing.xml | 0 .../nwfilter/xml}/no-other-l2-traffic.xml | 0 .../nwfilter/xml}/no-other-rarp-traffic.xml | 0 .../nwfilter/xml}/qemu-announce-self-rarp.xml | 0 .../nwfilter/xml}/qemu-announce-self.xml | 0 20 files changed, 8 insertions(+), 10 deletions(-) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/allow-arp.xml (100%) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/allow-dhcp-server.xml= (100%) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/allow-dhcp.xml (100%) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/allow-incoming-ipv4.x= ml (100%) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/allow-ipv4.xml (100%) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/clean-traffic-gateway= .xml (100%) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/clean-traffic.xml (10= 0%) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/no-arp-ip-spoofing.xm= l (100%) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/no-arp-mac-spoofing.x= ml (100%) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/no-arp-spoofing.xml (= 100%) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/no-ip-multicast.xml (= 100%) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/no-ip-spoofing.xml (1= 00%) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/no-mac-broadcast.xml = (100%) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/no-mac-spoofing.xml (= 100%) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/no-other-l2-traffic.x= ml (100%) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/no-other-rarp-traffic= .xml (100%) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/qemu-announce-self-ra= rp.xml (100%) rename {examples/xml/nwfilter =3D> src/nwfilter/xml}/qemu-announce-self.xm= l (100%) diff --git a/examples/Makefile.am b/examples/Makefile.am index 0adb4b42e2..ad635bdcc0 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -16,8 +16,6 @@ ## License along with this library. If not, see ## . =20 -FILTERS =3D $(wildcard $(srcdir)/xml/nwfilter/*.xml) - ADMIN_EXAMPLES =3D \ $(wildcard $(srcdir)/c/admin/*.c) \ $(NULL) @@ -56,7 +54,6 @@ EXTRA_DIST =3D \ $(STORAGE_XML_EXAMPLES) \ $(SYSTEMTAP_EXAMPLES) \ $(TEST_XML_EXAMPLES) \ - $(FILTERS) \ $(NULL) =20 AM_CPPFLAGS =3D \ @@ -111,13 +108,6 @@ c_misc_event_test_SOURCES =3D c/misc/event-test.c c_misc_hellolibvirt_SOURCES =3D c/misc/hellolibvirt.c c_misc_openauth_SOURCES =3D c/misc/openauth.c =20 -if WITH_NWFILTER - -nwfilterdir =3D $(sysconfdir)/libvirt/nwfilter -nwfilter_DATA =3D $(FILTERS) - -endif WITH_NWFILTER - examplesdir =3D $(docdir)/examples =20 adminexamplesdir =3D $(examplesdir)/c/admin diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 277f75a9bd..7693634e29 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -1,5 +1,9 @@ # vim: filetype=3Dautomake =20 +NWFILTER_XML_FILES =3D $(wildcard $(srcdir)/nwfilter/xml/*.xml) + +EXTRA_DIST +=3D $(NWFILTER_XML_FILES) + NWFILTER_DRIVER_SOURCES =3D \ nwfilter/nwfilter_driver.h \ nwfilter/nwfilter_driver.c \ @@ -19,6 +23,10 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D $(NWFILTER_DRIVER_SOUR= CES) EXTRA_DIST +=3D $(NWFILTER_DRIVER_SOURCES) =20 if WITH_NWFILTER + +nwfilterxmldir =3D $(sysconfdir)/libvirt/nwfilter +nwfilterxml_DATA =3D $(NWFILTER_XML_FILES) + noinst_LTLIBRARIES +=3D libvirt_driver_nwfilter_impl.la libvirt_driver_nwfilter_la_SOURCES =3D libvirt_driver_nwfilter_la_LIBADD =3D libvirt_driver_nwfilter_impl.la diff --git a/examples/xml/nwfilter/allow-arp.xml b/src/nwfilter/xml/allow-a= rp.xml similarity index 100% rename from examples/xml/nwfilter/allow-arp.xml rename to src/nwfilter/xml/allow-arp.xml diff --git a/examples/xml/nwfilter/allow-dhcp-server.xml b/src/nwfilter/xml= /allow-dhcp-server.xml similarity index 100% rename from examples/xml/nwfilter/allow-dhcp-server.xml rename to src/nwfilter/xml/allow-dhcp-server.xml diff --git a/examples/xml/nwfilter/allow-dhcp.xml b/src/nwfilter/xml/allow-= dhcp.xml similarity index 100% rename from examples/xml/nwfilter/allow-dhcp.xml rename to src/nwfilter/xml/allow-dhcp.xml diff --git a/examples/xml/nwfilter/allow-incoming-ipv4.xml b/src/nwfilter/x= ml/allow-incoming-ipv4.xml similarity index 100% rename from examples/xml/nwfilter/allow-incoming-ipv4.xml rename to src/nwfilter/xml/allow-incoming-ipv4.xml diff --git a/examples/xml/nwfilter/allow-ipv4.xml b/src/nwfilter/xml/allow-= ipv4.xml similarity index 100% rename from examples/xml/nwfilter/allow-ipv4.xml rename to src/nwfilter/xml/allow-ipv4.xml diff --git a/examples/xml/nwfilter/clean-traffic-gateway.xml b/src/nwfilter= /xml/clean-traffic-gateway.xml similarity index 100% rename from examples/xml/nwfilter/clean-traffic-gateway.xml rename to src/nwfilter/xml/clean-traffic-gateway.xml diff --git a/examples/xml/nwfilter/clean-traffic.xml b/src/nwfilter/xml/cle= an-traffic.xml similarity index 100% rename from examples/xml/nwfilter/clean-traffic.xml rename to src/nwfilter/xml/clean-traffic.xml diff --git a/examples/xml/nwfilter/no-arp-ip-spoofing.xml b/src/nwfilter/xm= l/no-arp-ip-spoofing.xml similarity index 100% rename from examples/xml/nwfilter/no-arp-ip-spoofing.xml rename to src/nwfilter/xml/no-arp-ip-spoofing.xml diff --git a/examples/xml/nwfilter/no-arp-mac-spoofing.xml b/src/nwfilter/x= ml/no-arp-mac-spoofing.xml similarity index 100% rename from examples/xml/nwfilter/no-arp-mac-spoofing.xml rename to src/nwfilter/xml/no-arp-mac-spoofing.xml diff --git a/examples/xml/nwfilter/no-arp-spoofing.xml b/src/nwfilter/xml/n= o-arp-spoofing.xml similarity index 100% rename from examples/xml/nwfilter/no-arp-spoofing.xml rename to src/nwfilter/xml/no-arp-spoofing.xml diff --git a/examples/xml/nwfilter/no-ip-multicast.xml b/src/nwfilter/xml/n= o-ip-multicast.xml similarity index 100% rename from examples/xml/nwfilter/no-ip-multicast.xml rename to src/nwfilter/xml/no-ip-multicast.xml diff --git a/examples/xml/nwfilter/no-ip-spoofing.xml b/src/nwfilter/xml/no= -ip-spoofing.xml similarity index 100% rename from examples/xml/nwfilter/no-ip-spoofing.xml rename to src/nwfilter/xml/no-ip-spoofing.xml diff --git a/examples/xml/nwfilter/no-mac-broadcast.xml b/src/nwfilter/xml/= no-mac-broadcast.xml similarity index 100% rename from examples/xml/nwfilter/no-mac-broadcast.xml rename to src/nwfilter/xml/no-mac-broadcast.xml diff --git a/examples/xml/nwfilter/no-mac-spoofing.xml b/src/nwfilter/xml/n= o-mac-spoofing.xml similarity index 100% rename from examples/xml/nwfilter/no-mac-spoofing.xml rename to src/nwfilter/xml/no-mac-spoofing.xml diff --git a/examples/xml/nwfilter/no-other-l2-traffic.xml b/src/nwfilter/x= ml/no-other-l2-traffic.xml similarity index 100% rename from examples/xml/nwfilter/no-other-l2-traffic.xml rename to src/nwfilter/xml/no-other-l2-traffic.xml diff --git a/examples/xml/nwfilter/no-other-rarp-traffic.xml b/src/nwfilter= /xml/no-other-rarp-traffic.xml similarity index 100% rename from examples/xml/nwfilter/no-other-rarp-traffic.xml rename to src/nwfilter/xml/no-other-rarp-traffic.xml diff --git a/examples/xml/nwfilter/qemu-announce-self-rarp.xml b/src/nwfilt= er/xml/qemu-announce-self-rarp.xml similarity index 100% rename from examples/xml/nwfilter/qemu-announce-self-rarp.xml rename to src/nwfilter/xml/qemu-announce-self-rarp.xml diff --git a/examples/xml/nwfilter/qemu-announce-self.xml b/src/nwfilter/xm= l/qemu-announce-self.xml similarity index 100% rename from examples/xml/nwfilter/qemu-announce-self.xml rename to src/nwfilter/xml/qemu-announce-self.xml --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list