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

KVM: selftests: Rename vm_vcpu_add* helpers to better show relationships 



Rename vm_vcpu_add() to __vm_vcpu_add(), and vm_vcpu_add_default() to
vm_vcpu_add() to show the relationship between the newly minted
vm_vcpu_add() and __vm_vcpu_add().

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

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

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


	vm = vm_create_barebones();

	prepare_vcpu_init(c, &init);

	vm_vcpu_add(vm, 0);

	__vm_vcpu_add(vm, 0);

	aarch64_vcpu_setup(vm, 0, &init);

	finalize_vcpu(vm, 0, c);

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

+2 −2
Original line number Diff line number Diff line
@@ -84,8 +84,8 @@ static struct kvm_vm *setup_vm(void *guest_code) 
	vm_ioctl(vm, KVM_ARM_PREFERRED_TARGET, &init);

	init.features[0] |= (1 << KVM_ARM_VCPU_PSCI_0_2);



	aarch64_vcpu_add_default(vm, VCPU_ID_SOURCE, &init, guest_code);

	aarch64_vcpu_add_default(vm, VCPU_ID_TARGET, &init, guest_code);

	aarch64_vcpu_add(vm, VCPU_ID_SOURCE, &init, guest_code);

	aarch64_vcpu_add(vm, VCPU_ID_TARGET, &init, guest_code);



	return vm;

}

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

+4 −4
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ static int add_init_2vcpus(struct kvm_vcpu_init *init1, 


	vm = vm_create_barebones();



	vm_vcpu_add(vm, 0);

	__vm_vcpu_add(vm, 0);

	ret = __vcpu_ioctl(vm, 0, KVM_ARM_VCPU_INIT, init1);

	if (ret)

		goto free_exit;



	vm_vcpu_add(vm, 1);

	__vm_vcpu_add(vm, 1);

	ret = __vcpu_ioctl(vm, 1, KVM_ARM_VCPU_INIT, init2);



free_exit:
@@ -51,8 +51,8 @@ static int add_2vcpus_init_2vcpus(struct kvm_vcpu_init *init1, 


	vm = vm_create_barebones();



	vm_vcpu_add(vm, 0);

	vm_vcpu_add(vm, 1);

	__vm_vcpu_add(vm, 0);

	__vm_vcpu_add(vm, 1);



	ret = __vcpu_ioctl(vm, 0, KVM_ARM_VCPU_INIT, init1);

	if (ret)

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

+5 −5
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static void test_vgic_then_vcpus(uint32_t gic_dev_type) 


	/* Add the rest of the VCPUs */

	for (i = 1; i < NR_VCPUS; ++i)

		vm_vcpu_add_default(v.vm, i, guest_code);

		vm_vcpu_add(v.vm, i, guest_code);



	ret = run_vcpu(v.vm, 3);

	TEST_ASSERT(ret == -EINVAL, "dist/rdist overlap detected on 1st vcpu run");
@@ -418,17 +418,17 @@ static void test_v3_typer_accesses(void) 


	v.gic_fd = kvm_create_device(v.vm, KVM_DEV_TYPE_ARM_VGIC_V3);



	vm_vcpu_add_default(v.vm, 3, guest_code);

	vm_vcpu_add(v.vm, 3, guest_code);



	v3_redist_reg_get_errno(v.gic_fd, 1, GICR_TYPER, EINVAL,

				"attempting to read GICR_TYPER of non created vcpu");



	vm_vcpu_add_default(v.vm, 1, guest_code);

	vm_vcpu_add(v.vm, 1, guest_code);



	v3_redist_reg_get_errno(v.gic_fd, 1, GICR_TYPER, EBUSY,

				"read GICR_TYPER before GIC initialized");



	vm_vcpu_add_default(v.vm, 2, guest_code);

	vm_vcpu_add(v.vm, 2, guest_code);



	kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,

			    KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);
@@ -559,7 +559,7 @@ static void test_v3_redist_ipa_range_check_at_vcpu_run(void) 


	/* Add the rest of the VCPUs */

	for (i = 1; i < NR_VCPUS; ++i)

		vm_vcpu_add_default(v.vm, i, guest_code);

		vm_vcpu_add(v.vm, i, guest_code);



	kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,

			    KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);

tools/testing/selftests/kvm/dirty_log_test.c

+1 −1
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ static struct kvm_vm *create_vm(enum vm_guest_mode mode, uint32_t vcpuid, 
	vm = __vm_create(mode, DEFAULT_GUEST_PHY_PAGES + extra_pg_pages);



	log_mode_create_vm_done(vm);

	vm_vcpu_add_default(vm, vcpuid, guest_code);

	vm_vcpu_add(vm, vcpuid, guest_code);

	return vm;

}