KVM: selftests: Convert kvm_clock_test away from VCPU_ID

Convert kvm_clock_test to use vm_create_with_one_vcpu() and pass around a
'struct kvm_vcpu' object instead of using a global VCPU_ID.

Opportunistically use vcpu_run() instead of _vcpu_run() with an open
coded assert that KVM_RUN succeeded.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/tools/testing/selftests/kvm/x86_64/kvm_clock_test.c b/tools/testing/selftests/kvm/x86_64/kvm_clock_test.c
index 9773145..2c1f850 100644 (file)
--- a/tools/testing/selftests/kvm/x86_64/kvm_clock_test.c
+++ b/tools/testing/selftests/kvm/x86_64/kvm_clock_test.c
@@ -16,8 +16,6 @@
 #include "kvm_util.h"
 #include "processor.h"
 
-#define VCPU_ID 0
-
 struct test_case {
        uint64_t kvmclock_base;
        int64_t realtime_offset;
@@ -105,29 +103,27 @@ static void setup_clock(struct kvm_vm *vm, struct test_case *test_case)
        vm_ioctl(vm, KVM_SET_CLOCK, &data);
 }
 
-static void enter_guest(struct kvm_vm *vm)
+static void enter_guest(struct kvm_vcpu *vcpu)
 {
        struct kvm_clock_data start, end;
-       struct kvm_run *run;
+       struct kvm_run *run = vcpu->run;
+       struct kvm_vm *vm = vcpu->vm;
        struct ucall uc;
-       int i, r;
-
-       run = vcpu_state(vm, VCPU_ID);
+       int i;
 
        for (i = 0; i < ARRAY_SIZE(test_cases); i++) {
                setup_clock(vm, &test_cases[i]);
 
                vm_ioctl(vm, KVM_GET_CLOCK, &start);
 
-               r = _vcpu_run(vm, VCPU_ID);
+               vcpu_run(vcpu->vm, vcpu->id);
                vm_ioctl(vm, KVM_GET_CLOCK, &end);
 
-               TEST_ASSERT(!r, "vcpu_run failed: %d\n", r);
                TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,
                            "unexpected exit reason: %u (%s)",
                            run->exit_reason, exit_reason_str(run->exit_reason));
 
-               switch (get_ucall(vm, VCPU_ID, &uc)) {
+               switch (get_ucall(vcpu->vm, vcpu->id, &uc)) {
                case UCALL_SYNC:
                        handle_sync(&uc, &start, &end);
                        break;
@@ -178,6 +174,7 @@ out:
 
 int main(void)
 {
+       struct kvm_vcpu *vcpu;
        vm_vaddr_t pvti_gva;
        vm_paddr_t pvti_gpa;
        struct kvm_vm *vm;
@@ -192,12 +189,12 @@ int main(void)
 
        check_clocksource();
 
-       vm = vm_create_default(VCPU_ID, 0, guest_main);
+       vm = vm_create_with_one_vcpu(&vcpu, guest_main);
 
        pvti_gva = vm_vaddr_alloc(vm, getpagesize(), 0x10000);
        pvti_gpa = addr_gva2gpa(vm, pvti_gva);
-       vcpu_args_set(vm, VCPU_ID, 2, pvti_gpa, pvti_gva);
+       vcpu_args_set(vm, vcpu->id, 2, pvti_gpa, pvti_gva);
 
-       enter_guest(vm);
+       enter_guest(vcpu);
        kvm_vm_free(vm);
 }