KVM: selftests: Convert vmx_invalid_nested_guest_state away from VCPU_ID

Convert vmx_invalid_nested_guest_state 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/x86_64/vmx_invalid_nested_guest_state.c b/tools/testing/selftests/kvm/x86_64/vmx_invalid_nested_guest_state.c
index 489fbed4ca6feef9fb0582857eafa5a4142dc799..ba534be498f9954c10a81ca30e64537198b3bdd4 100644 (file)
--- a/tools/testing/selftests/kvm/x86_64/vmx_invalid_nested_guest_state.c
+++ b/tools/testing/selftests/kvm/x86_64/vmx_invalid_nested_guest_state.c
@@ -9,7 +9,6 @@
 
 #include "kselftest.h"
 
-#define VCPU_ID        0
 #define ARBITRARY_IO_PORT 0x2000
 
 static struct kvm_vm *vm;
@@ -55,20 +54,21 @@ int main(int argc, char *argv[])
 {
        vm_vaddr_t vmx_pages_gva;
        struct kvm_sregs sregs;
+       struct kvm_vcpu *vcpu;
        struct kvm_run *run;
        struct ucall uc;
 
        nested_vmx_check_supported();
 
-       vm = vm_create_default(VCPU_ID, 0, (void *) l1_guest_code);
+       vm = vm_create_with_one_vcpu(&vcpu, l1_guest_code);
 
        /* Allocate VMX pages and shared descriptors (vmx_pages). */
        vcpu_alloc_vmx(vm, &vmx_pages_gva);
-       vcpu_args_set(vm, VCPU_ID, 1, vmx_pages_gva);
+       vcpu_args_set(vm, vcpu->id, 1, vmx_pages_gva);
 
-       vcpu_run(vm, VCPU_ID);
+       vcpu_run(vm, vcpu->id);
 
-       run = vcpu_state(vm, VCPU_ID);
+       run = vcpu->run;
 
        /*
         * The first exit to L0 userspace should be an I/O access from L2.
@@ -88,13 +88,13 @@ int main(int argc, char *argv[])
         * emulating invalid guest state for L2.
         */
        memset(&sregs, 0, sizeof(sregs));
-       vcpu_sregs_get(vm, VCPU_ID, &sregs);
+       vcpu_sregs_get(vm, vcpu->id, &sregs);
        sregs.tr.unusable = 1;
-       vcpu_sregs_set(vm, VCPU_ID, &sregs);
+       vcpu_sregs_set(vm, vcpu->id, &sregs);
 
-       vcpu_run(vm, VCPU_ID);
+       vcpu_run(vm, vcpu->id);
 
-       switch (get_ucall(vm, VCPU_ID, &uc)) {
+       switch (get_ucall(vm, vcpu->id, &uc)) {
        case UCALL_DONE:
                break;
        case UCALL_ABORT: