From: Marc Zyngier <maz@kernel.org>
Date: Tue, 22 Jun 2021 07:53:56 +0000 (+0100)
Subject: Merge branch kvm-arm64/selftest/sysreg-list-fix into kvmarm-master/next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2fea6cf7d32141b9e95e30500f1d50a9f92a7371;p=linux.git

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
---

2fea6cf7d32141b9e95e30500f1d50a9f92a7371
diff --cc tools/testing/selftests/kvm/.gitignore
index 7e2c66155b068,dd36575b732a9..d4838b6588203
--- a/tools/testing/selftests/kvm/.gitignore
+++ b/tools/testing/selftests/kvm/.gitignore
@@@ -1,7 -1,5 +1,6 @@@
  # SPDX-License-Identifier: GPL-2.0-only
 +/aarch64/debug-exceptions
  /aarch64/get-reg-list
- /aarch64/get-reg-list-sve
  /aarch64/vgic_init
  /s390x/memop
  /s390x/resets
diff --cc tools/testing/selftests/kvm/Makefile
index 36e4ebcc82f0e,5c8f3725a7f07..a61b016da0e35
--- a/tools/testing/selftests/kvm/Makefile
+++ b/tools/testing/selftests/kvm/Makefile
@@@ -78,9 -78,7 +78,8 @@@ TEST_GEN_PROGS_x86_64 += memslot_perf_t
  TEST_GEN_PROGS_x86_64 += set_memory_region_test
  TEST_GEN_PROGS_x86_64 += steal_time
  
 +TEST_GEN_PROGS_aarch64 += aarch64/debug-exceptions
  TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list
- TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list-sve
  TEST_GEN_PROGS_aarch64 += aarch64/vgic_init
  TEST_GEN_PROGS_aarch64 += demand_paging_test
  TEST_GEN_PROGS_aarch64 += dirty_log_test