Skip to contentSkip to conversation

KVM: selftests: Fix kvm_check_cap() assertion

PATCH Applied Fuad Tabba 2 participants 2 messages Jun 15, 2021 – Jun 17, 2021

Subsystems (2)
lore
Share & tools
lore

Fuad Tabba

author
#0 lore raw

PATCH 1/1 KVM: selftests: Fix kvm_check_cap() assertion

KVM_CHECK_EXTENSION ioctl can return any negative value on error, and not necessarily -1. Change the assertion to reflect that.

---
 tools/testing/selftests/kvm/lib/kvm_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/kvm/lib/kvm_util.c +1 -1
index 5c70596dd1b9..a2b732cf96ea 100644
@@ -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);
Signature · 1 line
2.32.0.272.g935e593368-goog
maintainer Applied
#1 lore raw
Quoted 14 lines · Fuad Tabba

KVM_CHECK_EXTENSION ioctl can return any negative value on error, and not necessarily -1. Change the assertion to reflect that.

---
  tools/testing/selftests/kvm/lib/kvm_util.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/kvm/lib/kvm_util.c +0 -0
index 5c70596dd1b9..a2b732cf96ea 100644

tools/testing/selftests/kvm/lib/kvm_util.c int kvm_check_cap(long cap) · line 88

Quoted 8 lines
tools/testing/selftests/kvm/lib/kvm_util.c +1 -1
@@ -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