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

KVM: selftests: Rename KVM_HAS_DEVICE_ATTR helpers for consistency 



Rename kvm_device_check_attr() and its variants to kvm_has_device_attr()
to be consistent with the ioctl names and with other helpers in the KVM
selftests framework.

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

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

+5 −7
Original line number Diff line number Diff line
@@ -127,14 +127,12 @@ static void subtest_dist_rdist(struct vm_gic *v) 
						: gic_v2_dist_region;



	/* Check existing group/attributes */

	kvm_device_check_attr(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,

			      dist.attr);

	kvm_has_device_attr(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, dist.attr);



	kvm_device_check_attr(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,

			      rdist.attr);

	kvm_has_device_attr(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, rdist.attr);



	/* check non existing attribute */

	ret = _kvm_device_check_attr(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, -1);

	ret = __kvm_has_device_attr(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, -1);

	TEST_ASSERT(ret && errno == ENXIO, "attribute not supported");



	/* misaligned DIST and REDIST address settings */
@@ -176,7 +174,7 @@ static void subtest_dist_rdist(struct vm_gic *v) 
				 rdist.attr, &addr, true);

	TEST_ASSERT(ret && errno == EEXIST, "GIC redist base set again");



	ret = _kvm_device_check_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);

	if (!ret) {

		/* Attempt to mix legacy and new redistributor regions */
@@ -203,7 +201,7 @@ static void subtest_v3_redist_regions(struct vm_gic *v) 
	uint64_t addr, expected_addr;

	int ret;



	ret = kvm_device_check_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

+3 −3
Original line number Diff line number Diff line
@@ -482,8 +482,8 @@ 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_device_check_attr(int dev_fd, uint32_t group, uint64_t attr);

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

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);

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);
@@ -494,7 +494,7 @@ int kvm_device_access(int dev_fd, uint32_t group, uint64_t attr, 
void kvm_irq_line(struct kvm_vm *vm, uint32_t irq, int level);

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,

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);

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

+6 −6
Original line number Diff line number Diff line
@@ -1610,7 +1610,7 @@ void _vm_ioctl(struct kvm_vm *vm, unsigned long cmd, const char *name, void *arg 
 * Device Ioctl

 */



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

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

{

	struct kvm_device_attr attribute = {

		.group = group,
@@ -1621,9 +1621,9 @@ int _kvm_device_check_attr(int dev_fd, uint32_t group, uint64_t attr) 
	return ioctl(dev_fd, KVM_HAS_DEVICE_ATTR, &attribute);

}



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

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

{

	int ret = _kvm_device_check_attr(dev_fd, group, 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;
@@ -1686,18 +1686,18 @@ int kvm_device_access(int dev_fd, uint32_t group, uint64_t attr, 
	return ret;

}



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

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

			  uint64_t attr)

{

	struct vcpu *vcpu = vcpu_get(vm, vcpuid);



	return _kvm_device_check_attr(vcpu->fd, group, attr);

	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);

	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;

tools/testing/selftests/kvm/system_counter_offset_test.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static struct test_case test_cases[] = { 


static void check_preconditions(struct kvm_vm *vm)

{

	if (!_vcpu_has_device_attr(vm, VCPU_ID, KVM_VCPU_TSC_CTRL, KVM_VCPU_TSC_OFFSET))

	if (!__vcpu_has_device_attr(vm, VCPU_ID, KVM_VCPU_TSC_CTRL, KVM_VCPU_TSC_OFFSET))

		return;



	print_skip("KVM_VCPU_TSC_OFFSET not supported; skipping test");