KVM: selftests: Convert rseq_test away from VCPU_ID

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

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

diff --git a/tools/testing/selftests/kvm/rseq_test.c b/tools/testing/selftests/kvm/rseq_test.c
index 4158da0da2bba8e5e8ea12acd87f6cff6206e3ae..fd754de0b74cd1ba85f578df7a923553257d3035 100644 (file)
--- a/tools/testing/selftests/kvm/rseq_test.c
+++ b/tools/testing/selftests/kvm/rseq_test.c
@@ -20,8 +20,6 @@
 #include "processor.h"
 #include "test_util.h"
 
-#define VCPU_ID 0
-
 static __thread volatile struct rseq __rseq = {
        .cpu_id = RSEQ_CPU_ID_UNINITIALIZED,
 };
@@ -207,6 +205,7 @@ int main(int argc, char *argv[])
 {
        int r, i, snapshot;
        struct kvm_vm *vm;
+       struct kvm_vcpu *vcpu;
        u32 cpu, rseq_cpu;
 
        /* Tell stdout not to buffer its content */
@@ -228,14 +227,14 @@ int main(int argc, char *argv[])
         * GUEST_SYNC, while concurrently migrating the process by setting its
         * CPU affinity.
         */
-       vm = vm_create_default(VCPU_ID, 0, guest_code);
+       vm = vm_create_with_one_vcpu(&vcpu, guest_code);
        ucall_init(vm, NULL);
 
        pthread_create(&migration_thread, NULL, migration_worker, 0);
 
        for (i = 0; !done; i++) {
-               vcpu_run(vm, VCPU_ID);
-               TEST_ASSERT(get_ucall(vm, VCPU_ID, NULL) == UCALL_SYNC,
+               vcpu_run(vm, vcpu->id);
+               TEST_ASSERT(get_ucall(vm, vcpu->id, NULL) == UCALL_SYNC,
                            "Guest failed?");
 
                /*