Re: [Xen-devel] [PATCH v2 05/13] libxl: move xen-init-dom0 to tools/helpers

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

On Fri, 2015-12-18 at 14:14 +0100, Juergen Gross wrote:
> Move xen-init-dom0 from tools/libxl to tools/helpers, as it is just a
> helper program.
> 
> Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
> ---
> Âtools/helpers/MakefileÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ| 10 ++++++++++
> Âtools/{libxl => helpers}/xen-init-dom0.c |ÂÂ0
> Âtools/libxl/MakefileÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ| 14 +++-----------

Don't forget .gitignore here and when you move the xenstore init tool as
well.


> Â3 files changed, 13 insertions(+), 11 deletions(-)
> Ârename tools/{libxl => helpers}/xen-init-dom0.c (100%)
> 
> diff --git a/tools/helpers/Makefile b/tools/helpers/Makefile
> index 52347fd..92aead4 100644
> --- a/tools/helpers/Makefile
> +++ b/tools/helpers/Makefile
> @@ -5,10 +5,16 @@
> ÂXEN_ROOT = $(CURDIR)/../..
> Âinclude $(XEN_ROOT)/tools/Rules.mk
> Â
> +PROGS += xen-init-dom0
> Âifeq ($(CONFIG_Linux),y)
> ÂPROGS += init-xenstore-domain
> Âendif
> Â
> +XEN_INIT_DOM0_OBJS = xen-init-dom0.o
> +$(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenctrl)
> +$(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenstore)
> +$(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenlight)
> +
> ÂINIT_XENSTORE_DOMAIN_OBJS = init-xenstore-domain.o
> Â$(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenguest)
> Â$(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenctrl)
> @@ -17,12 +23,16 @@ $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS +=
> $(CFLAGS_libxenstore)
> Â.PHONY: all
> Âall: $(PROGS)
> Â
> +xen-init-dom0: $(XEN_INIT_DOM0_OBJS)
> +     $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS)
> $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl)
> $(APPEND_LDFLAGS)
> +
> Âinit-xenstore-domain: $(INIT_XENSTORE_DOMAIN_OBJS)
> Â     $(CC) $(LDFLAGS) -o $@ $(INIT_XENSTORE_DOMAIN_OBJS)
> $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest)
> $(APPEND_LDFLAGS)
> Â
> Â.PHONY: install
> Âinstall: all
> Â     $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
> +     $(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(LIBEXEC_BIN)
> Âifeq ($(CONFIG_Linux),y)
> Â     $(INSTALL_PROG) init-xenstore-domain $(DESTDIR)$(LIBEXEC_BIN)
> Âendif
> diff --git a/tools/libxl/xen-init-dom0.c b/tools/helpers/xen-init-dom0.c
> similarity index 100%
> rename from tools/libxl/xen-init-dom0.c
> rename to tools/helpers/xen-init-dom0.c
> diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
> index 6ff5bee..6a913c8 100644
> --- a/tools/libxl/Makefile
> +++ b/tools/libxl/Makefile
> @@ -142,7 +142,7 @@ 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
> Â
> -CLIENTS = xl testidl libxl-save-helper xen-init-dom0
> +CLIENTS = xl testidl libxl-save-helper
> Â
> ÂCFLAGS_XL += $(CFLAGS_libxenlight)
> ÂCFLAGS_XL += -Wshadow
> @@ -153,10 +153,6 @@ $(XL_OBJS) $(TEST_PROG_OBJS) _libxl.api-for-check: \
> Â$(XL_OBJS): CFLAGS += $(CFLAGS_XL)
> Â$(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h
> needs it.
> Â
> -XEN_INIT_DOM0_OBJS = xen-init-dom0.o
> -$(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenctrl)
> -$(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenstore)
> -
> ÂSAVE_HELPER_OBJS = libxl_save_helper.o _libxl_save_msgs_helper.o
> Â$(SAVE_HELPER_OBJS): CFLAGS += $(CFLAGS_libxenctrl)
> Â
> @@ -173,7 +169,7 @@ all: $(CLIENTS) $(TEST_PROGS) $(PKG_CONFIG) \
> Â     $(AUTOSRCS) $(AUTOINCS)
> Â
> Â$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS) \
> -             $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS)
> $(XEN_INIT_DOM0_OBJS): \
> +             $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): \
> Â     $(AUTOINCS) libxl.api-ok
> Â
> Â%.c %.h:: %.y
> @@ -214,7 +210,7 @@ libxl_internal_json.h: _libxl_types_internal_json.h
> Âxl.h: _paths.h
> Â
> Â$(LIBXL_OBJS) $(LIBXL_TEST_OBJS) $(LIBXLU_OBJS) \
> -     $(XL_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS)
> $(XEN_INIT_DOM0_OBJS): libxl.h
> +     $(XL_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS): libxl.h
> Â$(LIBXL_OBJS) $(LIBXL_TEST_OBJS): libxl_internal.h
> Â
> Â_libxl_type%.h _libxl_type%_json.h _libxl_type%_private.h
> _libxl_type%.c: libxl_type%.idl gentypes.py idl.py
> @@ -255,9 +251,6 @@ libxlutil.a: $(LIBXLU_OBJS)
> Âxl: $(XL_OBJS) libxlutil.so libxenlight.so
> Â     $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so
> $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS)
> Â
> -xen-init-dom0: $(XEN_INIT_DOM0_OBJS) libxenlight.so
> -     $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS)
> $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl)
> $(APPEND_LDFLAGS)
> -
> Âtest_%: test_%.o test_common.o libxlutil.so libxenlight_test.so
> Â     $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so,
> $(LDLIBS_libxenlight)) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS)
> Â
> @@ -280,7 +273,6 @@ install: all
> Â     $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
> Â     $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/pkgconfig
> Â     $(INSTALL_PROG) xl $(DESTDIR)$(sbindir)
> -     $(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(LIBEXEC_BIN)
> Â     $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN)
> Â     $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR)
> $(DESTDIR)$(libdir)
> Â     $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR).$(MINOR)
> $(DESTDIR)$(libdir)/libxenlight.so.$(MAJOR)

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel