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

KVM: selftests: Split vcpu_set_nested_state() into two helpers 



Split vcpu_nested_state_set() into a wrapper that asserts, and an inner
helper that does not.  Passing a bool is all kinds of awful as it's
unintuitive for readers and requires returning an 'int' from a function
that for most users can never return anything other than "success".

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

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

+4 −2
Original line number Diff line number Diff line
@@ -261,8 +261,10 @@ void vcpu_events_set(struct kvm_vm *vm, uint32_t vcpuid, 
#ifdef __x86_64__

void vcpu_nested_state_get(struct kvm_vm *vm, uint32_t vcpuid,

			   struct kvm_nested_state *state);

int vcpu_nested_state_set(struct kvm_vm *vm, uint32_t vcpuid,

			  struct kvm_nested_state *state, bool ignore_error);

int __vcpu_nested_state_set(struct kvm_vm *vm, uint32_t vcpuid,

			    struct kvm_nested_state *state);

void vcpu_nested_state_set(struct kvm_vm *vm, uint32_t vcpuid,

			   struct kvm_nested_state *state);

#endif

void *vcpu_map_dirty_ring(struct kvm_vm *vm, uint32_t vcpuid);

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

+10 −10
Original line number Diff line number Diff line
@@ -1826,22 +1826,22 @@ void vcpu_nested_state_get(struct kvm_vm *vm, uint32_t vcpuid, 
		ret, errno);

}



int vcpu_nested_state_set(struct kvm_vm *vm, uint32_t vcpuid,

			  struct kvm_nested_state *state, bool ignore_error)

int __vcpu_nested_state_set(struct kvm_vm *vm, uint32_t vcpuid,

			    struct kvm_nested_state *state)

{

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

	int ret;



	TEST_ASSERT(vcpu != NULL, "vcpu not found, vcpuid: %u", vcpuid);



	ret = ioctl(vcpu->fd, KVM_SET_NESTED_STATE, state);

	if (!ignore_error) {

		TEST_ASSERT(ret == 0,

			"KVM_SET_NESTED_STATE failed, ret: %i errno: %i",

			ret, errno);

	return ioctl(vcpu->fd, KVM_SET_NESTED_STATE, state);

}



	return ret;

void vcpu_nested_state_set(struct kvm_vm *vm, uint32_t vcpuid,

			   struct kvm_nested_state *state)

{

	int ret = __vcpu_nested_state_set(vm, vcpuid, state);



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

}

#endif

tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ bool have_evmcs; 


void test_nested_state(struct kvm_vm *vm, struct kvm_nested_state *state)

{

	vcpu_nested_state_set(vm, VCPU_ID, state, false);

	vcpu_nested_state_set(vm, VCPU_ID, state);

}



void test_nested_state_expect_errno(struct kvm_vm *vm,
@@ -38,7 +38,7 @@ void test_nested_state_expect_errno(struct kvm_vm *vm, 
{

	int rv;



	rv = vcpu_nested_state_set(vm, VCPU_ID, state, true);

	rv = __vcpu_nested_state_set(vm, VCPU_ID, state);

	TEST_ASSERT(rv == -1 && errno == expected_errno,

		"Expected %s (%d) from vcpu_nested_state_set but got rv: %i errno: %s (%d)",

		strerror(expected_errno), expected_errno, rv, strerror(errno),