From: Haibo Xu <haibo1.xu@intel.com>
Cc: xiaobo55x@gmail.com, haibo1.xu@intel.com,
ajones@ventanamicro.com, maz@kernel.org, oliver.upton@linux.dev,
seanjc@google.com, Paolo Bonzini <pbonzini@redhat.com>,
Jonathan Corbet <corbet@lwn.net>,
Anup Patel <anup@brainfault.org>,
Atish Patra <atishp@atishpatra.org>,
Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Albert Ou <aou@eecs.berkeley.edu>, Shuah Khan <shuah@kernel.org>,
James Morse <james.morse@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Zenghui Yu <yuzenghui@huawei.com>,
David Matlack <dmatlack@google.com>,
Ben Gardon <bgardon@google.com>,
Vipin Sharma <vipinsh@google.com>,
Colton Lewis <coltonlewis@google.com>,
kvm@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, kvm-riscv@lists.infradead.org,
linux-riscv@lists.infradead.org, linux-kselftest@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev
Subject: [PATCH v2 07/11] KVM: arm64: selftests: Finish generalizing get-reg-list
Date: Thu, 25 May 2023 15:38:31 +0800 [thread overview]
Message-ID: <87f433096a95d21bcefe440629e74cd2a2d44470.1684999824.git.haibo1.xu@intel.com> (raw)
In-Reply-To: <cover.1684999824.git.haibo1.xu@intel.com>
From: Andrew Jones <ajones@ventanamicro.com>
Add some unfortunate #ifdeffery to ensure the common get-reg-list.c
can be compiled and run with other architectures. The next
architecture to support get-reg-list should now only need to provide
$(ARCH_DIR)/get-reg-list.c where arch-specific print_reg() and
vcpu_configs[] get defined.
Signed-off-by: Andrew Jones <ajones@ventanamicro.com>
---
tools/testing/selftests/kvm/get-reg-list.c | 26 +++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/kvm/get-reg-list.c b/tools/testing/selftests/kvm/get-reg-list.c
index 69bb91087081..f6ad7991a812 100644
--- a/tools/testing/selftests/kvm/get-reg-list.c
+++ b/tools/testing/selftests/kvm/get-reg-list.c
@@ -98,6 +98,7 @@ void __weak print_reg(const char *prefix, __u64 id)
printf("\t0x%llx,\n", id);
}
+#ifdef __aarch64__
static void prepare_vcpu_init(struct vcpu_reg_list *c, struct kvm_vcpu_init *init)
{
struct vcpu_reg_sublist *s;
@@ -120,6 +121,25 @@ static void finalize_vcpu(struct kvm_vcpu *vcpu, struct vcpu_reg_list *c)
}
}
+static struct kvm_vcpu *vcpu_config_get_vcpu(struct vcpu_reg_list *c, struct kvm_vm *vm)
+{
+ struct kvm_vcpu_init init = { .target = -1, };
+ struct kvm_vcpu *vcpu;
+
+ prepare_vcpu_init(c, &init);
+ vcpu = __vm_vcpu_add(vm, 0);
+ aarch64_vcpu_setup(vcpu, &init);
+ finalize_vcpu(vcpu, c);
+
+ return vcpu;
+}
+#else
+static struct kvm_vcpu *vcpu_config_get_vcpu(struct vcpu_reg_list *c, struct kvm_vm *vm)
+{
+ return __vm_vcpu_add(vm, 0);
+}
+#endif
+
static void check_supported(struct vcpu_reg_list *c)
{
struct vcpu_reg_sublist *s;
@@ -139,7 +159,6 @@ static bool print_filtered;
static void run_test(struct vcpu_reg_list *c)
{
- struct kvm_vcpu_init init = { .target = -1, };
int new_regs = 0, missing_regs = 0, i, n;
int failed_get = 0, failed_set = 0, failed_reject = 0;
struct kvm_vcpu *vcpu;
@@ -149,10 +168,7 @@ static void run_test(struct vcpu_reg_list *c)
check_supported(c);
vm = vm_create_barebones();
- prepare_vcpu_init(c, &init);
- vcpu = __vm_vcpu_add(vm, 0);
- aarch64_vcpu_setup(vcpu, &init);
- finalize_vcpu(vcpu, c);
+ vcpu = vcpu_config_get_vcpu(c, vm);
reg_list = vcpu_get_reg_list(vcpu);
--
2.34.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2023-05-25 7:36 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-25 7:38 [PATCH v2 00/11] RISCV: Add KVM_GET_REG_LIST API Haibo Xu
2023-05-25 7:38 ` [PATCH v2 01/11] KVM: arm64: selftests: Replace str_with_index with strdup_printf Haibo Xu
2023-05-25 7:38 ` [PATCH v2 02/11] KVM: arm64: selftests: Drop SVE cap check in print_reg Haibo Xu
2023-05-25 7:38 ` [PATCH v2 03/11] KVM: arm64: selftests: Remove print_reg's dependency on vcpu_config Haibo Xu
2023-05-25 7:38 ` [PATCH v2 04/11] KVM: arm64: selftests: Rename vcpu_config and add to kvm_util.h Haibo Xu
2023-05-25 7:38 ` [PATCH v2 05/11] KVM: arm64: selftests: Delete core_reg_fixup Haibo Xu
2023-05-25 7:38 ` [PATCH v2 06/11] KVM: arm64: selftests: Split get-reg-list test code Haibo Xu
2023-05-25 7:38 ` Haibo Xu [this message]
2023-05-25 7:38 ` [PATCH v2 08/11] KVM: riscv: Add KVM_GET_REG_LIST API support Haibo Xu
2023-05-25 7:38 ` [PATCH v2 09/11] KVM: riscv: selftests: Make check_supported arch specific Haibo Xu
2023-05-25 16:40 ` Andrew Jones
2023-05-26 7:50 ` Haibo Xu
2023-05-26 8:44 ` Andrew Jones
2023-05-27 2:26 ` Haibo Xu
2023-05-25 7:38 ` [PATCH v2 10/11] KVM: riscv: selftests: Skip some registers set operation Haibo Xu
2023-05-25 16:41 ` Andrew Jones
2023-05-25 7:38 ` [PATCH v2 11/11] KVM: riscv: selftests: Add get-reg-list test Haibo Xu
2023-05-25 17:18 ` Andrew Jones
2023-05-27 4:39 ` Haibo Xu
2023-05-29 7:08 ` Andrew Jones
2023-05-29 12:20 ` Haibo Xu
2023-06-08 9:45 ` Haibo Xu
2023-06-08 9:58 ` Andrew Jones
2023-06-09 1:20 ` Haibo Xu
2023-05-25 17:20 ` [PATCH v2 00/11] RISCV: Add KVM_GET_REG_LIST API Andrew Jones
2023-05-26 6:22 ` Haibo Xu
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=87f433096a95d21bcefe440629e74cd2a2d44470.1684999824.git.haibo1.xu@intel.com \
--to=haibo1.xu@intel.com \
--cc=ajones@ventanamicro.com \
--cc=anup@brainfault.org \
--cc=aou@eecs.berkeley.edu \
--cc=atishp@atishpatra.org \
--cc=bgardon@google.com \
--cc=coltonlewis@google.com \
--cc=corbet@lwn.net \
--cc=dmatlack@google.com \
--cc=james.morse@arm.com \
--cc=kvm-riscv@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=maz@kernel.org \
--cc=oliver.upton@linux.dev \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=shuah@kernel.org \
--cc=suzuki.poulose@arm.com \
--cc=vipinsh@google.com \
--cc=xiaobo55x@gmail.com \
--cc=yuzenghui@huawei.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 NNTP newsgroup(s).