KVM: selftests: Convert xapic_ipi_test away from *_VCPU_ID

Convert vm_create_with_one_vcpu to use vm_create_with_vcpus() and pass
around 'struct kvm_vcpu' objects instead of passing around vCPU IDs.
Don't bother with macros for the HALTER versus SENDER indices, the vast
majority of references don't differentiate between the vCPU roles, and
the code that does either has a comment or an explicit reference to the
role, e.g. to halter_guest_code() or sender_guest_code().

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/xapic_ipi_test.c b/tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c
index 8b366652be3117fbd7459bb6298bf0a17549ac75..4484ee563b18563d9596cca62c5e894c5d924058 100644 (file)
--- a/tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c
+++ b/tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c
@@ -39,9 +39,6 @@
 /* Default delay between migrate_pages calls (microseconds) */
 #define DEFAULT_DELAY_USECS 500000
 
-#define HALTER_VCPU_ID 0
-#define SENDER_VCPU_ID 1
-
 /*
  * Vector for IPI from sender vCPU to halting vCPU.
  * Value is arbitrary and was chosen for the alternating bit pattern. Any
@@ -79,8 +76,7 @@ struct test_data_page {
 
 struct thread_params {
        struct test_data_page *data;
-       struct kvm_vm *vm;
-       uint32_t vcpu_id;
+       struct kvm_vcpu *vcpu;
        uint64_t *pipis_rcvd; /* host address of ipis_rcvd global */
 };
 
@@ -198,6 +194,7 @@ static void sender_guest_code(struct test_data_page *data)
 static void *vcpu_thread(void *arg)
 {
        struct thread_params *params = (struct thread_params *)arg;
+       struct kvm_vcpu *vcpu = params->vcpu;
        struct ucall uc;
        int old;
        int r;
@@ -206,17 +203,17 @@ static void *vcpu_thread(void *arg)
        r = pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &old);
        TEST_ASSERT(r == 0,
                    "pthread_setcanceltype failed on vcpu_id=%u with errno=%d",
-                   params->vcpu_id, r);
+                   vcpu->id, r);
 
-       fprintf(stderr, "vCPU thread running vCPU %u\n", params->vcpu_id);
-       vcpu_run(params->vm, params->vcpu_id);
-       exit_reason = vcpu_state(params->vm, params->vcpu_id)->exit_reason;
+       fprintf(stderr, "vCPU thread running vCPU %u\n", vcpu->id);
+       vcpu_run(vcpu->vm, vcpu->id);
+       exit_reason = vcpu->run->exit_reason;
 
        TEST_ASSERT(exit_reason == KVM_EXIT_IO,
                    "vCPU %u exited with unexpected exit reason %u-%s, expected KVM_EXIT_IO",
-                   params->vcpu_id, exit_reason, exit_reason_str(exit_reason));
+                   vcpu->id, exit_reason, exit_reason_str(exit_reason));
 
