Re: [Xen-devel] [PATCH v10 10/24] x86/xen_hello_world.xsplice: Test payload for patching 'xen_extra_version'.

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 27.04.16 at 21:27, <konrad.wilk@xxxxxxxxxx> wrote:
> --- /dev/null
> +++ b/xen/arch/x86/test/Makefile
> @@ -0,0 +1,42 @@
> +include $(XEN_ROOT)/Config.mk
> +
> +CODE_ADDR=$(shell nm --defined $(1) | grep $(2) | awk '{print "0x"$$1}')
> +CODE_SZ=$(shell nm --defined -S $(1) | grep $(2) | awk '{ print "0x"$$2}')
> +
> +.PHONY: default
> +
> +XSPLICE := xen_hello_world.xsplice
> +
> +default: xsplice
> +
> +install: xsplice
> +     $(INSTALL_DATA) $(XSPLICE) $(DESTDIR)$(DEBUG_DIR)/$(XSPLICE)
> +uninstall:
> +     rm -f $(DESTDIR)$(DEBUG_DIR)/$(XSPLICE)
> +
> +.PHONY: clean
> +clean::
> +     rm -f *.o .*.o.d $(XSPLICE) config.h
> +
> +#
> +# To compute these values we need the binary files: xen-syms
> +# and xen_hello_world_func.o to be already compiled.
> +#
> +.PHONY: config.h
> +config.h: OLD_CODE=$(call CODE_ADDR,$(BASEDIR)/xen-syms,xen_extra_version)
> +config.h: OLD_CODE_SZ=$(call CODE_SZ,$(BASEDIR)/xen-syms,xen_extra_version)
> +config.h: NEW_CODE_SZ=$(call CODE_SZ,$<,xen_hello_world)
> +config.h: xen_hello_world_func.o
> +     (set -e; \
> +      echo "#define NEW_CODE_SZ $(NEW_CODE_SZ)"; \
> +      echo "#define OLD_CODE_SZ $(OLD_CODE_SZ)"; \
> +      echo "#define OLD_CODE $(OLD_CODE)") > $@
> +
> +xen_hello_world.o: config.h
> +
> +.PHONY: $(XSPLICE)
> +$(XSPLICE): config.h xen_hello_world_func.o xen_hello_world.o

Th odd config.h dependency is still there, despite xen_hello_world.o
now properly depending on the header?

> +     $(LD) $(LDFLAGS) -r -o $(XSPLICE) $(filter %.o,$^)

And if you (hopefully) drop it, please don't forget to the also ditch
the $(filter ...) here.

With those adjustments
Acked-by: Jan Beulich <jbeulich@xxxxxxxx>


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