Re: [PATCH 06/14] KVM: selftests: Rename UNAME_M to ARCH_DIR, fill explicitly for x86

Paolo Bonzini
2022-12-24T09:12:25Z

On 12/13/22 01:16, Sean Christopherson wrote:
> -ifeq ($(ARCH),riscv)
> - UNAME_M := riscv
> +ifeq ($(ARCH),x86)
> + ARCH_DIR := x86_64
> +else ifeq ($(ARCH),arm64)
> + ARCH_DIR := aarch64
> +else ifeq ($(ARCH),s390)
> + ARCH_DIR := s390x
> +else ifeq ($(ARCH),riscv)
> + ARCH_DIR := riscv
> +else
> +$(error Unknown architecture '$(ARCH)')
> endif

$(error) would break compiling via tools/testing/selftests/Makefile, so
I am squashing this:

diff --git a/tools/testing/selftests/kvm/Makefile
b/tools/testing/selftests/kvm/Makefile
index d761a77c3a80..59f3eb53c932 100644
--- a/tools/testing/selftests/kvm/Makefile
+++ b/tools/testing/selftests/kvm/Makefile
@@ -13,10 +13,8 @@ else ifeq ($(ARCH),arm64)
ARCH_DIR := aarch64
else ifeq ($(ARCH),s390)
ARCH_DIR := s390x
-else ifeq ($(ARCH),riscv)
- ARCH_DIR := riscv
else
-$(error Unknown architecture '$(ARCH)')
+ ARCH_DIR := $(ARCH)
endif

LIBKVM += lib/assert.c

Then the aarch64 and s390x directories can be renamed---x86 too, but the
ifeq needs to stay (just changed to do x86_64->x86 instead of the other
way round).

Paolo