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

KVM: selftests: Remove vcpu_state() helper 



Drop vcpu_state() now that all tests reference vcpu->run directly.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent fce54299

tools/testing/selftests/kvm/include/kvm_util_base.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -298,7 +298,6 @@ void *addr_gva2hva(struct kvm_vm *vm, vm_vaddr_t gva); 
vm_paddr_t addr_hva2gpa(struct kvm_vm *vm, void *hva);

vm_paddr_t addr_hva2gpa(struct kvm_vm *vm, void *hva);

void *addr_gpa2alias(struct kvm_vm *vm, vm_paddr_t gpa);

void *addr_gpa2alias(struct kvm_vm *vm, vm_paddr_t gpa);





struct kvm_run *vcpu_state(struct kvm_vcpu *vcpu);

void vcpu_run(struct kvm_vcpu *vcpu);

void vcpu_run(struct kvm_vcpu *vcpu);

int _vcpu_run(struct kvm_vcpu *vcpu);

int _vcpu_run(struct kvm_vcpu *vcpu);

tools/testing/selftests/kvm/lib/kvm_util.c

+1 −18
Original line number Original line Diff line number Diff line
@@ -1001,19 +1001,7 @@ void vm_mem_region_delete(struct kvm_vm *vm, uint32_t slot) 
	__vm_mem_region_delete(vm, memslot2region(vm, slot), true);

	__vm_mem_region_delete(vm, memslot2region(vm, slot), true);

}

}





/*

/* Returns the size of a vCPU's kvm_run structure. */

 * VCPU mmap Size

 *

 * Input Args: None

 *

 * Output Args: None

 *

 * Return:

 *   Size of VCPU state

 *

 * Returns the size of the structure pointed to by the return value

 * of vcpu_state().

 */

static int vcpu_mmap_sz(void)

static int vcpu_mmap_sz(void)

{

{

	int dev_fd, ret;

	int dev_fd, ret;
@@ -1394,11 +1382,6 @@ void vm_create_irqchip(struct kvm_vm *vm) 




	vm->has_irqchip = true;

	vm->has_irqchip = true;

}

}

struct kvm_run *vcpu_state(struct kvm_vcpu *vcpu)

{

	return vcpu->run;

}







int _vcpu_run(struct kvm_vcpu *vcpu)

int _vcpu_run(struct kvm_vcpu *vcpu)

{

{