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

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

diff --git a/tools/testing/selftests/kvm/x86_64/vmx_dirty_log_test.c b/tools/testing/selftests/kvm/x86_64/vmx_dirty_log_test.c
index fb8c7f7..215ffa0 100644 (file)
--- a/tools/testing/selftests/kvm/x86_64/vmx_dirty_log_test.c
+++ b/tools/testing/selftests/kvm/x86_64/vmx_dirty_log_test.c
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
        /* Create VM */
        vm = vm_create_with_one_vcpu(&vcpu, l1_guest_code);
        vmx = vcpu_alloc_vmx(vm, &vmx_pages_gva);
-       vcpu_args_set(vm, vcpu->id, 1, vmx_pages_gva);
+       vcpu_args_set(vcpu, 1, vmx_pages_gva);
        run = vcpu->run;
 
        /* Add an extra memory slot for testing dirty logging */
@@ -115,13 +115,13 @@ int main(int argc, char *argv[])
 
        while (!done) {
                memset(host_test_mem, 0xaa, TEST_MEM_PAGES * 4096);
-               vcpu_run(vm, vcpu->id);
+               vcpu_run(vcpu);
                TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,
                            "Unexpected exit reason: %u (%s),\n",
                            run->exit_reason,
                            exit_reason_str(run->exit_reason));
 
-               switch (get_ucall(vm, vcpu->id, &uc)) {
+               switch (get_ucall(vcpu, &uc)) {
                case UCALL_ABORT:
                        TEST_FAIL("%s at %s:%ld", (const char *)uc.args[0],
                                  __FILE__, uc.args[1]);