Skip to content

Commit 67730e6

Browse files
committed
KVM: selftests: Use canonical $(ARCH) paths for KVM selftests directories
Use the kernel's canonical $(ARCH) paths instead of the raw target triple for KVM selftests directories. KVM selftests are quite nearly the only place in the entire kernel that using the target triple for directories, tools/testing/selftests/drivers/s390x being the lone holdout. Using the kernel's preferred nomenclature eliminates the minor, but annoying, friction of having to translate to KVM's selftests directories, e.g. for pattern matching, opening files, running selftests, etc. Opportunsitically delete file comments that reference the full path of the file, as they are obviously prone to becoming stale, and serve no known purpose. Reviewed-by: Muhammad Usama Anjum <usama.anjum@collabora.com> Acked-by: Claudio Imbrenda <imbrenda@linux.ibm.com> Acked-by: Andrew Jones <ajones@ventanamicro.com> Link: https://lore.kernel.org/r/20241128005547.4077116-16-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 43fbd8c commit 67730e6

File tree

152 files changed

+176
-212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+176
-212
lines changed

MAINTAINERS

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12605,8 +12605,8 @@ F: arch/arm64/include/asm/kvm*
1260512605
F: arch/arm64/include/uapi/asm/kvm*
1260612606
F: arch/arm64/kvm/
1260712607
F: include/kvm/arm_*
12608-
F: tools/testing/selftests/kvm/*/aarch64/
12609-
F: tools/testing/selftests/kvm/aarch64/
12608+
F: tools/testing/selftests/kvm/*/arm64/
12609+
F: tools/testing/selftests/kvm/arm64/
1261012610

1261112611
KERNEL VIRTUAL MACHINE FOR LOONGARCH (KVM/LoongArch)
1261212612
M: Tianrui Zhao <zhaotianrui@loongson.cn>
@@ -12677,8 +12677,8 @@ F: arch/s390/kvm/
1267712677
F: arch/s390/mm/gmap.c
1267812678
F: drivers/s390/char/uvdevice.c
1267912679
F: tools/testing/selftests/drivers/s390x/uvdevice/
12680-
F: tools/testing/selftests/kvm/*/s390x/
12681-
F: tools/testing/selftests/kvm/s390x/
12680+
F: tools/testing/selftests/kvm/*/s390/
12681+
F: tools/testing/selftests/kvm/s390/
1268212682

1268312683
KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
1268412684
M: Sean Christopherson <seanjc@google.com>
@@ -12695,8 +12695,8 @@ F: arch/x86/include/uapi/asm/svm.h
1269512695
F: arch/x86/include/uapi/asm/vmx.h
1269612696
F: arch/x86/kvm/
1269712697
F: arch/x86/kvm/*/
12698-
F: tools/testing/selftests/kvm/*/x86_64/
12699-
F: tools/testing/selftests/kvm/x86_64/
12698+
F: tools/testing/selftests/kvm/*/x86/
12699+
F: tools/testing/selftests/kvm/x86/
1270012700

1270112701
KERNFS
1270212702
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

tools/testing/selftests/kvm/Makefile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,12 @@ include $(top_srcdir)/scripts/subarch.include
44
ARCH ?= $(SUBARCH)
55

66
ifeq ($(ARCH),$(filter $(ARCH),arm64 s390 riscv x86 x86_64))
7-
ifeq ($(ARCH),x86)
8-
ARCH_DIR := x86_64
9-
else ifeq ($(ARCH),arm64)
10-
ARCH_DIR := aarch64
11-
else ifeq ($(ARCH),s390)
12-
ARCH_DIR := s390x
7+
# Top-level selftests allows ARCH=x86_64 :-(
8+
ifeq ($(ARCH),x86_64)
9+
ARCH_DIR := x86
1310
else
1411
ARCH_DIR := $(ARCH)
1512
endif
16-
1713
include Makefile.kvm
1814
else
1915
# Empty targets for unsupported architectures

0 commit comments

Comments
 (0)