KVM: selftests: Convert sync_regs_test away from VCPU_ID

Convert sync_regs_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>

diff --git a/tools/testing/selftests/kvm/x86_64/sync_regs_test.c b/tools/testing/selftests/kvm/x86_64/sync_regs_test.c
index fc03a150278d0328ae001a5cfd52627fe8a41268..c971706b49f59cf3a51553d2d910200659ee90a4 100644 (file)
--- a/tools/testing/selftests/kvm/x86_64/sync_regs_test.c
+++ b/tools/testing/selftests/kvm/x86_64/sync_regs_test.c
@@ -20,8 +20,6 @@
 #include "kvm_util.h"
 #include "processor.h"
 
-#define VCPU_ID 5
-
 #define UCALL_PIO_PORT ((uint16_t)0x1000)
 
 struct ucall uc_none = {
@@ -84,6 +82,7 @@ static void compare_vcpu_events(struct kvm_vcpu_events *left,
 
 int main(int argc, char *argv[])
 {
+       struct kvm_vcpu *vcpu;
        struct kvm_vm *vm;
        struct kvm_run *run;
        struct kvm_regs regs;
@@ -104,57 +103,56 @@ int main(int argc, char *argv[])
                exit(KSFT_SKIP);
        }
 
-       /* Create VM */
-       vm = vm_create_default(VCPU_ID, 0, guest_code);
+       vm = vm_create_with_one_vcpu(&vcpu, guest_code);
 
-       run = vcpu_state(vm, VCPU_ID);
+       run = vcpu->run;
 
        /* Request reading invalid register set from VCPU. */
        run->kvm_valid_regs = INVALID_SYNC_FIELD;
-       rv = _vcpu_run(vm, VCPU_ID);
+       rv = _vcpu_run(vm, vcpu->id);
        TEST_ASSERT(rv < 0 && errno == EINVAL,
                    "Invalid kvm_valid_regs did not cause expected KVM_RUN error: %d\n",
                    rv);
-       vcpu_state(vm, VCPU_ID)->kvm_valid_regs = 0;
+       run->kvm_valid_regs = 0;
 
        run->kvm_valid_regs = INVALID_SYNC_FIELD | TEST_SYNC_FIELDS;
-       rv = _vcpu_run(vm, VCPU_ID);
+       rv = _vcpu_run(vm, vcpu->id);
        TEST_ASSERT(rv < 0 && errno == EINVAL,
                    "Invalid kvm_valid_regs did not cause expected KVM_RUN error: %d\n",
                    rv);
-       vcpu_state(vm, VCPU_ID)->kvm_valid_regs = 0;
+       run->kvm_valid_regs = 0;
 
        /* Request setting invalid register set into VCPU. */
        run->kvm_dirty_regs = INVALID_SYNC_FIELD;
-       rv = _vcpu_run(vm, VCPU_ID);
+       rv = _vcpu_run(vm, vcpu->id);
        TEST_ASSERT(rv < 0 && errno == EINVAL,
                    "Invalid kvm_dirty_regs did not cause expected KVM_RUN error: %d\n",
                    rv);
-       vcpu_state(vm, VCPU_ID)->kvm_dirty_regs = 0;
+       run->kvm_dirty_regs = 0;
 
        run->kvm_dirty_regs = INVALID_SYNC_FIELD | TEST_SYNC_FIELDS;
-       rv = _vcpu_run(vm, VCPU_ID);
+       rv = _vcpu_run(vm, vcpu->id);
        TEST_ASSERT(rv < 0 && errno == EINVAL,
                    "Invalid kvm_dirty_regs did not cause expected KVM_RUN error: %d\n",
                    rv);
-       vcpu_state(vm, VCPU_ID)->kvm_dirty_regs = 0;
+       run->kvm_dirty_regs = 0;
 
        /* Request and verify all valid register sets. */
        /* TODO: BUILD TIME CHECK: TEST_ASSERT(KVM_SYNC_X86_NUM_FIELDS != 3); */
        run->kvm_valid_regs = TEST_SYNC_FIELDS;
-       rv = _vcpu_run(vm, VCPU_ID);
+       rv = _vcpu_run(vm, vcpu->id);
        TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,
                    "Unexpected exit reason: %u (%s),\n",
                    run->exit_reason,
                    exit_reason_str(run->exit_reason));
 
-       vcpu_regs_get(vm, VCPU_ID, &regs);
+       vcpu_regs_get(vm, vcpu->id, &regs);
        compare_regs(&regs, &run->s.regs.regs);
 
-       vcpu_sregs_get(vm, VCPU_ID, &sregs);
+       vcpu_sregs_get(vm, vcpu->id, &sregs);
        compare_sregs(&sregs, &run->s.regs.sregs);
 
-       vcpu_events_get(vm, VCPU_ID, &events);
+       vcpu_events_get(vm, vcpu->id, &events);
        compare_vcpu_events(&events, &run->s.regs.events);
 
        /* Set and verify various register values. */
@@ -164,7 +162,7 @@ int main(int argc, char *argv[])
 
        run->kvm_valid_regs = TEST_SYNC_FIELDS;
        run->kvm_dirty_regs = KVM_SYNC_X86_REGS | KVM_SYNC_X86_SREGS;
-       rv = _vcpu_run(vm, VCPU_ID);
+       rv = _vcpu_run(vm, vcpu->id);
        TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,
                    "Unexpected exit reason: %u (%s),\n",
                    run->exit_reason,
@@ -176,13 +174,13 @@ int main(int argc, char *argv[])
                    "apic_base sync regs value incorrect 0x%llx.",
                    run->s.regs.sregs.apic_base);
 