-       if (get_ucall(params->vm, params->vcpu_id, &uc) == UCALL_ABORT) {
+       if (get_ucall(vcpu->vm, vcpu->id, &uc) == UCALL_ABORT) {
                TEST_ASSERT(false,
                            "vCPU %u exited with error: %s.\n"
                            "Sending vCPU sent %lu IPIs to halting vCPU\n"
@@ -224,7 +221,7 @@ static void *vcpu_thread(void *arg)
                            "Halter TPR=%#x PPR=%#x LVR=%#x\n"
                            "Migrations attempted: %lu\n"
                            "Migrations completed: %lu\n",
-                           params->vcpu_id, (const char *)uc.args[0],
+                           vcpu->id, (const char *)uc.args[0],
                            params->data->ipis_sent, params->data->hlt_count,
                            params->data->wake_count,
                            *params->pipis_rcvd, params->data->halter_tpr,
@@ -236,7 +233,7 @@ static void *vcpu_thread(void *arg)
        return NULL;
 }
 
-static void cancel_join_vcpu_thread(pthread_t thread, uint32_t vcpu_id)
+static void cancel_join_vcpu_thread(pthread_t thread, struct kvm_vcpu *vcpu)
 {
        void *retval;
        int r;
@@ -244,12 +241,12 @@ static void cancel_join_vcpu_thread(pthread_t thread, uint32_t vcpu_id)
        r = pthread_cancel(thread);
        TEST_ASSERT(r == 0,
                    "pthread_cancel on vcpu_id=%d failed with errno=%d",
-                   vcpu_id, r);
+                   vcpu->id, r);
 
        r = pthread_join(thread, &retval);
        TEST_ASSERT(r == 0,
                    "pthread_join on vcpu_id=%d failed with errno=%d",
-                   vcpu_id, r);
+                   vcpu->id, r);
        TEST_ASSERT(retval == PTHREAD_CANCELED,
                    "expected retval=%p, got %p", PTHREAD_CANCELED,
                    retval);
@@ -415,34 +412,30 @@ int main(int argc, char *argv[])
        if (delay_usecs <= 0)
                delay_usecs = DEFAULT_DELAY_USECS;
 
-       vm = vm_create_default(HALTER_VCPU_ID, 0, halter_guest_code);
-       params[0].vm = vm;
-       params[1].vm = vm;
+       vm = vm_create_with_one_vcpu(&params[0].vcpu, halter_guest_code);
 
        vm_init_descriptor_tables(vm);
-       vcpu_init_descriptor_tables(vm, HALTER_VCPU_ID);
+       vcpu_init_descriptor_tables(vm, params[0].vcpu->id);
        vm_install_exception_handler(vm, IPI_VECTOR, guest_ipi_handler);
 
        virt_pg_map(vm, APIC_DEFAULT_GPA, APIC_DEFAULT_GPA);
 
-       vm_vcpu_add(vm, SENDER_VCPU_ID, sender_guest_code);
+       params[1].vcpu = vm_vcpu_add(vm, 1, sender_guest_code);
 
        test_data_page_vaddr = vm_vaddr_alloc_page(vm);
-       data =
-          (struct test_data_page *)addr_gva2hva(vm, test_data_page_vaddr);
+       data = addr_gva2hva(vm, test_data_page_vaddr);
        memset(data, 0, sizeof(*data));
        params[0].data = data;
        params[1].data = data;
 
-       vcpu_args_set(vm, HALTER_VCPU_ID, 1, test_data_page_vaddr);
-       vcpu_args_set(vm, SENDER_VCPU_ID, 1, test_data_page_vaddr);
+       vcpu_args_set(vm, params[0].vcpu->id, 1, test_data_page_vaddr);
+       vcpu_args_set(vm, params[1].vcpu->id, 1, test_data_page_vaddr);
 
        pipis_rcvd = (uint64_t *)addr_gva2hva(vm, (uint64_t)&ipis_rcvd);
        params[0].pipis_rcvd = pipis_rcvd;
        params[1].pipis_rcvd = pipis_rcvd;
 
        /* Start halter vCPU thread and wait for it to execute first HLT. */
-       params[0].vcpu_id = HALTER_VCPU_ID;
        r = pthread_create(&threads[0], NULL, vcpu_thread, &params[0]);
        TEST_ASSERT(r == 0,
                    "pthread_create halter failed errno=%d", errno);
@@ -462,7 +455,6 @@ int main(int argc, char *argv[])
                "Halter vCPU thread reported its APIC ID: %u after %d seconds.\n",
                data->halter_apic_id, wait_secs);
 
-       params[1].vcpu_id = SENDER_VCPU_ID;
        r = pthread_create(&threads[1], NULL, vcpu_thread, &params[1]);
        TEST_ASSERT(r == 0, "pthread_create sender failed errno=%d", errno);
 
@@ -478,8 +470,8 @@ int main(int argc, char *argv[])
        /*
         * Cancel threads and wait for them to stop.
         */
-       cancel_join_vcpu_thread(threads[0], HALTER_VCPU_ID);
-       cancel_join_vcpu_thread(threads[1], SENDER_VCPU_ID);
+       cancel_join_vcpu_thread(threads[0], params[0].vcpu);
+       cancel_join_vcpu_thread(threads[1], params[1].vcpu);
 
        fprintf(stderr,
                "Test successful after running for %d seconds.\n"