diff mbox series

KVM: selftests: Fix kvm_check_cap() assertion

Message ID 20210615150443.1183365-1-tabba@google.com
State Accepted
Commit d8ac05ea13d789d5491a5920d70a05659015441d
Headers show
Series KVM: selftests: Fix kvm_check_cap() assertion | expand

Commit Message

Fuad Tabba June 15, 2021, 3:04 p.m. UTC
KVM_CHECK_EXTENSION ioctl can return any negative value on error,
and not necessarily -1. Change the assertion to reflect that.

Signed-off-by: Fuad Tabba <tabba@google.com>
---
 tools/testing/selftests/kvm/lib/kvm_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Paolo Bonzini June 17, 2021, 5:07 p.m. UTC | #1
On 15/06/21 17:04, Fuad Tabba wrote:
> KVM_CHECK_EXTENSION ioctl can return any negative value on error,

> and not necessarily -1. Change the assertion to reflect that.

> 

> Signed-off-by: Fuad Tabba <tabba@google.com>

> ---

>   tools/testing/selftests/kvm/lib/kvm_util.c | 2 +-

>   1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c

> index 5c70596dd1b9..a2b732cf96ea 100644

> --- a/tools/testing/selftests/kvm/lib/kvm_util.c

> +++ b/tools/testing/selftests/kvm/lib/kvm_util.c

> @@ -82,7 +82,7 @@ int kvm_check_cap(long cap)

>   

>   	kvm_fd = open_kvm_dev_path_or_exit();

>   	ret = ioctl(kvm_fd, KVM_CHECK_EXTENSION, cap);

> -	TEST_ASSERT(ret != -1, "KVM_CHECK_EXTENSION IOCTL failed,\n"

> +	TEST_ASSERT(ret >= 0, "KVM_CHECK_EXTENSION IOCTL failed,\n"

>   		"  rc: %i errno: %i", ret, errno);

>   

>   	close(kvm_fd);

> 


Queued, thanks.

Paolo
diff mbox series

Patch

diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
index 5c70596dd1b9..a2b732cf96ea 100644
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -82,7 +82,7 @@  int kvm_check_cap(long cap)
 
 	kvm_fd = open_kvm_dev_path_or_exit();
 	ret = ioctl(kvm_fd, KVM_CHECK_EXTENSION, cap);
-	TEST_ASSERT(ret != -1, "KVM_CHECK_EXTENSION IOCTL failed,\n"
+	TEST_ASSERT(ret >= 0, "KVM_CHECK_EXTENSION IOCTL failed,\n"
 		"  rc: %i errno: %i", ret, errno);
 
 	close(kvm_fd);