Commit ec7b769a authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: selftests: Convert vmx_dirty_log_test away from VCPU_ID 



Convert vmx_dirty_log_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==1.  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: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d31e1500

tools/testing/selftests/kvm/x86_64/vmx_dirty_log_test.c

+6 −7
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
#include "processor.h"

#include "vmx.h"



#define VCPU_ID				1



/* The memory slot index to track dirty pages */

#define TEST_MEM_SLOT_INDEX		1

#define TEST_MEM_PAGES			3
@@ -73,6 +71,7 @@ int main(int argc, char *argv[]) 
	unsigned long *bmap;

	uint64_t *host_test_mem;



	struct kvm_vcpu *vcpu;

	struct kvm_vm *vm;

	struct kvm_run *run;

	struct ucall uc;
@@ -81,10 +80,10 @@ int main(int argc, char *argv[]) 
	nested_vmx_check_supported();



	/* Create VM */

	vm = vm_create_default(VCPU_ID, 0, l1_guest_code);

	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);

	run = vcpu_state(vm, VCPU_ID);

	vcpu_args_set(vm, vcpu->id, 1, vmx_pages_gva);

	run = vcpu->run;



	/* Add an extra memory slot for testing dirty logging */

	vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS,
@@ -116,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(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));



		switch (get_ucall(vm, VCPU_ID, &uc)) {

		switch (get_ucall(vm, vcpu->id, &uc)) {

		case UCALL_ABORT:

			TEST_FAIL("%s at %s:%ld", (const char *)uc.args[0],

			       	  __FILE__, uc.args[1]);