From cbe2213f60effc1a59b87deeb491254173874c8e Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Fri, 12 Aug 2016 15:27:58 -0400 Subject: [PATCH] livepatch: Move test-cases to their own sub-directory in test. So they can be shared with ARM64 (but not yet, so they are only built on x86). No functional change. We also need to tweak the MAINTAINERS and .gitignore file. Also we need to update SUBDIRS to include the new 'test' directory so 'cscope' can show the example livepatches. Reviewed-by: Ross Lagerwall Acked-by: Julien Grall [arm change] Acked-by: Jan Beulich [for directory] Signed-off-by: Konrad Rzeszutek Wilk --- .gitignore | 8 ++++---- MAINTAINERS | 1 + xen/Makefile | 5 +++-- xen/arch/arm/Makefile | 3 --- xen/arch/x86/Makefile | 5 ----- xen/test/Makefile | 9 +++++++++ xen/{arch/x86/test => test/livepatch}/Makefile | 0 xen/{arch/x86/test => test/livepatch}/xen_bye_world.c | 0 .../x86/test => test/livepatch}/xen_bye_world_func.c | 0 xen/{arch/x86/test => test/livepatch}/xen_hello_world.c | 0 .../x86/test => test/livepatch}/xen_hello_world_func.c | 0 .../x86/test => test/livepatch}/xen_replace_world.c | 0 .../x86/test => test/livepatch}/xen_replace_world_func.c | 0 13 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 xen/test/Makefile rename xen/{arch/x86/test => test/livepatch}/Makefile (100%) rename xen/{arch/x86/test => test/livepatch}/xen_bye_world.c (100%) rename xen/{arch/x86/test => test/livepatch}/xen_bye_world_func.c (100%) rename xen/{arch/x86/test => test/livepatch}/xen_hello_world.c (100%) rename xen/{arch/x86/test => test/livepatch}/xen_hello_world_func.c (100%) rename xen/{arch/x86/test => test/livepatch}/xen_replace_world.c (100%) rename xen/{arch/x86/test => test/livepatch}/xen_replace_world_func.c (100%) diff --git a/.gitignore b/.gitignore index cc64fc9645..eeabe0b95f 100644 --- a/.gitignore +++ b/.gitignore @@ -254,10 +254,6 @@ xen/arch/x86/efi.lds xen/arch/x86/efi/check.efi xen/arch/x86/efi/disabled xen/arch/x86/efi/mkreloc -xen/arch/x86/test/config.h -xen/arch/x86/test/xen_hello_world.livepatch -xen/arch/x86/test/xen_bye_world.livepatch -xen/arch/x86/test/xen_replace_world.livepatch xen/arch/*/efi/boot.c xen/arch/*/efi/compat.c xen/arch/*/efi/efi.h @@ -274,6 +270,10 @@ xen/include/public/public xen/include/xen/*.new xen/include/xen/acm_policy.h xen/include/xen/compile.h +xen/test/livepatch/config.h +xen/test/livepatch/xen_bye_world.livepatch +xen/test/livepatch/xen_hello_world.livepatch +xen/test/livepatch/xen_replace_world.livepatch xen/tools/kconfig/.tmp_gtkcheck xen/tools/kconfig/.tmp_qtcheck xen/tools/symbols diff --git a/MAINTAINERS b/MAINTAINERS index 9b3060085a..9dd109445a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -272,6 +272,7 @@ F: xen/arch/*/livepatch* F: xen/common/livepatch* F: xen/include/asm-*/livepatch.h F: xen/include/xen/livepatch* +F: xen/test/livepatch/* MACHINE CHECK (MCA) & RAS M: Christoph Egger diff --git a/xen/Makefile b/xen/Makefile index 012509b212..e989a209ce 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -80,7 +80,7 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX) .PHONY: _tests _tests: - $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) tests + $(MAKE) -f $(BASEDIR)/Rules.mk -C test tests .PHONY: _uninstall _uninstall: D=$(DESTDIR) @@ -114,6 +114,7 @@ _clean: delete-unfresh-files $(MAKE) -f $(BASEDIR)/Rules.mk -C xsm clean $(MAKE) -f $(BASEDIR)/Rules.mk -C crypto clean $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) clean + $(MAKE) -f $(BASEDIR)/Rules.mk -C test clean $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(ARCH) SRCARCH=$(SRCARCH) clean find . \( -name "*.o" -o -name ".*.d" \) -exec rm -f {} \; rm -f include/asm $(TARGET) $(TARGET).gz $(TARGET).efi $(TARGET).efi.map $(TARGET)-syms $(TARGET)-syms.map *~ core @@ -189,7 +190,7 @@ include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s echo ""; \ echo "#endif") <$< >$@ -SUBDIRS = xsm arch/$(TARGET_ARCH) common drivers +SUBDIRS = xsm arch/$(TARGET_ARCH) common drivers test define all_sources ( find include/asm-$(TARGET_ARCH) -name '*.h' -print; \ find include -name 'asm-*' -prune -o -name '*.h' -print; \ diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 61e655bb58..fd03017aca 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -65,9 +65,6 @@ ifeq ($(CONFIG_ARM_64),y) ln -sf $(notdir $@) ../../$(notdir $@).efi endif -.PHONY: tests -tests: - $(TARGET).axf: $(TARGET)-syms # XXX: VE model loads by VMA so instead of # making a proper ELF we link with LMA == VMA and adjust crudely diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index d3875c5eea..931917d1d3 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -93,10 +93,6 @@ $(TARGET): $(TARGET)-syms $(efi-y) boot/mkelf32 ./boot/mkelf32 $(notes_phdrs) $(TARGET)-syms $(TARGET) 0x100000 \ `$(NM) -nr $(TARGET)-syms | head -n 1 | sed -e 's/^\([^ ]*\).*/0x\1/'` -.PHONY: tests -tests: - $(MAKE) -f $(BASEDIR)/Rules.mk -C test livepatch - ALL_OBJS := $(BASEDIR)/arch/x86/boot/built_in.o $(BASEDIR)/arch/x86/efi/built_in.o $(ALL_OBJS) ifeq ($(lto),y) @@ -226,4 +222,3 @@ clean:: rm -f $(BASEDIR)/.xen.efi.[0-9]* efi/*.o efi/.*.d efi/*.efi efi/disabled efi/mkreloc rm -f boot/reloc.S boot/reloc.lnk boot/reloc.bin rm -f note.o - $(MAKE) -f $(BASEDIR)/Rules.mk -C test clean diff --git a/xen/test/Makefile b/xen/test/Makefile new file mode 100644 index 0000000000..8c53040965 --- /dev/null +++ b/xen/test/Makefile @@ -0,0 +1,9 @@ +.PHONY: tests +tests: +ifeq ($(XEN_TARGET_ARCH),x86_64) + $(MAKE) -f $(BASEDIR)/Rules.mk -C livepatch livepatch +endif + +.PHONY: clean +clean:: + $(MAKE) -f $(BASEDIR)/Rules.mk -C livepatch clean diff --git a/xen/arch/x86/test/Makefile b/xen/test/livepatch/Makefile similarity index 100% rename from xen/arch/x86/test/Makefile rename to xen/test/livepatch/Makefile diff --git a/xen/arch/x86/test/xen_bye_world.c b/xen/test/livepatch/xen_bye_world.c similarity index 100% rename from xen/arch/x86/test/xen_bye_world.c rename to xen/test/livepatch/xen_bye_world.c diff --git a/xen/arch/x86/test/xen_bye_world_func.c b/xen/test/livepatch/xen_bye_world_func.c similarity index 100% rename from xen/arch/x86/test/xen_bye_world_func.c rename to xen/test/livepatch/xen_bye_world_func.c diff --git a/xen/arch/x86/test/xen_hello_world.c b/xen/test/livepatch/xen_hello_world.c similarity index 100% rename from xen/arch/x86/test/xen_hello_world.c rename to xen/test/livepatch/xen_hello_world.c diff --git a/xen/arch/x86/test/xen_hello_world_func.c b/xen/test/livepatch/xen_hello_world_func.c similarity index 100% rename from xen/arch/x86/test/xen_hello_world_func.c rename to xen/test/livepatch/xen_hello_world_func.c diff --git a/xen/arch/x86/test/xen_replace_world.c b/xen/test/livepatch/xen_replace_world.c similarity index 100% rename from xen/arch/x86/test/xen_replace_world.c rename to xen/test/livepatch/xen_replace_world.c diff --git a/xen/arch/x86/test/xen_replace_world_func.c b/xen/test/livepatch/xen_replace_world_func.c similarity index 100% rename from xen/arch/x86/test/xen_replace_world_func.c rename to xen/test/livepatch/xen_replace_world_func.c -- 2.30.2