KVM: selftests: Purge vm+vcpu_id == vcpu silliness

[linux-2.6-microblaze.git] / tools / testing / selftests / kvm / dirty_log_test.c

diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c
index 5db5614..906e893 100644 (file)
--- a/tools/testing/selftests/kvm/dirty_log_test.c
+++ b/tools/testing/selftests/kvm/dirty_log_test.c
@@ -255,7 +255,7 @@ static void default_after_vcpu_run(struct kvm_vcpu *vcpu, int ret, int err)
        TEST_ASSERT(ret == 0 || (ret == -1 && err == EINTR),
                    "vcpu run failed: errno=%d", err);
 
-       TEST_ASSERT(get_ucall(vcpu->vm, vcpu->id, NULL) == UCALL_SYNC,
+       TEST_ASSERT(get_ucall(vcpu, NULL) == UCALL_SYNC,
                    "Invalid guest sync status: exit_reason=%s\n",
                    exit_reason_str(run->exit_reason));
 
@@ -346,7 +346,7 @@ static void dirty_ring_collect_dirty_pages(struct kvm_vcpu *vcpu, int slot,
        }
 
        /* Only have one vcpu */
-       count = dirty_ring_collect_one(vcpu_map_dirty_ring(vcpu->vm, vcpu->id),
+       count = dirty_ring_collect_one(vcpu_map_dirty_ring(vcpu),
                                       slot, bitmap, num_pages, &fetch_index);
 
        cleared = kvm_vm_reset_dirty_ring(vcpu->vm);
@@ -369,7 +369,7 @@ static void dirty_ring_after_vcpu_run(struct kvm_vcpu *vcpu, int ret, int err)
        struct kvm_run *run = vcpu->run;
 
        /* A ucall-sync or ring-full event is allowed */
-       if (get_ucall(vcpu->vm, vcpu->id, NULL) == UCALL_SYNC) {
+       if (get_ucall(vcpu, NULL) == UCALL_SYNC) {
                /* We should allow this to continue */
                ;
        } else if (run->exit_reason == KVM_EXIT_DIRTY_RING_FULL ||
@@ -521,7 +521,7 @@ static void *vcpu_worker(void *data)
        sigmask->len = 8;
        pthread_sigmask(0, NULL, sigset);
        sigdelset(sigset, SIG_IPI);
-       vcpu_ioctl(vm, vcpu->id, KVM_SET_SIGNAL_MASK, sigmask);
+       vcpu_ioctl(vcpu, KVM_SET_SIGNAL_MASK, sigmask);
 
        sigemptyset(sigset);
        sigaddset(sigset, SIG_IPI);
@@ -533,7 +533,7 @@ static void *vcpu_worker(void *data)
                generate_random_array(guest_array, TEST_PAGES_PER_LOOP);
                pages_count += TEST_PAGES_PER_LOOP;
                /* Let the guest dirty the random pages */
-               ret = __vcpu_run(vm, vcpu->id);
+               ret = __vcpu_run(vcpu);
                if (ret == -1 && errno == EINTR) {
                        int sig = -1;
                        sigwait(sigset, &sig);