Commit 7e50c424 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

KVM: selftests: implement an unchecked version of vcpu_ioctl() 



In case we want to test failing ioctls we need an option to not
fail. Following _vcpu_run() precedent implement _vcpu_ioctl().

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2bc39970

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

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ 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,

		void *arg);

void vm_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_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid, int pgd_memslot,

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

+12 −2
Original line number Diff line number Diff line
@@ -1282,6 +1282,16 @@ int _vcpu_sregs_set(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_sregs *sregs) 
 */

void vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid,

		unsigned long cmd, void *arg)

{

	int ret;



	ret = _vcpu_ioctl(vm, vcpuid, cmd, arg);

	TEST_ASSERT(ret == 0, "vcpu ioctl %lu failed, rc: %i errno: %i (%s)",

		cmd, ret, errno, strerror(errno));

}



int _vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid,

		unsigned long cmd, void *arg)

{

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

	int ret;
@@ -1289,8 +1299,8 @@ void vcpu_ioctl(struct kvm_vm *vm, uint32_t vcpuid, 
	TEST_ASSERT(vcpu != NULL, "vcpu not found, vcpuid: %u", vcpuid);



	ret = ioctl(vcpu->fd, cmd, arg);

	TEST_ASSERT(ret == 0, "vcpu ioctl %lu failed, rc: %i errno: %i (%s)",

		cmd, ret, errno, strerror(errno));



	return ret;

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE