Re: [Xen-devel] [PATCH] tools: remove local links to the x86 headers
>>> On 12.07.18 at 17:20, wrote: > On Thu, Jul 12, 2018 at 06:01:43AM -0600, Jan Beulich wrote: >> >>> On 12.07.18 at 12:40, wrote: >> > --- a/tools/include/Makefile >> > +++ b/tools/include/Makefile >> > @@ -21,6 +21,9 @@ xen/.dir: >> >ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) > xen/libelf/ >> >ln -s ../xen-foreign xen/foreign >> >ln -sf $(XEN_ROOT)/xen/include/acpi acpi >> > +ifeq ($(CONFIG_X86),y) >> > + ln -sf $(XEN_ROOT)/xen/include/asm-x86 xen/asm >> > +endif >> >> Don't you need a .gitignore adjustment for this? > > There's already a tools/include/xen/* that covers it. Ah, good. >> > --- a/tools/tests/x86_emulator/Makefile >> > +++ b/tools/tests/x86_emulator/Makefile >> > @@ -118,7 +118,7 @@ $(TARGET): x86-emulate.o test_x86_emulator.o wrappers.o >> > >> > .PHONY: clean >> > clean: >> > - rm -rf $(TARGET) *.o *~ core $(addsuffix .h,$(TESTCASES)) *.bin >> > x86_emulate >> > asm >> > + rm -rf $(TARGET) *.o *~ core $(addsuffix .h,$(TESTCASES)) *.bin >> > x86_emulate >> > >> > .PHONY: distclean >> > distclean: clean >> > @@ -131,17 +131,11 @@ x86_emulate: >> > >> > x86_emulate/%: x86_emulate ; >> > >> > -asm: >> > - [ -L $@ ] || ln -sf $(XEN_ROOT)/xen/include/asm-x86 $@ >> > - >> > -asm/%: asm ; >> > - >> > HOSTCFLAGS-x86_64 := -fno-PIE >> > $(call cc-option-add,HOSTCFLAGS-x86_64,HOSTCC,-no-pie) >> > HOSTCFLAGS += $(CFLAGS_xeninclude) -I. $(HOSTCFLAGS-$(XEN_COMPILE_ARCH)) >> > >> > -x86.h := asm/x86-vendors.h asm/x86-defns.h asm/msr-index.h >> > -x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h $(x86.h) >> > +x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h >> >> While removing this dependency in the fuzzer case looks to be fine, it >> clearly isn't here: No .*.d get generated, so a change to any of those >> files would now no longer trigger a re-build. > > Oh, right. I've changed it to: > > x86.h := $(addprefix $(XEN_ROOT)/tools/include/xen/asm/,\ > x86-vendors.h x86-defns.h msr-index.h) > x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h $(x86.h) > > AFAICT this works fine and detects changes in the files. Looks okay, thanks. Jan ___ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH] tools: remove local links to the x86 headers
On Thu, Jul 12, 2018 at 06:01:43AM -0600, Jan Beulich wrote: > >>> On 12.07.18 at 12:40, wrote: > > --- a/tools/include/Makefile > > +++ b/tools/include/Makefile > > @@ -21,6 +21,9 @@ xen/.dir: > > ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) > > xen/libelf/ > > ln -s ../xen-foreign xen/foreign > > ln -sf $(XEN_ROOT)/xen/include/acpi acpi > > +ifeq ($(CONFIG_X86),y) > > + ln -sf $(XEN_ROOT)/xen/include/asm-x86 xen/asm > > +endif > > Don't you need a .gitignore adjustment for this? There's already a tools/include/xen/* that covers it. > > --- a/tools/tests/x86_emulator/Makefile > > +++ b/tools/tests/x86_emulator/Makefile > > @@ -118,7 +118,7 @@ $(TARGET): x86-emulate.o test_x86_emulator.o wrappers.o > > > > .PHONY: clean > > clean: > > - rm -rf $(TARGET) *.o *~ core $(addsuffix .h,$(TESTCASES)) *.bin > > x86_emulate > > asm > > + rm -rf $(TARGET) *.o *~ core $(addsuffix .h,$(TESTCASES)) *.bin > > x86_emulate > > > > .PHONY: distclean > > distclean: clean > > @@ -131,17 +131,11 @@ x86_emulate: > > > > x86_emulate/%: x86_emulate ; > > > > -asm: > > - [ -L $@ ] || ln -sf $(XEN_ROOT)/xen/include/asm-x86 $@ > > - > > -asm/%: asm ; > > - > > HOSTCFLAGS-x86_64 := -fno-PIE > > $(call cc-option-add,HOSTCFLAGS-x86_64,HOSTCC,-no-pie) > > HOSTCFLAGS += $(CFLAGS_xeninclude) -I. $(HOSTCFLAGS-$(XEN_COMPILE_ARCH)) > > > > -x86.h := asm/x86-vendors.h asm/x86-defns.h asm/msr-index.h > > -x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h $(x86.h) > > +x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h > > While removing this dependency in the fuzzer case looks to be fine, it > clearly isn't here: No .*.d get generated, so a change to any of those > files would now no longer trigger a re-build. Oh, right. I've changed it to: x86.h := $(addprefix $(XEN_ROOT)/tools/include/xen/asm/,\ x86-vendors.h x86-defns.h msr-index.h) x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h $(x86.h) AFAICT this works fine and detects changes in the files. Thanks, Roger. ___ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH] tools: remove local links to the x86 headers
>>> On 12.07.18 at 12:40, wrote: > --- a/tools/include/Makefile > +++ b/tools/include/Makefile > @@ -21,6 +21,9 @@ xen/.dir: > ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) > xen/libelf/ > ln -s ../xen-foreign xen/foreign > ln -sf $(XEN_ROOT)/xen/include/acpi acpi > +ifeq ($(CONFIG_X86),y) > + ln -sf $(XEN_ROOT)/xen/include/asm-x86 xen/asm > +endif Don't you need a .gitignore adjustment for this? > --- a/tools/tests/x86_emulator/Makefile > +++ b/tools/tests/x86_emulator/Makefile > @@ -118,7 +118,7 @@ $(TARGET): x86-emulate.o test_x86_emulator.o wrappers.o > > .PHONY: clean > clean: > - rm -rf $(TARGET) *.o *~ core $(addsuffix .h,$(TESTCASES)) *.bin > x86_emulate > asm > + rm -rf $(TARGET) *.o *~ core $(addsuffix .h,$(TESTCASES)) *.bin > x86_emulate > > .PHONY: distclean > distclean: clean > @@ -131,17 +131,11 @@ x86_emulate: > > x86_emulate/%: x86_emulate ; > > -asm: > - [ -L $@ ] || ln -sf $(XEN_ROOT)/xen/include/asm-x86 $@ > - > -asm/%: asm ; > - > HOSTCFLAGS-x86_64 := -fno-PIE > $(call cc-option-add,HOSTCFLAGS-x86_64,HOSTCC,-no-pie) > HOSTCFLAGS += $(CFLAGS_xeninclude) -I. $(HOSTCFLAGS-$(XEN_COMPILE_ARCH)) > > -x86.h := asm/x86-vendors.h asm/x86-defns.h asm/msr-index.h > -x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h $(x86.h) > +x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h While removing this dependency in the fuzzer case looks to be fine, it clearly isn't here: No .*.d get generated, so a change to any of those files would now no longer trigger a re-build. Jan ___ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH] tools: remove local links to the x86 headers
On Thu, Jul 12, 2018 at 12:40:34PM +0200, Roger Pau Monne wrote: > In the x86 test harness and the fuzzer, and instead create a link in > the tools/include directory that can be used by all the tools. > > No functional change. > > Signed-off-by: Roger Pau Monné Acked-by: Wei Liu ___ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH] tools: remove local links to the x86 headers
On 12/07/18 11:40, Roger Pau Monne wrote: > In the x86 test harness and the fuzzer, and instead create a link in > the tools/include directory that can be used by all the tools. > > No functional change. > > Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper ___ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
[Xen-devel] [PATCH] tools: remove local links to the x86 headers
In the x86 test harness and the fuzzer, and instead create a link in the tools/include directory that can be used by all the tools. No functional change. Signed-off-by: Roger Pau Monné --- Cc: Jan Beulich Cc: Andrew Cooper Cc: Ian Jackson Cc: Wei Liu --- tools/fuzz/x86_instruction_emulator/Makefile | 10 ++ tools/include/Makefile | 3 +++ tools/tests/x86_emulator/Makefile| 10 ++ tools/tests/x86_emulator/x86-emulate.h | 6 +++--- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/tools/fuzz/x86_instruction_emulator/Makefile b/tools/fuzz/x86_instruction_emulator/Makefile index fbbb70bbfc..e76743de24 100644 --- a/tools/fuzz/x86_instruction_emulator/Makefile +++ b/tools/fuzz/x86_instruction_emulator/Makefile @@ -13,11 +13,6 @@ x86_emulate: x86_emulate/%: x86_emulate ; -asm: - [ -L $@ ] || ln -sf $(XEN_ROOT)/xen/include/asm-x86 $@ - -asm/%: asm ; - x86-emulate.c x86-emulate.h wrappers.c: %: [ -L $* ] || ln -sf $(XEN_ROOT)/tools/tests/x86_emulator/$* @@ -27,8 +22,7 @@ GCOV_FLAGS := --coverage %-cov.o: %.c $(CC) -c $(CFLAGS) $(GCOV_FLAGS) $< -o $@ -x86.h := asm/x86-vendors.h asm/x86-defns.h asm/msr-index.h -x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h $(x86.h) +x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h # x86-emulate.c will be implicit for both x86-emulate.o x86-emulate-cov.o: x86_emulate/x86_emulate.c $(x86_emulate.h) @@ -50,7 +44,7 @@ all: x86-insn-fuzz-all .PHONY: distclean distclean: clean - rm -f x86_emulate x86-emulate.c x86-emulate.h asm + rm -f x86_emulate x86-emulate.c x86-emulate.h .PHONY: clean clean: diff --git a/tools/include/Makefile b/tools/include/Makefile index 666510530e..270a34f318 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -21,6 +21,9 @@ xen/.dir: ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) xen/libelf/ ln -s ../xen-foreign xen/foreign ln -sf $(XEN_ROOT)/xen/include/acpi acpi +ifeq ($(CONFIG_X86),y) + ln -sf $(XEN_ROOT)/xen/include/asm-x86 xen/asm +endif touch $@ # Not xen/xsm as that clashes with link to diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile index 417d5c0941..10031b74d1 100644 --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -118,7 +118,7 @@ $(TARGET): x86-emulate.o test_x86_emulator.o wrappers.o .PHONY: clean clean: - rm -rf $(TARGET) *.o *~ core $(addsuffix .h,$(TESTCASES)) *.bin x86_emulate asm + rm -rf $(TARGET) *.o *~ core $(addsuffix .h,$(TESTCASES)) *.bin x86_emulate .PHONY: distclean distclean: clean @@ -131,17 +131,11 @@ x86_emulate: x86_emulate/%: x86_emulate ; -asm: - [ -L $@ ] || ln -sf $(XEN_ROOT)/xen/include/asm-x86 $@ - -asm/%: asm ; - HOSTCFLAGS-x86_64 := -fno-PIE $(call cc-option-add,HOSTCFLAGS-x86_64,HOSTCC,-no-pie) HOSTCFLAGS += $(CFLAGS_xeninclude) -I. $(HOSTCFLAGS-$(XEN_COMPILE_ARCH)) -x86.h := asm/x86-vendors.h asm/x86-defns.h asm/msr-index.h -x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h $(x86.h) +x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h x86-emulate.o test_x86_emulator.o wrappers.o: %.o: %.c $(x86_emulate.h) $(HOSTCC) $(HOSTCFLAGS) -c -g -o $@ $< diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index fd1ba5218b..b249e4673c 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -11,9 +11,9 @@ #include -#include -#include -#include +#include +#include +#include #include -- 2.17.1 ___ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
