[v4,31/31] tools: move libxlutil to tools/libs/util

Message ID	20200828150747.25305-32-jgross@suse.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <SRS0=+ST8=CG=lists.xenproject.org=xen-devel-bounces@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D343320757 From: Juergen Gross <jgross@suse.com> To: xen-devel@lists.xenproject.org Cc: Juergen Gross <jgross@suse.com>, Andrew Cooper <andrew.cooper3@citrix.com>, George Dunlap <george.dunlap@citrix.com>, Ian Jackson <iwj@xenproject.org>, Jan Beulich <jbeulich@suse.com>, Julien Grall <julien@xen.org>, Stefano Stabellini <sstabellini@kernel.org>, Wei Liu <wl@xen.org>, Anthony PERARD <anthony.perard@citrix.com> Subject: [PATCH v4 31/31] tools: move libxlutil to tools/libs/util Date: Fri, 28 Aug 2020 17:07:47 +0200 Message-Id: <20200828150747.25305-32-jgross@suse.com> In-Reply-To: <20200828150747.25305-1-jgross@suse.com> References: <20200828150747.25305-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
Series	tools: move most libraries into tools/libs \| expand [v4,00/31] tools: move most libraries into tools/libs [v4,01/31] tools: generate pkg-config files from make variables [v4,02/31] tools: drop explicit path specifications for qemu build [v4,03/31] tools/python: drop libxenguest from setup.py [v4,04/31] tools: fix pkg-config file for libxenguest [v4,05/31] tools: don't assume libxenguest and libxenctrl to be in same directory [v4,06/31] tools/misc: don't use libxenctrl internals from xen-hptool [v4,07/31] tools/misc: don't include xg_save_restore.h from xen-mfndump.c [v4,08/31] tools/misc: replace PAGE_SIZE with XC_PAGE_SIZE in xen-mfndump.c [v4,09/31] tools/misc: drop all libxc internals from xen-mfndump.c [v4,10/31] tools/libxc: remove unused headers xc_efi.h and xc_elf.h [v4,11/31] tools/libxc: move xc_[un]map_domain_meminfo() into new source xg_domain.c [v4,12/31] tools/libxc: rename all libxenguest sources to xg_* [v4,13/31] tools/libxc: rename libxenguest internal headers [v4,14/31] tools/misc: rename xc_dom.h do xenctrl_dom.h [v4,15/31] tools/libxc: untangle libxenctrl from libxenguest [v4,16/31] tools/xcutils: use official headers in readnotes [v4,17/31] tools/xenpaging: remove libxc internals [v4,18/31] tools: move libxenctrl below tools/libs [v4,19/31] tools/libxc: move libxenguest to tools/libs/guest [v4,20/31] tools: split libxenstore into new tools/libs/store directory [v4,21/31] tools: split libxenvchan into new tools/libs/vchan directory [v4,22/31] tools: split libxenstat into new tools/libs/stat directory [v4,23/31] tools/libxl: fix dependencies of libxl tests [v4,24/31] tools/libxl: don't include libxl_osdeps.h from libxlutil sources [v4,25/31] tools/libxl: add missing items to clean target [v4,26/31] tools/libxl: move xl parsing checks to tools/xl [v4,27/31] tools/xl: don't assume libxl and libxlutil are in one directory [v4,28/31] tools/libxl: move libxenlight to tools/libs/light [v4,29/31] tools: rename global libxlutil make variables [v4,30/31] tools/libs: add option for library names not starting with libxen [v4,31/31] tools: move libxlutil to tools/libs/util

