| Message ID | 1472132255-23470-16-git-send-email-konrad.wilk@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 25.08.16 at 15:37, <konrad.wilk@oracle.com> wrote: > 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 > > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> for whichever parts it's relevant Acked-by: Jan Beulich <jbeulich@suse.com> with one adjustment request: > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -271,6 +271,7 @@ F: tools/misc/xen-livepatch.c > F: xen/arch/*/livepatch* > F: xen/arch/*/*/livepatch* > F: xen/common/livepatch* > +F: xen/test/livepatch/* > F: xen/include/xen/livepatch* Please keep this sorted. Jan
On Thu, Aug 25, 2016 at 09:37:30AM -0400, Konrad Rzeszutek Wilk wrote: > 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 > > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Ross, could you review the patch please? Thanks! > > --- > Cc: Stefano Stabellini <sstabellini@kernel.org> > Cc: Julien Grall <julien.grall@arm.com> > Cc: Jan Beulich <jbeulich@suse.com> > Cc: Andrew Cooper <andrew.cooper3@citrix.com> > > v1: First submission > v2: Move to test/livepatch per Jan's recommendation > --- > .gitignore | 8 ++++---- > MAINTAINERS | 1 + > xen/Makefile | 3 ++- > 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 > xen/{arch/x86/test => test/livepatch}/xen_bye_world_func.c | 0 > xen/{arch/x86/test => test/livepatch}/xen_hello_world.c | 0 > xen/{arch/x86/test => test/livepatch}/xen_hello_world_func.c | 0 > xen/{arch/x86/test => test/livepatch}/xen_replace_world.c | 0 > xen/{arch/x86/test => test/livepatch}/xen_replace_world_func.c | 0 > 13 files changed, 16 insertions(+), 13 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 44cc7bf..4fded28 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -255,10 +255,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 > @@ -275,6 +271,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 ae0b6bc..160d950 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -271,6 +271,7 @@ F: tools/misc/xen-livepatch.c > F: xen/arch/*/livepatch* > F: xen/arch/*/*/livepatch* > F: xen/common/livepatch* > +F: xen/test/livepatch/* > F: xen/include/xen/livepatch* > > MACHINE CHECK (MCA) & RAS > diff --git a/xen/Makefile b/xen/Makefile > index d68c84d..94ced98 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 > diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile > index 9f75c5c..9dc0797 100644 > --- a/xen/arch/arm/Makefile > +++ b/xen/arch/arm/Makefile > @@ -73,9 +73,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 7209560..b813887 100644 > --- a/xen/arch/x86/Makefile > +++ b/xen/arch/x86/Makefile > @@ -92,10 +92,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) > @@ -219,4 +215,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 0000000..8c53040 > --- /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.4.11 >
diff --git a/.gitignore b/.gitignore index 44cc7bf..4fded28 100644 --- a/.gitignore +++ b/.gitignore @@ -255,10 +255,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 @@ -275,6 +271,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 ae0b6bc..160d950 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -271,6 +271,7 @@ F: tools/misc/xen-livepatch.c F: xen/arch/*/livepatch* F: xen/arch/*/*/livepatch* F: xen/common/livepatch* +F: xen/test/livepatch/* F: xen/include/xen/livepatch* MACHINE CHECK (MCA) & RAS diff --git a/xen/Makefile b/xen/Makefile index d68c84d..94ced98 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 diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 9f75c5c..9dc0797 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -73,9 +73,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 7209560..b813887 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -92,10 +92,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) @@ -219,4 +215,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 0000000..8c53040 --- /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
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 Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> --- Cc: Stefano Stabellini <sstabellini@kernel.org> Cc: Julien Grall <julien.grall@arm.com> Cc: Jan Beulich <jbeulich@suse.com> Cc: Andrew Cooper <andrew.cooper3@citrix.com> v1: First submission v2: Move to test/livepatch per Jan's recommendation --- .gitignore | 8 ++++---- MAINTAINERS | 1 + xen/Makefile | 3 ++- 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 xen/{arch/x86/test => test/livepatch}/xen_bye_world_func.c | 0 xen/{arch/x86/test => test/livepatch}/xen_hello_world.c | 0 xen/{arch/x86/test => test/livepatch}/xen_hello_world_func.c | 0 xen/{arch/x86/test => test/livepatch}/xen_replace_world.c | 0 xen/{arch/x86/test => test/livepatch}/xen_replace_world_func.c | 0 13 files changed, 16 insertions(+), 13 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%)