Commit f663132d authored by Andrew Jones's avatar Andrew Jones Committed by Paolo Bonzini
Browse files

KVM: selftests: Drop pointless vm_create wrapper 



Signed-off-by: default avatarAndrew Jones <drjones@redhat.com>
Message-Id: <20201104212357.171559-3-drjones@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 92ab4b9a

tools/testing/selftests/kvm/dirty_log_test.c

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ static struct kvm_vm *create_vm(enum vm_guest_mode mode, uint32_t vcpuid, 


	pr_info("Testing guest mode: %s\n", vm_guest_mode_string(mode));



	vm = _vm_create(mode, DEFAULT_GUEST_PHY_PAGES + extra_pg_pages, O_RDWR);

	vm = vm_create(mode, DEFAULT_GUEST_PHY_PAGES + extra_pg_pages, O_RDWR);

	kvm_vm_elf_load(vm, program_invocation_name, 0, 0);

#ifdef __x86_64__

	vm_create_irqchip(vm);

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

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ int vcpu_enable_cap(struct kvm_vm *vm, uint32_t vcpu_id, 
void vm_enable_dirty_ring(struct kvm_vm *vm, uint32_t ring_size);



struct kvm_vm *vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm);

struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm);

void kvm_vm_free(struct kvm_vm *vmp);

void kvm_vm_restart(struct kvm_vm *vmp, int perm);

void kvm_vm_release(struct kvm_vm *vmp);

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

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static struct kvm_vm *create_vm(enum vm_guest_mode mode, int vcpus, 


	pr_info("Testing guest mode: %s\n", vm_guest_mode_string(mode));



	vm = _vm_create(mode, pages, O_RDWR);

	vm = vm_create(mode, pages, O_RDWR);

	kvm_vm_elf_load(vm, program_invocation_name, 0, 0);

#ifdef __x86_64__

	vm_create_irqchip(vm);

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

+1 −6
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ _Static_assert(sizeof(vm_guest_mode_params)/sizeof(struct vm_guest_mode_params) 
 * descriptor to control the created VM is created with the permissions

 * given by perm (e.g. O_RDWR).

 */

struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm)

struct kvm_vm *vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm)

{

	struct kvm_vm *vm;
@@ -271,11 +271,6 @@ struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm) 
	return vm;

}



struct kvm_vm *vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm)

{

	return _vm_create(mode, phy_pages, perm);

}



/*

 * VM Restart

 *