KVM: selftests: Add __vcpu_run() helper

[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 01c01d4..5752486 100644 (file)
--- a/tools/testing/selftests/kvm/dirty_log_test.c
+++ b/tools/testing/selftests/kvm/dirty_log_test.c
@@ -509,7 +509,7 @@ static void generate_random_array(uint64_t *guest_array, uint64_t size)
 
 static void *vcpu_worker(void *data)
 {
-       int ret, vcpu_fd;
+       int ret;
        struct kvm_vm *vm = data;
        uint64_t *guest_array;
        uint64_t pages_count = 0;
@@ -517,8 +517,6 @@ static void *vcpu_worker(void *data)
                                                 + sizeof(sigset_t));
        sigset_t *sigset = (sigset_t *) &sigmask->sigset;
 
-       vcpu_fd = vcpu_get_fd(vm, VCPU_ID);
-
        /*
         * SIG_IPI is unblocked atomically while in KVM_RUN.  It causes the
         * ioctl to return with -EINTR, but it is still pending and we need
@@ -539,7 +537,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 = ioctl(vcpu_fd, KVM_RUN, NULL);
+               ret = __vcpu_run(vm, VCPU_ID);
                if (ret == -1 && errno == EINTR) {
                        int sig = -1;
                        sigwait(sigset, &sig);