diff --git a/.gitignore b/.gitignore index f30550255f..188495783e 100644 --- a/.gitignore +++ b/.gitignore @@ -154,6 +154,10 @@ tools/libs/store/utils.h tools/libs/store/xenstore.pc tools/libs/store/xs_lib.c tools/libs/store/include/xenstore_lib.h +tools/libs/util/*.pc +tools/libs/util/_paths.h +tools/libs/util/libxlu_cfg_y.output +tools/libs/util/libxenutil.map tools/libs/vchan/headers.chk tools/libs/vchan/libxenvchan.map tools/libs/vchan/xenvchan.pc @@ -232,8 +236,6 @@ tools/include/xen/* tools/include/xen-xsm/* tools/include/xen-foreign/*.(c|h|size) tools/include/xen-foreign/checker -tools/libxl/*.pc -tools/libxl/libxlu_cfg_y.output tools/misc/cpuperf/cpuperf-perfcntr tools/misc/cpuperf/cpuperf-xen tools/misc/xc_shadow diff --git a/tools/Makefile b/tools/Makefile index ea69675cca..9c77ee6763 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -29,7 +29,6 @@ SUBDIRS-$(CONFIG_QEMU_XEN) += qemu-xen-dir endif SUBDIRS-y += xenpmd -SUBDIRS-y += libxl SUBDIRS-$(CONFIG_GOLANG) += golang SUBDIRS-y += xl SUBDIRS-y += helpers diff --git a/tools/Rules.mk b/tools/Rules.mk index 5ad17b313b..842b9daf92 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -15,8 +15,6 @@ XEN_INCLUDE = $(XEN_ROOT)/tools/include include $(XEN_ROOT)/tools/libs/uselibs.mk -XEN_libxenutil = $(XEN_ROOT)/tools/libxl - CFLAGS_xeninclude = -I$(XEN_INCLUDE) XENSTORE_XENSTORED ?= y @@ -117,11 +115,6 @@ else CFLAGS += -O2 -fomit-frame-pointer endif -CFLAGS_libxenutil = -I$(XEN_libxenutil) -SHDEPS_libxenutil = $(SHLIB_libxenlight) -LDLIBS_libxenutil = $(SHDEPS_libxenutil) $(XEN_libxenutil)/libxlutil$(libextension) -SHLIB_libxenutil = $(SHDEPS_libxenutil) -Wl,-rpath-link=$(XEN_libxenutil) - CFLAGS += -D__XEN_INTERFACE_VERSION__=__XEN_LATEST_INTERFACE_VERSION__ # Get gcc to generate the dependencies for us. diff --git a/tools/libs/Makefile b/tools/libs/Makefile index c41455c604..1afcd12e2b 100644 --- a/tools/libs/Makefile +++ b/tools/libs/Makefile @@ -16,6 +16,7 @@ SUBDIRS-y += store SUBDIRS-y += stat SUBDIRS-$(CONFIG_Linux) += vchan SUBDIRS-y += light +SUBDIRS-y += util ifeq ($(CONFIG_RUMP),y) SUBDIRS-y := toolcore diff --git a/tools/libs/uselibs.mk b/tools/libs/uselibs.mk index 685f368aed..efd7a475ba 100644 --- a/tools/libs/uselibs.mk +++ b/tools/libs/uselibs.mk @@ -28,3 +28,6 @@ LIBS_LIBS += stat USELIBS_stat := ctrl store LIBS_LIBS += light USELIBS_light := toollog evtchn toolcore ctrl store hypfs guest +LIBS_LIBS += util +USELIBS_util := light +FILENAME_util := xlutil diff --git a/tools/libxl/CODING_STYLE b/tools/libs/util/CODING_STYLE similarity index 100% rename from tools/libxl/CODING_STYLE rename to tools/libs/util/CODING_STYLE diff --git a/tools/libs/util/Makefile b/tools/libs/util/Makefile new file mode 100644 index 0000000000..0c9db8027d --- /dev/null +++ b/tools/libs/util/Makefile @@ -0,0 +1,63 @@ +XEN_ROOT = $(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +SRCS-y += libxlu_cfg_y.c +SRCS-y += libxlu_cfg_l.c +SRCS-y += libxlu_cfg.c +SRCS-y += libxlu_disk_l.c +SRCS-y += libxlu_disk.c +SRCS-y += libxlu_vif.c +SRCS-y += libxlu_pci.c + +CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ + -Wno-declaration-after-statement -Wformat-nonliteral +CFLAGS += -I. $(CFLAGS_libxenctrl) + +CFLAGS += $(PTHREAD_CFLAGS) +LDFLAGS += $(PTHREAD_LDFLAGS) + +ifeq ($(FLEX),) +%.c %.h:: %.l + $(warning Flex is needed to rebuild some libxl parsers and \ + scanners, please install it and rerun configure) +endif + +ifeq ($(BISON),) +%.c %.h:: %.y + $(warning Bison is needed to rebuild some libxl parsers and \ + scanners, please install it and rerun configure) +endif + +AUTOINCS = libxlu_cfg_y.h libxlu_cfg_l.h libxlu_disk_l.h +AUTOSRCS = libxlu_cfg_y.c libxlu_cfg_l.c + +LIBHEADER := libxlutil.h +PKG_CONFIG_NAME := Xlutil +PKG_CONFIG_DESC := The xl utility library for Xen hypervisor + +NO_HEADERS_CHK := y + +include $(XEN_ROOT)/tools/libs/libs.mk + +$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR = $(XEN_libxenutil)/include +$(PKG_CONFIG_LOCAL): PKG_CONFIG_CFLAGS_LOCAL = $(CFLAGS_xeninclude) + +$(LIB_OBJS) $(PIC_OBJS): $(AUTOINCS) _paths.h + +%.c %.h:: %.y + @rm -f $*.[ch] + $(BISON) --output=$*.c $< + +%.c %.h:: %.l + @rm -f $*.[ch] + $(FLEX) --header-file=$*.h --outfile=$*.c $< + +genpath-target = $(call buildmakevars2header,_paths.h) +$(eval $(genpath-target)) + +clean: cleanlocal + +.PHONY: cleanlocal +cleanlocal: + $(RM) -f _*.h + $(RM) -f libxlutil.map diff --git a/tools/libxl/libxlutil.h b/tools/libs/util/include/libxlutil.h similarity index 100% rename from tools/libxl/libxlutil.h rename to tools/libs/util/include/libxlutil.h diff --git a/tools/libxl/libxlu_cfg.c b/tools/libs/util/libxlu_cfg.c similarity index 100% rename from tools/libxl/libxlu_cfg.c rename to tools/libs/util/libxlu_cfg.c diff --git a/tools/libxl/libxlu_cfg_i.h b/tools/libs/util/libxlu_cfg_i.h similarity index 100% rename from tools/libxl/libxlu_cfg_i.h rename to tools/libs/util/libxlu_cfg_i.h diff --git a/tools/libxl/libxlu_cfg_l.c b/tools/libs/util/libxlu_cfg_l.c similarity index 100% rename from tools/libxl/libxlu_cfg_l.c rename to tools/libs/util/libxlu_cfg_l.c diff --git a/tools/libxl/libxlu_cfg_l.h b/tools/libs/util/libxlu_cfg_l.h similarity index 100% rename from tools/libxl/libxlu_cfg_l.h rename to tools/libs/util/libxlu_cfg_l.h diff --git a/tools/libxl/libxlu_cfg_l.l b/tools/libs/util/libxlu_cfg_l.l similarity index 100% rename from tools/libxl/libxlu_cfg_l.l rename to tools/libs/util/libxlu_cfg_l.l diff --git a/tools/libxl/libxlu_cfg_y.c b/tools/libs/util/libxlu_cfg_y.c similarity index 100% rename from tools/libxl/libxlu_cfg_y.c rename to tools/libs/util/libxlu_cfg_y.c diff --git a/tools/libxl/libxlu_cfg_y.h b/tools/libs/util/libxlu_cfg_y.h similarity index 100% rename from tools/libxl/libxlu_cfg_y.h rename to tools/libs/util/libxlu_cfg_y.h diff --git a/tools/libxl/libxlu_cfg_y.y b/tools/libs/util/libxlu_cfg_y.y similarity index 100% rename from tools/libxl/libxlu_cfg_y.y rename to tools/libs/util/libxlu_cfg_y.y diff --git a/tools/libxl/libxlu_disk.c b/tools/libs/util/libxlu_disk.c similarity index 100% rename from tools/libxl/libxlu_disk.c rename to tools/libs/util/libxlu_disk.c diff --git a/tools/libxl/libxlu_disk_i.h b/tools/libs/util/libxlu_disk_i.h similarity index 100% rename from tools/libxl/libxlu_disk_i.h rename to tools/libs/util/libxlu_disk_i.h diff --git a/tools/libxl/libxlu_disk_l.c b/tools/libs/util/libxlu_disk_l.c similarity index 100% rename from tools/libxl/libxlu_disk_l.c rename to tools/libs/util/libxlu_disk_l.c diff --git a/tools/libxl/libxlu_disk_l.h b/tools/libs/util/libxlu_disk_l.h similarity index 100% rename from tools/libxl/libxlu_disk_l.h rename to tools/libs/util/libxlu_disk_l.h diff --git a/tools/libxl/libxlu_disk_l.l b/tools/libs/util/libxlu_disk_l.l similarity index 100% rename from tools/libxl/libxlu_disk_l.l rename to tools/libs/util/libxlu_disk_l.l diff --git a/tools/libxl/libxlu_internal.h b/tools/libs/util/libxlu_internal.h similarity index 100% rename from tools/libxl/libxlu_internal.h rename to tools/libs/util/libxlu_internal.h diff --git a/tools/libxl/libxlu_pci.c b/tools/libs/util/libxlu_pci.c similarity index 100% rename from tools/libxl/libxlu_pci.c rename to tools/libs/util/libxlu_pci.c diff --git a/tools/libxl/libxlu_vif.c b/tools/libs/util/libxlu_vif.c similarity index 100% rename from tools/libxl/libxlu_vif.c rename to tools/libs/util/libxlu_vif.c diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile deleted file mode 100644 index 51da1d5be4..0000000000 --- a/tools/libxl/Makefile +++ /dev/null @@ -1,124 +0,0 @@ -# -# tools/libxl/Makefile -# - -XEN_ROOT = $(CURDIR)/../.. -include $(XEN_ROOT)/tools/Rules.mk - -XLUMAJOR = 4.15 -XLUMINOR = 0 - -CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ - -Wno-declaration-after-statement -Wformat-nonliteral -CFLAGS += -I. -fPIC - -CFLAGS += $(PTHREAD_CFLAGS) -LDFLAGS += $(PTHREAD_LDFLAGS) - -LIBXLU_LIBS = $(LDLIBS_libxenlight) - -ifeq ($(FLEX),) -%.c %.h:: %.l - $(warning Flex is needed to rebuild some libxl parsers and \ - scanners, please install it and rerun configure) -endif - -ifeq ($(BISON),) -%.c %.h:: %.y - $(warning Bison is needed to rebuild some libxl parsers and \ - scanners, please install it an rerun configure) -endif - -AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h libxlu_disk_l.h -AUTOSRCS= libxlu_cfg_y.c libxlu_cfg_l.c -LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o \ - libxlu_disk_l.o libxlu_disk.o libxlu_vif.o libxlu_pci.o -$(LIBXLU_OBJS): CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h - -PKG_CONFIG = xlutil.pc - -ifneq ($(CONFIG_LIBXC_MINIOS),y) -PKG_CONFIG_INST := $(PKG_CONFIG) -xlutil.pc: PKG_CONFIG_NAME = Xlutil -xlutil.pc: PKG_CONFIG_DESC = The xl utility library for Xen hypervisor -xlutil.pc: PKG_CONFIG_VERSION = $(XLUMAJOR).$(XLUMINOR) -xlutil.pc: PKG_CONFIG_USELIBS = $(SHLIB_libxenutil) -xlutil.pc: PKG_CONFIG_LIB = xlutil -xlutil.pc: PKG_CONFIG_REQPRIV = xenlight -$(PKG_CONFIG_INST): PKG_CONFIG_PREFIX = $(prefix) -$(PKG_CONFIG_INST): PKG_CONFIG_INCDIR = $(includedir) -$(PKG_CONFIG_INST): PKG_CONFIG_LIBDIR = $(libdir) -endif - -PKG_CONFIG_LOCAL := $(foreach pc,$(PKG_CONFIG),$(PKG_CONFIG_DIR)/$(pc)) - -$(PKG_CONFIG_DIR)/xlutil.pc: PKG_CONFIG_NAME = Xlutil -$(PKG_CONFIG_DIR)/xlutil.pc: PKG_CONFIG_DESC = The xl utility library for Xen hypervisor -$(PKG_CONFIG_DIR)/xlutil.pc: PKG_CONFIG_VERSION = $(XLUMAJOR).$(XLUMINOR) -$(PKG_CONFIG_DIR)/xlutil.pc: PKG_CONFIG_USELIBS = $(SHLIB_libxenutil) -$(PKG_CONFIG_DIR)/xlutil.pc: PKG_CONFIG_LIB = xlutil -$(PKG_CONFIG_DIR)/xlutil.pc: PKG_CONFIG_REQPRIV = xenlight -$(PKG_CONFIG_LOCAL): PKG_CONFIG_PREFIX = $(XEN_ROOT) -$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR = $(CURDIR) -$(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR = $(CURDIR) -$(PKG_CONFIG_LOCAL): PKG_CONFIG_CFLAGS_LOCAL = $(CFLAGS_xeninclude) - -.PHONY: all -all: libxlutil.so libxlutil.a $(AUTOSRCS) $(AUTOINCS) $(PKG_CONFIG) $(PKG_CONFIG_LOCAL) - -$(LIBXLU_OBJS): $(AUTOINCS) - -%.c %.h:: %.y - @rm -f $*.[ch] - $(BISON) --output=$*.c $< - -%.c %.h:: %.l - @rm -f $*.[ch] - $(FLEX) --header-file=$*.h --outfile=$*.c $< - -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -libxlutil.so: libxlutil.so.$(XLUMAJOR) - $(SYMLINK_SHLIB) $< $@ - -libxlutil.so.$(XLUMAJOR): libxlutil.so.$(XLUMAJOR).$(XLUMINOR) - $(SYMLINK_SHLIB) $< $@ - -libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS) - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $(LIBXLU_OBJS) $(LIBXLU_LIBS) $(APPEND_LDFLAGS) - -libxlutil.a: $(LIBXLU_OBJS) - $(AR) rcs libxlutil.a $^ - -.PHONY: install -install: all - $(INSTALL_DIR) $(DESTDIR)$(libdir) - $(INSTALL_DIR) $(DESTDIR)$(includedir) - $(INSTALL_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(libdir) - $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(libdir)/libxlutil.so.$(XLUMAJOR) - $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(libdir)/libxlutil.so - $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(libdir) - $(INSTALL_DATA) libxlutil.h $(DESTDIR)$(includedir) - $(INSTALL_DATA) xlutil.pc $(DESTDIR)$(PKG_INSTALLDIR) - -.PHONY: uninstall -uninstall: - rm -f $(DESTDIR)$(PKG_INSTALLDIR)/xlutil.pc - rm -f $(DESTDIR)$(includedir)/libxlutil.h - rm -f $(DESTDIR)$(libdir)/libxlutil.a - rm -f $(DESTDIR)$(libdir)/libxlutil.so - rm -f $(DESTDIR)$(libdir)/libxlutil.so.$(XLUMAJOR) - rm -f $(DESTDIR)$(libdir)/libxlutil.so.$(XLUMAJOR).$(XLUMINOR) - -.PHONY: clean -clean: - $(RM) -f _*.h *.o *.so* *.a $(DEPS_RM) - $(RM) -f xlutil.pc - -distclean: clean - -realclean: distclean - $(RM) -f $(AUTOSRCS) $(AUTOINCS) - --include $(DEPS_INCLUDE)

[v4,31/31] tools: move libxlutil to tools/libs/util

Commit Message

Comments

Patch