-       vcpu_regs_get(vm, VCPU_ID, &regs);
+       vcpu_regs_get(vm, vcpu->id, &regs);
        compare_regs(&regs, &run->s.regs.regs);
 
-       vcpu_sregs_get(vm, VCPU_ID, &sregs);
+       vcpu_sregs_get(vm, vcpu->id, &sregs);
        compare_sregs(&sregs, &run->s.regs.sregs);
 
-       vcpu_events_get(vm, VCPU_ID, &events);
+       vcpu_events_get(vm, vcpu->id, &events);
        compare_vcpu_events(&events, &run->s.regs.events);
 
        /* Clear kvm_dirty_regs bits, verify new s.regs values are
@@ -191,7 +189,7 @@ int main(int argc, char *argv[])
        run->kvm_valid_regs = TEST_SYNC_FIELDS;
        run->kvm_dirty_regs = 0;
        run->s.regs.regs.rbx = 0xDEADBEEF;
-       rv = _vcpu_run(vm, VCPU_ID);
+       rv = _vcpu_run(vm, vcpu->id);
        TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,
                    "Unexpected exit reason: %u (%s),\n",
                    run->exit_reason,
@@ -208,8 +206,8 @@ int main(int argc, char *argv[])
        run->kvm_dirty_regs = 0;
        run->s.regs.regs.rbx = 0xAAAA;
        regs.rbx = 0xBAC0;
-       vcpu_regs_set(vm, VCPU_ID, &regs);
-       rv = _vcpu_run(vm, VCPU_ID);
+       vcpu_regs_set(vm, vcpu->id, &regs);
+       rv = _vcpu_run(vm, vcpu->id);
        TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,
                    "Unexpected exit reason: %u (%s),\n",
                    run->exit_reason,
@@ -217,7 +215,7 @@ int main(int argc, char *argv[])
        TEST_ASSERT(run->s.regs.regs.rbx == 0xAAAA,
                    "rbx sync regs value incorrect 0x%llx.",
                    run->s.regs.regs.rbx);
-       vcpu_regs_get(vm, VCPU_ID, &regs);
+       vcpu_regs_get(vm, vcpu->id, &regs);
        TEST_ASSERT(regs.rbx == 0xBAC0 + 1,
                    "rbx guest value incorrect 0x%llx.",
                    regs.rbx);
@@ -229,7 +227,7 @@ int main(int argc, char *argv[])
        run->kvm_valid_regs = 0;
        run->kvm_dirty_regs = TEST_SYNC_FIELDS;
        run->s.regs.regs.rbx = 0xBBBB;
-       rv = _vcpu_run(vm, VCPU_ID);
+       rv = _vcpu_run(vm, vcpu->id);
        TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,
                    "Unexpected exit reason: %u (%s),\n",
                    run->exit_reason,
@@ -237,7 +235,7 @@ int main(int argc, char *argv[])
        TEST_ASSERT(run->s.regs.regs.rbx == 0xBBBB,
                    "rbx sync regs value incorrect 0x%llx.",
                    run->s.regs.regs.rbx);
-       vcpu_regs_get(vm, VCPU_ID, &regs);
+       vcpu_regs_get(vm, vcpu->id, &regs);
        TEST_ASSERT(regs.rbx == 0xBBBB + 1,
                    "rbx guest value incorrect 0x%llx.",
                    regs.rbx);