From: Ian Campbell <ian.campbell@citrix.com>
To: Juergen Gross <jgross@suse.com>,
xen-devel@lists.xen.org, ian.jackson@eu.citrix.com,
stefano.stabellini@eu.citrix.com, wei.liu2@citrix.com,
dgdegra@tycho.nsa.gov
Subject: Re: [PATCH v2 05/13] libxl: move xen-init-dom0 to tools/helpers
Date: Wed, 6 Jan 2016 16:28:40 +0000 [thread overview]
Message-ID: <1452097720.21055.111.camel@citrix.com> (raw)
In-Reply-To: <1450444471-6454-6-git-send-email-jgross@suse.com>
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@suse.com>
> ---
> 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@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-01-06 16:28 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-18 13:14 [PATCH v2 00/13] xenstore: make it easier to run xenstore in a domain Juergen Gross
2015-12-18 13:14 ` [PATCH v2 01/13] xen: add xenstore domain flag to hypervisor Juergen Gross
2015-12-18 13:23 ` Andrew Cooper
2016-01-05 15:46 ` Ian Campbell
2016-01-05 15:59 ` Juergen Gross
2015-12-18 13:14 ` [PATCH v2 02/13] libxc: support new xenstore domain flag in libxc Juergen Gross
2016-01-06 15:52 ` Ian Campbell
2016-01-07 6:08 ` Juergen Gross
2016-01-07 10:12 ` Ian Campbell
2015-12-18 13:14 ` [PATCH v2 03/13] libxl: provide a function to retrieve the xenstore domain id Juergen Gross
2015-12-18 13:53 ` Andrew Cooper
2015-12-18 14:10 ` Juergen Gross
2016-01-06 15:59 ` Ian Campbell
2016-01-06 16:38 ` Ian Jackson
2016-01-07 5:37 ` Juergen Gross
2016-01-07 10:11 ` Ian Campbell
2016-01-07 10:44 ` Juergen Gross
2016-01-07 10:55 ` Ian Campbell
2016-01-07 11:21 ` Juergen Gross
2016-01-07 11:36 ` Ian Campbell
2016-01-07 13:17 ` Wei Liu
2016-01-07 12:40 ` Wei Liu
2016-01-07 12:57 ` Juergen Gross
2016-01-07 13:13 ` Wei Liu
2015-12-18 13:14 ` [PATCH v2 04/13] xenstore: move init-xenstore-domain to tools/helpers Juergen Gross
2016-01-06 16:03 ` Ian Campbell
2016-01-07 6:12 ` Juergen Gross
2015-12-18 13:14 ` [PATCH v2 05/13] libxl: move xen-init-dom0 " Juergen Gross
2016-01-06 16:12 ` Ian Campbell
2016-01-07 6:15 ` Juergen Gross
2016-01-07 10:12 ` Ian Campbell
2016-01-06 16:28 ` Ian Campbell [this message]
2016-01-07 6:39 ` Juergen Gross
2015-12-18 13:14 ` [PATCH v2 06/13] xenstore: destroy xenstore domain in case of error after creating it Juergen Gross
2015-12-18 13:14 ` [PATCH v2 07/13] xenstore: add error messages to init-xenstore-domain Juergen Gross
2015-12-18 13:14 ` [PATCH v2 08/13] xenstore: modify init-xenstore-domain parameter syntax Juergen Gross
2016-01-06 16:21 ` Ian Campbell
2016-01-07 6:34 ` Juergen Gross
2016-01-07 10:23 ` Ian Campbell
2016-01-07 10:28 ` Juergen Gross
2015-12-18 13:14 ` [PATCH v2 09/13] xenstore: make use of the "xenstore domain" flag Juergen Gross
2016-01-06 16:23 ` Ian Campbell
2016-01-07 6:36 ` Juergen Gross
2015-12-18 13:14 ` [PATCH v2 10/13] xenstore: add init-xenstore-domain parameter to specify cmdline Juergen Gross
2015-12-18 13:14 ` [PATCH v2 11/13] tools: split up xen-init-dom0.c Juergen Gross
2016-01-06 16:26 ` Ian Campbell
2016-01-06 16:33 ` Wei Liu
2016-01-07 10:26 ` Ian Campbell
2015-12-18 13:14 ` [PATCH v2 12/13] xenstore: write xenstore domain data to xenstore Juergen Gross
2016-01-06 16:27 ` Ian Campbell
2015-12-18 13:14 ` [PATCH v2 13/13] tools: don't stop xenstore domain when stopping dom0 Juergen Gross
2015-12-18 14:42 ` Andrew Cooper
2015-12-18 14:53 ` Juergen Gross
2016-01-06 16:33 ` Ian Campbell
2016-01-07 6:52 ` Juergen Gross
2016-01-07 10:34 ` Ian Campbell
2016-01-07 10:45 ` Juergen Gross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452097720.21055.111.camel@citrix.com \
--to=ian.campbell@citrix.com \
--cc=dgdegra@tycho.nsa.gov \
--cc=ian.jackson@eu.citrix.com \
--cc=jgross@suse.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).