[PATCH v4 06/13] selftests: KVM: Fix kvm device helper ioctl assertions

[Andrew Jones]

On Thu, Jul 29, 2021 at 12:10:05AM +0000, Oliver Upton wrote:
> The KVM_CREATE_DEVICE and KVM_{GET,SET}_DEVICE_ATTR ioctls are defined
> to return a value of zero on success. As such, tighten the assertions in
> the helper functions to only pass if the return code is zero.
> 
> Suggested-by: Andrew Jones <drjones at redhat.com>
> Signed-off-by: Oliver Upton <oupton at google.com>
> ---
>  tools/testing/selftests/kvm/lib/kvm_util.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
> index 10a8ed691c66..0ffc2d39c80d 100644
> --- a/tools/testing/selftests/kvm/lib/kvm_util.c
> +++ b/tools/testing/selftests/kvm/lib/kvm_util.c
> @@ -1984,7 +1984,7 @@ int kvm_device_check_attr(int dev_fd, uint32_t group, uint64_t attr)
>  {
>  	int ret = _kvm_device_check_attr(dev_fd, group, attr);
>  
> -	TEST_ASSERT(ret >= 0, "KVM_HAS_DEVICE_ATTR failed, rc: %i errno: %i", ret, errno);
> +	TEST_ASSERT(!ret, "KVM_HAS_DEVICE_ATTR failed, rc: %i errno: %i", ret, errno);
>  	return ret;
>  }
>  
> @@ -2008,7 +2008,7 @@ int kvm_create_device(struct kvm_vm *vm, uint64_t type, bool test)
>  	ret = _kvm_create_device(vm, type, test, &fd);
>  
>  	if (!test) {
> -		TEST_ASSERT(ret >= 0,
> +		TEST_ASSERT(!ret,
>  			    "KVM_CREATE_DEVICE IOCTL failed, rc: %i errno: %i", ret, errno);
>  		return fd;
>  	}
> @@ -2036,7 +2036,7 @@ int kvm_device_access(int dev_fd, uint32_t group, uint64_t attr,
>  {
>  	int ret = _kvm_device_access(dev_fd, group, attr, val, write);
>  
> -	TEST_ASSERT(ret >= 0, "KVM_SET|GET_DEVICE_ATTR IOCTL failed, rc: %i errno: %i", ret, errno);
> +	TEST_ASSERT(!ret, "KVM_SET|GET_DEVICE_ATTR IOCTL failed, rc: %i errno: %i", ret, errno);
>  	return ret;
>  }
>  
> -- 
> 2.32.0.432.gabb21c7263-goog
>
 
Reviewed-by: Andrew Jones <drjones at redhat.com>