]> git.baikalelectronics.ru Git - kernel.git/commitdiff
KVM: selftests: Convert svm_vmcall_test away from VCPU_ID
authorSean Christopherson <seanjc@google.com>
Tue, 15 Feb 2022 23:56:54 +0000 (15:56 -0800)
committerPaolo Bonzini <pbonzini@redhat.com>
Sat, 11 Jun 2022 15:46:43 +0000 (11:46 -0400)
Convert svm_vmcall_test to use vm_create_with_one_vcpu() and pass around
a 'struct kvm_vcpu' object instead of using a global VCPU_ID.  Note, this
is a "functional" change in the sense that the test now creates a vCPU
with vcpu_id==0 instead of vcpu_id==5.  The non-zero VCPU_ID was 100%
arbitrary and added little to no validation coverage.  If testing
non-zero vCPU IDs is desirable for generic tests, that can be done in the
future by tweaking the VM creation helpers.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
tools/testing/selftests/kvm/x86_64/svm_vmcall_test.c

index be2ca157485b67d610d7227a6d182c32b56c9e82..15e389a7cd312500f5eb1e69c84f13cd63da59ec 100644 (file)
 #include "processor.h"
 #include "svm_util.h"
 
-#define VCPU_ID                5
-
-static struct kvm_vm *vm;
-
 static void l2_guest_code(struct svm_test_data *svm)
 {
        __asm__ __volatile__("vmcall");
@@ -39,26 +35,28 @@ static void l1_guest_code(struct svm_test_data *svm)
 
 int main(int argc, char *argv[])
 {
+       struct kvm_vcpu *vcpu;
        vm_vaddr_t svm_gva;
+       struct kvm_vm *vm;
 
        nested_svm_check_supported();
 
-       vm = vm_create_default(VCPU_ID, 0, (void *) l1_guest_code);
+       vm = vm_create_with_one_vcpu(&vcpu, l1_guest_code);
 
        vcpu_alloc_svm(vm, &svm_gva);
-       vcpu_args_set(vm, VCPU_ID, 1, svm_gva);
+       vcpu_args_set(vm, vcpu->id, 1, svm_gva);
 
        for (;;) {
-               volatile struct kvm_run *run = vcpu_state(vm, VCPU_ID);
+               volatile struct kvm_run *run = vcpu->run;
                struct ucall uc;
 
-               vcpu_run(vm, VCPU_ID);
+               vcpu_run(vm, vcpu->id);
                TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,
                            "Got exit_reason other than KVM_EXIT_IO: %u (%s)\n",
                            run->exit_reason,
                            exit_reason_str(run->exit_reason));
 
-               switch (get_ucall(vm, VCPU_ID, &uc)) {
+               switch (get_ucall(vm, vcpu->id, &uc)) {
                case UCALL_ABORT:
                        TEST_FAIL("%s", (const char *)uc.args[0]);
                        /* NOT REACHED */