2021-04-26 03:32:31

by Duan, Zhenzhong

Subject: [PATCH] selftests: kvm: Fix the check of return value

In vm_vcpu_rm() and kvm_vm_release(), a stale return value is checked in
TEST_ASSERT macro.

Fix it by assigning variable ret with correct return value.

Signed-off-by: Zhenzhong Duan <[email protected]>
---
tools/testing/selftests/kvm/lib/kvm_util.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
index b8849a1aca79..53d3a7eb0d47 100644
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -514,7 +514,7 @@ static void vm_vcpu_rm(struct kvm_vm *vm, struct vcpu *vcpu)
ret = munmap(vcpu->state, vcpu_mmap_sz());
TEST_ASSERT(ret == 0, "munmap of VCPU fd failed, rc: %i "
"errno: %i", ret, errno);
- close(vcpu->fd);
+ ret = close(vcpu->fd);
TEST_ASSERT(ret == 0, "Close of VCPU fd failed, rc: %i "
"errno: %i", ret, errno);

@@ -534,7 +534,7 @@ void kvm_vm_release(struct kvm_vm *vmp)
TEST_ASSERT(ret == 0, "Close of vm fd failed,\n"
" vmp->fd: %i rc: %i errno: %i", vmp->fd, ret, errno);

- close(vmp->kvm_fd);
+ ret = close(vmp->kvm_fd);
TEST_ASSERT(ret == 0, "Close of /dev/kvm fd failed,\n"
" vmp->kvm_fd: %i rc: %i errno: %i", vmp->kvm_fd, ret, errno);
}
--
2.25.1

2021-04-26 09:30:11

by Paolo Bonzini

Subject: Re: [PATCH] selftests: kvm: Fix the check of return value

On 26/04/21 21:31, Zhenzhong Duan wrote:
> In vm_vcpu_rm() and kvm_vm_release(), a stale return value is checked in
> TEST_ASSERT macro.
>
> Fix it by assigning variable ret with correct return value.
>
> Signed-off-by: Zhenzhong Duan <[email protected]>
> ---
> tools/testing/selftests/kvm/lib/kvm_util.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
> index b8849a1aca79..53d3a7eb0d47 100644
> --- a/tools/testing/selftests/kvm/lib/kvm_util.c
> +++ b/tools/testing/selftests/kvm/lib/kvm_util.c
> @@ -514,7 +514,7 @@ static void vm_vcpu_rm(struct kvm_vm *vm, struct vcpu *vcpu)
> ret = munmap(vcpu->state, vcpu_mmap_sz());
> TEST_ASSERT(ret == 0, "munmap of VCPU fd failed, rc: %i "
> "errno: %i", ret, errno);
> - close(vcpu->fd);
> + ret = close(vcpu->fd);
> TEST_ASSERT(ret == 0, "Close of VCPU fd failed, rc: %i "
> "errno: %i", ret, errno);
>
> @@ -534,7 +534,7 @@ void kvm_vm_release(struct kvm_vm *vmp)
> TEST_ASSERT(ret == 0, "Close of vm fd failed,\n"
> " vmp->fd: %i rc: %i errno: %i", vmp->fd, ret, errno);
>
> - close(vmp->kvm_fd);
> + ret = close(vmp->kvm_fd);
> TEST_ASSERT(ret == 0, "Close of /dev/kvm fd failed,\n"
> " vmp->kvm_fd: %i rc: %i errno: %i", vmp->kvm_fd, ret, errno);
> }
>

Queued, thanks.

Paolo