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

KVM: selftests: Drop 'int' return from asserting *_has_device_attr() 



Drop 'int' returns from *_device_has_attr() helpers that assert the
return is '0', there's no point in returning '0' and "requiring" the
caller to perform a redundant assertion.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static void subtest_v3_redist_regions(struct vm_gic *v) 
	uint64_t addr, expected_addr;

	int ret;



	ret = kvm_has_device_attr(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,

	ret = __kvm_has_device_attr(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,

				    KVM_VGIC_V3_ADDR_TYPE_REDIST);

	TEST_ASSERT(!ret, "Multiple redist regions advertised");

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

+17 −3
Original line number Diff line number Diff line
@@ -483,7 +483,14 @@ void *vcpu_map_dirty_ring(struct kvm_vm *vm, uint32_t vcpuid); 
void vcpu_args_set(struct kvm_vm *vm, uint32_t vcpuid, unsigned int num, ...);



int __kvm_has_device_attr(int dev_fd, uint32_t group, uint64_t attr);

int kvm_has_device_attr(int dev_fd, uint32_t group, uint64_t attr);



static inline void kvm_has_device_attr(int dev_fd, uint32_t group, uint64_t attr)

{

	int ret = __kvm_has_device_attr(dev_fd, group, attr);



	TEST_ASSERT(!ret, "KVM_HAS_DEVICE_ATTR failed, rc: %i errno: %i", ret, errno);

}



int __kvm_test_create_device(struct kvm_vm *vm, uint64_t type);

int __kvm_create_device(struct kvm_vm *vm, uint64_t type);

int kvm_create_device(struct kvm_vm *vm, uint64_t type);
@@ -496,8 +503,15 @@ int _kvm_irq_line(struct kvm_vm *vm, uint32_t irq, int level); 


int __vcpu_has_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,

			  uint64_t attr);

int vcpu_has_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,

			 uint64_t attr);



static inline void vcpu_has_device_attr(struct kvm_vm *vm, uint32_t vcpuid,

					uint32_t group, uint64_t attr)

{

	int ret = __vcpu_has_device_attr(vm, vcpuid, group, attr);



	TEST_ASSERT(!ret, KVM_IOCTL_ERROR(KVM_HAS_DEVICE_ATTR, ret));

}



int _vcpu_access_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,

			  uint64_t attr, void *val, bool write);

int vcpu_access_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,

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

+0 −17
Original line number Diff line number Diff line
@@ -1621,14 +1621,6 @@ int __kvm_has_device_attr(int dev_fd, uint32_t group, uint64_t attr) 
	return ioctl(dev_fd, KVM_HAS_DEVICE_ATTR, &attribute);

}



int kvm_has_device_attr(int dev_fd, uint32_t group, uint64_t attr)

{

	int ret = __kvm_has_device_attr(dev_fd, group, attr);



	TEST_ASSERT(!ret, "KVM_HAS_DEVICE_ATTR failed, rc: %i errno: %i", ret, errno);

	return ret;

}



int __kvm_test_create_device(struct kvm_vm *vm, uint64_t type)

{

	struct kvm_create_device create_dev = {
@@ -1694,15 +1686,6 @@ int __vcpu_has_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group, 
	return __kvm_has_device_attr(vcpu->fd, group, attr);

}



int vcpu_has_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,

				 uint64_t attr)

{

	int ret = __vcpu_has_device_attr(vm, vcpuid, group, attr);



	TEST_ASSERT(!ret, "KVM_HAS_DEVICE_ATTR IOCTL failed, rc: %i errno: %i", ret, errno);

	return ret;

}



int _vcpu_access_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,

			     uint64_t attr, void *val, bool write)

{