From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Gibson Subject: Re: [kvm-unit-tests PATCH v4 07/17] config: no need to mix arch makefiles Date: Wed, 17 Feb 2016 12:18:58 +1100 Message-ID: <20160217011858.GA5239@voom.redhat.com> References: <1455544166-19766-1-git-send-email-drjones@redhat.com> <1455544166-19766-8-git-send-email-drjones@redhat.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="zYM0uCDKw75PZbzx" Cc: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, thuth@redhat.com, dgibson@redhat.com, agraf@suse.de, lvivier@redhat.com, pbonzini@redhat.com To: Andrew Jones Return-path: Received: from ozlabs.org ([103.22.144.67]:46893 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756519AbcBQGuW (ORCPT ); Wed, 17 Feb 2016 01:50:22 -0500 Content-Disposition: inline In-Reply-To: <1455544166-19766-8-git-send-email-drjones@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: --zYM0uCDKw75PZbzx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Feb 15, 2016 at 02:49:16PM +0100, Andrew Jones wrote: > Move the config/config-*.mak files to their own directories and > rename to Makefile.* README is also updated to reflect the change, > as well as to remove an optimistic reference to a non-existent > docs directory. >=20 > Signed-off-by: Andrew Jones Reviewed-by: David Gibson For what little that's worth. It looks sane to me, but I know basically nothing about the kvm-unit-tests build system. > --- > Makefile | 2 +- > README | 3 +-- > arm/Makefile | 1 + > config/config-arm.mak =3D> arm/Makefile.arm | 2 +- > config/config-arm64.mak =3D> arm/Makefile.arm64 | 2 +- > config/config-arm-common.mak =3D> arm/Makefile.common | 2 +- > {config =3D> scripts}/asm-offsets.mak | 0 > x86/Makefile | 1 + > config/config-x86-common.mak =3D> x86/Makefile.common | 0 > config/config-i386.mak =3D> x86/Makefile.i386 | 2 +- > config/config-x86_64.mak =3D> x86/Makefile.x86_64 | 2 +- > 11 files changed, 9 insertions(+), 8 deletions(-) > create mode 100644 arm/Makefile > rename config/config-arm.mak =3D> arm/Makefile.arm (90%) > rename config/config-arm64.mak =3D> arm/Makefile.arm64 (89%) > rename config/config-arm-common.mak =3D> arm/Makefile.common (98%) > rename {config =3D> scripts}/asm-offsets.mak (100%) > create mode 100644 x86/Makefile > rename config/config-x86-common.mak =3D> x86/Makefile.common (100%) > rename config/config-i386.mak =3D> x86/Makefile.i386 (91%) > rename config/config-x86_64.mak =3D> x86/Makefile.x86_64 (93%) >=20 > diff --git a/Makefile b/Makefile > index fe5cc620d473b..ddba941858596 100644 > --- a/Makefile > +++ b/Makefile > @@ -32,7 +32,7 @@ LIBFDT_include =3D $(addprefix $(LIBFDT_srcdir)/,$(LIBF= DT_INCLUDES)) > LIBFDT_version =3D $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_VERSION)) > =20 > #include architecure specific make rules > -include config/config-$(ARCH).mak > +include $(TEST_DIR)/Makefile > =20 > # cc-option > # Usage: OP_CFLAGS+=3D$(call cc-option, -falign-functions=3D0, -malign-f= unctions=3D0) > diff --git a/README b/README > index 457bd797362cf..f8f196d90bf10 100644 > --- a/README > +++ b/README > @@ -34,8 +34,7 @@ each as a standalone test. > =20 > Directory structure: > .: configure script, top-level Makefile, and run_tests.sh > -./config: collection of architecture dependent makefiles > -./docs: documentation files > +./scripts: helper scripts for building and running tests > ./lib: general architecture neutral services for the tests > ./lib/: architecture dependent services for the tests > ./: the sources of the tests and the created objects/images > diff --git a/arm/Makefile b/arm/Makefile > new file mode 100644 > index 0000000000000..369a38b2d1703 > --- /dev/null > +++ b/arm/Makefile > @@ -0,0 +1 @@ > +include $(TEST_DIR)/Makefile.$(ARCH) > diff --git a/config/config-arm.mak b/arm/Makefile.arm > similarity index 90% > rename from config/config-arm.mak > rename to arm/Makefile.arm > index ae6c2e7134883..946422872532d 100644 > --- a/config/config-arm.mak > +++ b/arm/Makefile.arm > @@ -18,6 +18,6 @@ cflatobjs +=3D lib/arm/processor.o > # arm specific tests > tests =3D > =20 > -include config/config-arm-common.mak > +include $(TEST_DIR)/Makefile.common > =20 > arch_clean: arm_clean > diff --git a/config/config-arm64.mak b/arm/Makefile.arm64 > similarity index 89% > rename from config/config-arm64.mak > rename to arm/Makefile.arm64 > index d61b703c8140e..0b0761c729c7c 100644 > --- a/config/config-arm64.mak > +++ b/arm/Makefile.arm64 > @@ -14,7 +14,7 @@ cflatobjs +=3D lib/arm64/spinlock.o > # arm64 specific tests > tests =3D > =20 > -include config/config-arm-common.mak > +include $(TEST_DIR)/Makefile.common > =20 > arch_clean: arm_clean > $(RM) lib/arm64/.*.d > diff --git a/config/config-arm-common.mak b/arm/Makefile.common > similarity index 98% > rename from config/config-arm-common.mak > rename to arm/Makefile.common > index bd153cf6ea5ba..dd3a0ca327d06 100644 > --- a/config/config-arm-common.mak > +++ b/arm/Makefile.common > @@ -25,7 +25,7 @@ CFLAGS +=3D -O2 > CFLAGS +=3D -I lib -I lib/libfdt > =20 > asm-offsets =3D lib/$(ARCH)/asm-offsets.h > -include config/asm-offsets.mak > +include scripts/asm-offsets.mak > =20 > cflatobjs +=3D lib/util.o > cflatobjs +=3D lib/alloc.o > diff --git a/config/asm-offsets.mak b/scripts/asm-offsets.mak > similarity index 100% > rename from config/asm-offsets.mak > rename to scripts/asm-offsets.mak > diff --git a/x86/Makefile b/x86/Makefile > new file mode 100644 > index 0000000000000..369a38b2d1703 > --- /dev/null > +++ b/x86/Makefile > @@ -0,0 +1 @@ > +include $(TEST_DIR)/Makefile.$(ARCH) > diff --git a/config/config-x86-common.mak b/x86/Makefile.common > similarity index 100% > rename from config/config-x86-common.mak > rename to x86/Makefile.common > diff --git a/config/config-i386.mak b/x86/Makefile.i386 > similarity index 91% > rename from config/config-i386.mak > rename to x86/Makefile.i386 > index e353387551585..8a4c45c457476 100644 > --- a/config/config-i386.mak > +++ b/x86/Makefile.i386 > @@ -8,7 +8,7 @@ cflatobjs +=3D lib/x86/setjmp32.o > tests =3D $(TEST_DIR)/taskswitch.flat $(TEST_DIR)/taskswitch2.flat \ > $(TEST_DIR)/cmpxchg8b.flat > =20 > -include config/config-x86-common.mak > +include $(TEST_DIR)/Makefile.common > =20 > $(TEST_DIR)/cmpxchg8b.elf: $(cstart.o) $(TEST_DIR)/cmpxchg8b.o > $(TEST_DIR)/taskswitch.elf: $(cstart.o) $(TEST_DIR)/taskswitch.o > diff --git a/config/config-x86_64.mak b/x86/Makefile.x86_64 > similarity index 93% > rename from config/config-x86_64.mak > rename to x86/Makefile.x86_64 > index d190be82e0cf2..6b7ccfba550b6 100644 > --- a/config/config-x86_64.mak > +++ b/x86/Makefile.x86_64 > @@ -15,4 +15,4 @@ tests +=3D $(TEST_DIR)/svm.flat > tests +=3D $(TEST_DIR)/vmx.flat > tests +=3D $(TEST_DIR)/tscdeadline_latency.flat > =20 > -include config/config-x86-common.mak > +include $(TEST_DIR)/Makefile.common --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --zYM0uCDKw75PZbzx Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWw8qCAAoJEGw4ysog2bOSMpcP/RVD11VZQ1LJp2mPOue0i3Lb rNj9ZOysTXZTGmg+5Ez3TQR2UyfSPYgu99j0/PfD6H2c6ibW7VA1IgiSF3rLIsJG vOek6reCyU8cn565wMMGgJymSlvXzC52JunhYaTfUJ0dmFqErt6C6EUebND7fr59 yaT0jYteQPwdxkxMl7fuV5JsHrJxzWt6RFbJHA01DpRpUpur3xBBkNG77hSG297T yzE0ubI7vu2QuGBv2K9W4fnLzE32sljbRGMS/pTppOW6OtlFbXyiMkHjshSIwgMU HANtNJMSy/f3J1H5uHgOP4VX7tbf7v8J85VDfIN4JOWFZnY6g0JlVv/GYgotj3qr iHyTU+rAVFAG06Gok95y3AaNhFbTklEsZXwWrbLxPKat4by0fef7V5YYTs1FWX0h nSF/PMIxU+X7HcN9FBzOOoJRM2RPatRed7Ct+7XZBZ4Q8zakpJGX23zlH8aSbPuj 2bSOHH1sNpXVgOZj2uPy1TsxZQZwfYAUr4w5PsGpWKpUUo13sKFLN630vvF2z9yE qMhpL+bth+8fcuc/Rdpbgzx5trqdjM3YjrxQugfnUinSa2EjPldKf2gMa8p0i9YW hkaE/kaDQMCHVHIsZs02YTantlPEBStQQ/nSD320HDsH9wj7StdxJ+Iwn2sD4g7C W+n/ae5itgvCsSath0bV =J5sa -----END PGP SIGNATURE----- --zYM0uCDKw75PZbzx--