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

KVM: selftests: Drop vm_create_default* helpers 



Drop all vm_create_default*() helpers, the "default" naming turned out to
terrible as wasn't extensible (hard to have multiple defaults), was a lie
(half the settings were default, half weren't), and failed to capture
relationships between helpers, e.g. compared with the kernel's standard
underscores pattern.

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

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

+0 −23
Original line number Diff line number Diff line
@@ -559,29 +559,6 @@ static inline struct kvm_vm *vm_create(uint64_t nr_pages) 
	return __vm_create(VM_MODE_DEFAULT, nr_pages);

}



/*

 * Create a VM with reasonable defaults

 *

 * Input Args:

 *   vcpuid - The id of the single VCPU to add to the VM.

 *   extra_mem_pages - The number of extra pages to add (this will

 *                     decide how much extra space we will need to

 *                     setup the page tables using memslot 0)

 *   guest_code - The vCPU's entry point

 *

 * Output Args: None

 *

 * Return:

 *   Pointer to opaque structure that describes the created VM.

 */

struct kvm_vm *vm_create_default(uint32_t vcpuid, uint64_t extra_mem_pages,

				 void *guest_code);



/* Same as vm_create_default, but can be used for more than one vcpu */

struct kvm_vm *vm_create_default_with_vcpus(uint32_t nr_vcpus, uint64_t extra_mem_pages,

					    uint32_t num_percpu_pages, void *guest_code,

					    uint32_t vcpuids[]);



/* Like vm_create_default_with_vcpus, but accepts mode and slot0 memory as a parameter */

struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus,

				      uint64_t slot0_mem_pages, uint64_t extra_mem_pages,

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

+6 −17
Original line number Diff line number Diff line
@@ -337,28 +337,17 @@ struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus 
	return vm;

}



struct kvm_vm *vm_create_default_with_vcpus(uint32_t nr_vcpus, uint64_t extra_mem_pages,

					    uint32_t num_percpu_pages, void *guest_code,

					    uint32_t vcpuids[])

{

	return __vm_create_with_vcpus(VM_MODE_DEFAULT, nr_vcpus, DEFAULT_GUEST_PHY_PAGES,

				      extra_mem_pages, num_percpu_pages, guest_code, vcpuids, NULL);

}



struct kvm_vm *vm_create_default(uint32_t vcpuid, uint64_t extra_mem_pages,

				 void *guest_code)

{

	return vm_create_default_with_vcpus(1, extra_mem_pages, 0, guest_code,

					    (uint32_t []){ vcpuid });

}



struct kvm_vm *__vm_create_with_one_vcpu(struct kvm_vcpu **vcpu,

					 uint64_t extra_mem_pages,

					 void *guest_code)

{

	struct kvm_vm *vm = vm_create_default(0, extra_mem_pages, guest_code);

	struct kvm_vcpu *vcpus[1];

	struct kvm_vm *vm;



	vm = __vm_create_with_vcpus(VM_MODE_DEFAULT, 1, DEFAULT_GUEST_PHY_PAGES,

				    extra_mem_pages, 0, guest_code, NULL, vcpus);



	*vcpu = vcpu_get(vm, 0);

	*vcpu = vcpus[0];

	return vm;

}