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

KVM: selftests: Drop @mode from common vm_create() helper 



Drop @mode from vm_create() and have it use VM_MODE_DEFAULT.  Add and use
an inner helper, __vm_create(), to service the handful of tests that want
something other than VM_MODE_DEFAULT.

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

tools/testing/selftests/kvm/aarch64/get-reg-list.c

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ static void run_test(struct vcpu_config *c) 


	check_supported(c);



	vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);

	vm = vm_create(DEFAULT_GUEST_PHY_PAGES);

	prepare_vcpu_init(c, &init);

	aarch64_vcpu_add_default(vm, 0, &init, NULL);

	finalize_vcpu(vm, 0, c);

tools/testing/selftests/kvm/aarch64/psci_test.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static struct kvm_vm *setup_vm(void *guest_code) 
	struct kvm_vcpu_init init;

	struct kvm_vm *vm;



	vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);

	vm = vm_create(DEFAULT_GUEST_PHY_PAGES);

	kvm_vm_elf_load(vm, program_invocation_name);

	ucall_init(vm, NULL);

tools/testing/selftests/kvm/aarch64/vcpu_width_config.c

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static int add_init_2vcpus(struct kvm_vcpu_init *init1, 
	struct kvm_vm *vm;

	int ret;



	vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);

	vm = vm_create(DEFAULT_GUEST_PHY_PAGES);



	vm_vcpu_add(vm, 0);

	ret = __vcpu_ioctl(vm, 0, KVM_ARM_VCPU_INIT, init1);
@@ -49,7 +49,7 @@ static int add_2vcpus_init_2vcpus(struct kvm_vcpu_init *init1, 
	struct kvm_vm *vm;

	int ret;



	vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);

	vm = vm_create(DEFAULT_GUEST_PHY_PAGES);



	vm_vcpu_add(vm, 0);

	vm_vcpu_add(vm, 1);
@@ -86,7 +86,7 @@ int main(void) 
	}



	/* Get the preferred target type and copy that to init2 for later use */

	vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);

	vm = vm_create(DEFAULT_GUEST_PHY_PAGES);

	vm_ioctl(vm, KVM_ARM_PREFERRED_TARGET, &init1);

	kvm_vm_free(vm);

	init2 = init1;

tools/testing/selftests/kvm/dirty_log_test.c

+1 −1
Original line number Diff line number Diff line
@@ -679,7 +679,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);

	vm = __vm_create(mode, DEFAULT_GUEST_PHY_PAGES + extra_pg_pages);

	kvm_vm_elf_load(vm, program_invocation_name);

#ifdef __x86_64__

	vm_create_irqchip(vm);

tools/testing/selftests/kvm/hardware_disable_test.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static void run_test(uint32_t run) 
	for (i = 0; i < VCPU_NUM; i++)

		CPU_SET(i, &cpu_set);



	vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);

	vm = vm_create(DEFAULT_GUEST_PHY_PAGES);

	kvm_vm_elf_load(vm, program_invocation_name);

	vm_create_irqchip(vm);