Skip to content

Commit 2fea6cf

Browse files
author
Marc Zyngier
committed
Merge branch kvm-arm64/selftest/sysreg-list-fix into kvmarm-master/next
Selftest updates from Andrew Jones, fixing the sysgreg list expectations by dealing with multiple configurations, such as with or without a PMU. * kvm-arm64/selftest/sysreg-list-fix: KVM: arm64: Update MAINTAINERS to include selftests KVM: arm64: selftests: get-reg-list: Split base and pmu registers KVM: arm64: selftests: get-reg-list: Remove get-reg-list-sve KVM: arm64: selftests: get-reg-list: Provide config selection option KVM: arm64: selftests: get-reg-list: Prepare to run multiple configs at once KVM: arm64: selftests: get-reg-list: Introduce vcpu configs
2 parents 85c653f + b356a83 commit 2fea6cf

5 files changed

Lines changed: 323 additions & 123 deletions

File tree

MAINTAINERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9993,6 +9993,8 @@ F: arch/arm64/include/asm/kvm*
99939993
F: arch/arm64/include/uapi/asm/kvm*
99949994
F: arch/arm64/kvm/
99959995
F: include/kvm/arm_*
9996+
F: tools/testing/selftests/kvm/*/aarch64/
9997+
F: tools/testing/selftests/kvm/aarch64/
99969998

99979999
KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
999810000
M: Huacai Chen <chenhuacai@kernel.org>

tools/testing/selftests/kvm/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
/aarch64/debug-exceptions
33
/aarch64/get-reg-list
4-
/aarch64/get-reg-list-sve
54
/aarch64/vgic_init
65
/s390x/memop
76
/s390x/resets

tools/testing/selftests/kvm/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ TEST_GEN_PROGS_x86_64 += steal_time
8080

8181
TEST_GEN_PROGS_aarch64 += aarch64/debug-exceptions
8282
TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list
83-
TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list-sve
8483
TEST_GEN_PROGS_aarch64 += aarch64/vgic_init
8584
TEST_GEN_PROGS_aarch64 += demand_paging_test
8685
TEST_GEN_PROGS_aarch64 += dirty_log_test

tools/testing/selftests/kvm/aarch64/get-reg-list-sve.c

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)