From: Andrew Jones <andrew.jones@linux.dev>
To: Nicholas Piggin <npiggin@gmail.com>
Cc: "Thomas Huth" <thuth@redhat.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Joel Stanley" <joel@jms.id.au>,
linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org,
"Alexandru Elisei" <alexandru.elisei@arm.com>,
"Claudio Imbrenda" <imbrenda@linux.ibm.com>,
"David Hildenbrand" <david@redhat.com>,
"Eric Auger" <eric.auger@redhat.com>,
"Janosch Frank" <frankja@linux.ibm.com>,
"Nico Böhr" <nrb@linux.ibm.com>,
linux-s390@vger.kernel.org, kvmarm@lists.linux.dev,
kvm-riscv@lists.infradead.org
Subject: Re: [kvm-unit-tests PATCH 30/32] configure: Make arch_libdir a first-class entity
Date: Wed, 28 Feb 2024 13:13:14 +0100 [thread overview]
Message-ID: <20240228-e9507071ef0c14477ba703ae@orel> (raw)
In-Reply-To: <20240226101218.1472843-31-npiggin@gmail.com>
On Mon, Feb 26, 2024 at 08:12:16PM +1000, Nicholas Piggin wrote:
> arch_libdir was brought in to improve the heuristic determination of
> the lib/ directory based on arch and testdir names, but it did not
> entirely clean that mess up.
>
> Remove the arch_libdir->arch->testdir heuristic and just require
> everybody sets arch_libdir correctly. Fail if the lib/arch or
> lib/arch/asm directories can not be found.
>
> Cc: Alexandru Elisei <alexandru.elisei@arm.com>
> Cc: Andrew Jones <andrew.jones@linux.dev>
> Cc: Claudio Imbrenda <imbrenda@linux.ibm.com>
> Cc: David Hildenbrand <david@redhat.com>
> Cc: Eric Auger <eric.auger@redhat.com>
> Cc: Janosch Frank <frankja@linux.ibm.com>
> Cc: Laurent Vivier <lvivier@redhat.com>
> Cc: Nico Böhr <nrb@linux.ibm.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: kvm@vger.kernel.org
> Cc: linux-s390@vger.kernel.org
> Cc: kvmarm@lists.linux.dev
> Cc: kvm-riscv@lists.infradead.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> ---
> Makefile | 2 +-
> configure | 18 +++++++++++++-----
> 2 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 4f35fffc6..4e0f54543 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -10,7 +10,7 @@ include config.mak
> VPATH = $(SRCDIR)
>
> libdirs-get = $(shell [ -d "lib/$(1)" ] && echo "lib/$(1) lib/$(1)/asm")
> -ARCH_LIBDIRS := $(call libdirs-get,$(ARCH_LIBDIR)) $(call libdirs-get,$(TEST_DIR))
> +ARCH_LIBDIRS := $(call libdirs-get,$(ARCH_LIBDIR))
> OBJDIRS := $(ARCH_LIBDIRS)
>
> DESTDIR := $(PREFIX)/share/kvm-unit-tests/
> diff --git a/configure b/configure
> index ae522c556..8c0e3506f 100755
> --- a/configure
> +++ b/configure
> @@ -199,7 +199,6 @@ fi
> arch_name=$arch
> [ "$arch" = "aarch64" ] && arch="arm64"
> [ "$arch_name" = "arm64" ] && arch_name="aarch64"
> -arch_libdir=$arch
>
> if [ "$arch" = "riscv" ]; then
> echo "riscv32 or riscv64 must be specified"
> @@ -264,8 +263,10 @@ fi
>
> if [ "$arch" = "i386" ] || [ "$arch" = "x86_64" ]; then
> testdir=x86
> + arch_libdir=x86
> elif [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then
> testdir=arm
> + arch_libdir=$arch
> if [ "$target" = "qemu" ]; then
> arm_uart_early_addr=0x09000000
> elif [ "$target" = "kvmtool" ]; then
> @@ -314,6 +315,7 @@ elif [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then
> fi
> elif [ "$arch" = "ppc64" ]; then
> testdir=powerpc
> + arch_libdir=ppc64
> firmware="$testdir/boot_rom.bin"
> if [ "$endian" != "little" ] && [ "$endian" != "big" ]; then
> echo "You must provide endianness (big or little)!"
> @@ -324,6 +326,7 @@ elif [ "$arch" = "riscv32" ] || [ "$arch" = "riscv64" ]; then
> arch_libdir=riscv
> elif [ "$arch" = "s390x" ]; then
> testdir=s390x
> + arch_libdir=s390x
Probably could have left the arch_libdir=$arch above and only added the
ppc64 line, but either way.
> else
> echo "arch $arch is not supported!"
> arch=
> @@ -333,6 +336,10 @@ if [ ! -d "$srcdir/$testdir" ]; then
> echo "$srcdir/$testdir does not exist!"
> exit 1
> fi
> +if [ ! -d "$srcdir/lib/$arch_libdir" ]; then
> + echo "$srcdir/lib/$arch_libdir does not exist!"
> + exit 1
> +fi
>
> if [ "$efi" = "y" ] && [ -f "$srcdir/$testdir/efi/run" ]; then
> ln -fs "$srcdir/$testdir/efi/run" $testdir-run
> @@ -395,10 +402,11 @@ fi
> # link lib/asm for the architecture
> rm -f lib/asm
> asm="asm-generic"
> -if [ -d "$srcdir/lib/$arch/asm" ]; then
> - asm="$srcdir/lib/$arch/asm"
> -elif [ -d "$srcdir/lib/$testdir/asm" ]; then
> - asm="$srcdir/lib/$testdir/asm"
> +if [ -d "$srcdir/lib/$arch_libdir/asm" ]; then
> + asm="$srcdir/lib/$arch_libdir/asm"
> +else
> + echo "$srcdir/lib/$arch_libdir/asm does not exist"
> + exit 1
> fi
> mkdir -p lib
> ln -sf "$asm" lib/asm
> --
> 2.42.0
>
>
Reviewed-by: Andrew Jones <andrew.jones@linux.dev>
Thanks,
drew
prev parent reply other threads:[~2024-02-28 12:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240226101218.1472843-1-npiggin@gmail.com>
2024-02-26 10:12 ` [kvm-unit-tests PATCH 29/32] configure: Fail on unknown arch Nicholas Piggin
2024-02-28 12:08 ` Andrew Jones
2024-02-26 10:12 ` [kvm-unit-tests PATCH 30/32] configure: Make arch_libdir a first-class entity Nicholas Piggin
2024-02-28 12:13 ` Andrew Jones [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240228-e9507071ef0c14477ba703ae@orel \
--to=andrew.jones@linux.dev \
--cc=alexandru.elisei@arm.com \
--cc=david@redhat.com \
--cc=eric.auger@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=imbrenda@linux.ibm.com \
--cc=joel@jms.id.au \
--cc=kvm-riscv@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=linux-s390@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lvivier@redhat.com \
--cc=npiggin@gmail.com \
--cc=nrb@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).