| Message ID | 1450444471-6454-6-git-send-email-jgross@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 +++----------- > 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) I think the only use of this was for the xtl_* interfaces, which are now in libxentoollog.h (with a compat include via xenctrl.h). Would you mind switching the tool over to use xentoollog directly (perhaps in a separate patch)? Ian.
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)
On 06/01/16 17:12, Ian Campbell wrote: > 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 +++----------- >> 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) > > I think the only use of this was for the xtl_* interfaces, which are now in > libxentoollog.h (with a compat include via xenctrl.h). Would you mind > switching the tool over to use xentoollog directly (perhaps in a separate > patch)? Will do. Juergen
On 06/01/16 17:28, Ian Campbell wrote: > 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. Uuh, yes, of course. Thanks for noticing this. Juergen
On Thu, 2016-01-07 at 07:15 +0100, Juergen Gross wrote: > On 06/01/16 17:12, Ian Campbell wrote: > > 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 +++----------- > > > 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) > > > > I think the only use of this was for the xtl_* interfaces, which are > > now in > > libxentoollog.h (with a compat include via xenctrl.h). Would you mind > > switching the tool over to use xentoollog directly (perhaps in a > > separate > > patch)? > > Will do. Thanks!
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)
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 +++----------- 3 files changed, 13 insertions(+), 11 deletions(-) rename tools/{libxl => helpers}/xen-init-dom0.c (100%)