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

KVM: selftests: Add another underscore to inner ioctl() helpers 



Add a second underscore to inner ioctl() helpers to better align with
commonly accepted kernel coding style, and to allow using a single
underscore variant in the future for macro shenanigans.

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

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

+3 −3
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static void run_test(struct vcpu_config *c) 
		bool reject_reg = false;

		int ret;



		ret = _vcpu_ioctl(vm, 0, KVM_GET_ONE_REG, &reg);

		ret = __vcpu_ioctl(vm, 0, KVM_GET_ONE_REG, &reg);

		if (ret) {

			printf("%s: Failed to get ", config_name(c));

			print_reg(c, reg.id);
@@ -469,7 +469,7 @@ static void run_test(struct vcpu_config *c) 
		for_each_sublist(c, s) {

			if (s->rejects_set && find_reg(s->rejects_set, s->rejects_set_n, reg.id)) {

				reject_reg = true;

				ret = _vcpu_ioctl(vm, 0, KVM_SET_ONE_REG, &reg);

				ret = __vcpu_ioctl(vm, 0, KVM_SET_ONE_REG, &reg);

				if (ret != -1 || errno != EPERM) {

					printf("%s: Failed to reject (ret=%d, errno=%d) ", config_name(c), ret, errno);

					print_reg(c, reg.id);
@@ -481,7 +481,7 @@ static void run_test(struct vcpu_config *c) 
		}



		if (!reject_reg) {

			ret = _vcpu_ioctl(vm, 0, KVM_SET_ONE_REG, &reg);

			ret = __vcpu_ioctl(vm, 0, KVM_SET_ONE_REG, &reg);

			if (ret) {

				printf("%s: Failed to set ", config_name(c));

				print_reg(c, reg.id);

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

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static int set_fw_reg(struct kvm_vm *vm, uint64_t id, uint64_t val) 
		.addr = (uint64_t)&val,

	};



	return _vcpu_ioctl(vm, 0, KVM_SET_ONE_REG, &reg);

	return __vcpu_ioctl(vm, 0, KVM_SET_ONE_REG, &reg);

}



static void get_fw_reg(struct kvm_vm *vm, uint64_t id, uint64_t *addr)

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

+4 −4
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ static int add_init_2vcpus(struct kvm_vcpu_init *init1, 
	vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES);



	vm_vcpu_add(vm, 0);

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

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

	if (ret)

		goto free_exit;



	vm_vcpu_add(vm, 1);

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

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



free_exit:

	kvm_vm_free(vm);
@@ -54,11 +54,11 @@ static int add_2vcpus_init_2vcpus(struct kvm_vcpu_init *init1, 
	vm_vcpu_add(vm, 0);

	vm_vcpu_add(vm, 1);



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

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

	if (ret)

		goto free_exit;



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

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



free_exit:

	kvm_vm_free(vm);

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

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static void guest_code(void) 
static int run_vcpu(struct kvm_vm *vm, uint32_t vcpuid)

{

	ucall_init(vm, NULL);

	int ret = _vcpu_ioctl(vm, vcpuid, KVM_RUN, NULL);

	int ret = __vcpu_ioctl(vm, vcpuid, KVM_RUN, NULL);

	if (ret)

		return -errno;

	return 0;

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

+4 −4
Original line number Diff line number Diff line
@@ -159,12 +159,12 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, 


void vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl,

		void *arg);

int _vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl,

int __vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, unsigned long ioctl,

		 void *arg);

void vm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg);

int _vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg);

int __vm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg);

void kvm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg);

int _kvm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg);

int __kvm_ioctl(struct kvm_vm *vm, unsigned long ioctl, void *arg);

void vm_mem_region_set_flags(struct kvm_vm *vm, uint32_t slot, uint32_t flags);

void vm_mem_region_move(struct kvm_vm *vm, uint32_t slot, uint64_t new_gpa);

void vm_mem_region_delete(struct kvm_vm *vm, uint32_t slot);