From nobody Wed May 14 18:41:27 2025 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 1519304201745786.3301906843361; Thu, 22 Feb 2018 04:56:41 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id 65C6DC0587CC; Thu, 22 Feb 2018 12:56:40 +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 335D95D962; Thu, 22 Feb 2018 12:56:40 +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 D187218033F3; Thu, 22 Feb 2018 12:56: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 w1MCuVZY010885 for ; Thu, 22 Feb 2018 07:56:31 -0500 Received: by smtp.corp.redhat.com (Postfix) id 791C3B079B; Thu, 22 Feb 2018 12:56:31 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA3D2AB58E; Thu, 22 Feb 2018 12:56:30 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 22 Feb 2018 12:56:14 +0000 Message-Id: <20180222125617.6768-14-berrange@redhat.com> In-Reply-To: <20180222125617.6768-1-berrange@redhat.com> References: <20180222125617.6768-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 v1 13/16] make: split xen driver build rules into xen/Makefile.inc.am 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 22 Feb 2018 12:56:40 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 39 +--------------------------- src/xen/Makefile.inc.am | 67 +++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 68 insertions(+), 38 deletions(-) create mode 100644 src/xen/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 46a5210f8a..1692ed6304 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -92,6 +92,7 @@ include qemu/Makefile.inc.am include bhyve/Makefile.inc.am include xenconfig/Makefile.inc.am include libxl/Makefile.inc.am +include xen/Makefile.inc.am =20 install-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) uninstall-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) @@ -789,7 +790,6 @@ DRIVER_SOURCE_FILES +=3D \ $(REMOTE_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ - $(XEN_DRIVER_SOURCES) \ $(XENAPI_DRIVER_SOURCES) \ $(NULL) =20 @@ -801,7 +801,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(NWFILTER_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ - $(XEN_DRIVER_SOURCES) \ $(VZ_DRIVER_SOURCES) \ $(NULL) =20 @@ -830,17 +829,6 @@ check-local: check-protocol check-symfile check-symsor= ting \ check-aclperms check-admin-symfile check-admin-symsorting .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) =20 -# Now the Hypervisor specific drivers -XEN_DRIVER_SOURCES =3D \ - xen/block_stats.c xen/block_stats.h \ - xen/xen_hypervisor.c xen/xen_hypervisor.h \ - xen/xen_driver.c xen/xen_driver.h \ - xen/xend_internal.c xen/xend_internal.h \ - xen/xm_internal.c xen/xm_internal.h \ - xen/xs_internal.c xen/xs_internal.h -if WITH_XEN_INOTIFY -XEN_DRIVER_SOURCES +=3D xen/xen_inotify.c xen/xen_inotify.h -endif WITH_XEN_INOTIFY =20 LXC_MONITOR_PROTOCOL_GENERATED =3D \ lxc/lxc_monitor_protocol.h \ @@ -1277,24 +1265,6 @@ EXTRA_DIST +=3D \ $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -h \ $< $(srcdir)/$(subst $(srcdir)/,,$@) =20 -if WITH_XEN -noinst_LTLIBRARIES +=3D libvirt_driver_xen_impl.la -libvirt_driver_xen_la_SOURCES =3D -libvirt_driver_xen_la_LIBADD =3D libvirt_driver_xen_impl.la -mod_LTLIBRARIES +=3D libvirt_driver_xen.la -libvirt_driver_xen_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_xen_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) - -libvirt_driver_xen_impl_la_CFLAGS =3D \ - $(XEN_CFLAGS) \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - -I$(srcdir)/xenconfig \ - $(AM_CFLAGS) -libvirt_driver_xen_impl_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_xen_impl_la_LIBADD =3D $(XEN_LIBS) libvirt_xenconfig.la -libvirt_driver_xen_impl_la_SOURCES =3D $(XEN_DRIVER_SOURCES) -endif WITH_XEN =20 if WITH_XENAPI noinst_LTLIBRARIES +=3D libvirt_driver_xenapi.la @@ -1751,7 +1721,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispa= tch.pl \ # Add all conditional sources just in case... EXTRA_DIST +=3D \ $(REMOTE_DRIVER_SOURCES) \ - $(XEN_DRIVER_SOURCES) \ $(LXC_DRIVER_SOURCES) \ $(XENAPI_DRIVER_SOURCES) \ $(VZ_DRIVER_SOURCES) \ @@ -3118,9 +3087,6 @@ if WITH_LXC $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" endif WITH_LXC -if WITH_XEN - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" -endif WITH_XEN if WITH_NETWORK $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/network" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/dnsmasq" @@ -3162,9 +3128,6 @@ if WITH_LXC rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||: rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" ||: endif WITH_LXC -if WITH_XEN - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" ||: -endif WITH_XEN if WITH_NETWORK rm -f $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml rm -f $(DESTDIR)$(confdir)/qemu/networks/default.xml diff --git a/src/xen/Makefile.inc.am b/src/xen/Makefile.inc.am new file mode 100644 index 0000000000..85260251ec --- /dev/null +++ b/src/xen/Makefile.inc.am @@ -0,0 +1,67 @@ +XEN_DRIVER_SOURCES =3D \ + xen/block_stats.c \ + xen/block_stats.h \ + xen/xen_hypervisor.c \ + xen/xen_hypervisor.h \ + xen/xen_driver.c \ + xen/xen_driver.h \ + xen/xend_internal.c \ + xen/xend_internal.h \ + xen/xm_internal.c \ + xen/xm_internal.h \ + xen/xs_internal.c \ + xen/xs_internal.h \ + $(NULL) + +XEN_DRIVER_INOTIFY_SOURCES =3D \ + xen/xen_inotify.c \ + xen/xen_inotify.h \ + $(NULL) + +if WITH_XEN_INOTIFY +XEN_DRIVER_SOURCES +=3D $(XEN_DRIVER_INOTIFY_SOURCES) +endif WITH_XEN_INOTIFY + +DRIVER_SOURCE_FILES +=3D $(XEN_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES +=3D $(XEN_DRIVER_SOURCES) +EXTRA_DIST +=3D $(XEN_DRIVER_SOURCES) $(XEN_DRIVER_INOTIFY_SOURCES) + +if WITH_XEN +noinst_LTLIBRARIES +=3D libvirt_driver_xen_impl.la +libvirt_driver_xen_la_SOURCES =3D +libvirt_driver_xen_la_LIBADD =3D \ + libvirt_driver_xen_impl.la \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +mod_LTLIBRARIES +=3D libvirt_driver_xen.la +libvirt_driver_xen_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) + +libvirt_driver_xen_impl_la_CFLAGS =3D \ + $(XEN_CFLAGS) \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + -I$(srcdir)/xenconfig \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_xen_impl_la_LDFLAGS =3D $(AM_LDFLAGS) +libvirt_driver_xen_impl_la_LIBADD =3D \ + $(XEN_LIBS) \ + libvirt_xenconfig.la \ + $(NULL) +libvirt_driver_xen_impl_la_SOURCES =3D $(XEN_DRIVER_SOURCES) + +INSTALL_DATA_DIRS +=3D xen + +install-data-xen: + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" + +uninstall-data-xen: + rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" ||: + +endif WITH_XEN + +.PHONY: \ + install-data-xen \ + uninstall-data-xen \ + $(NULL) --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list