From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04477C43460 for ; Mon, 26 Apr 2021 09:28:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BF85960FD7 for ; Mon, 26 Apr 2021 09:28:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232648AbhDZJ3X (ORCPT ); Mon, 26 Apr 2021 05:29:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43374 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232140AbhDZJ3T (ORCPT ); Mon, 26 Apr 2021 05:29:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619429318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OtWVNId0H4MlH7zGbJHW4vVmuaAH+xdS1wmcTWoY6w0=; b=cFoJNtfV3am5VWCqqkzEcndxZF7jzSfr5F0mbEB4yfdYsAU6Lx0ZTzmICstFSoSyZE/Aph TbC0LkGjJBrwRlzY8aBrElV+4G8d08S+PYH8QvqkLq9QcBNck8YqTRCn0+3EZHNxTefkUt UWfHBKaEImiJwaaQtvhyfTRSJvJEx5U= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-325-y7Cc08buN2WopIgMQ124aw-1; Mon, 26 Apr 2021 05:28:33 -0400 X-MC-Unique: y7Cc08buN2WopIgMQ124aw-1 Received: by mail-ed1-f69.google.com with SMTP id y10-20020a50f1ca0000b0290382d654f75eso22669060edl.1 for ; Mon, 26 Apr 2021 02:28:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=OtWVNId0H4MlH7zGbJHW4vVmuaAH+xdS1wmcTWoY6w0=; b=uOAEIrcoVm42ncPbwdpSROA0ynz4eZcD2+elRJ/1V95mFQwzSHc4q8rg6ovznTCOYe QPLnGkZOBnRfTY4s6h7mO/xcU1Oq+IYynNfxS1mtjDD3xu5OOHnckQdQS/zvK61QFGRV LsJF+1wZoh8nOCWGabJQg4ZdMcmKkibplqjzXHACLuLPW4Amv/vbaVtDRhFPw3wGHGZL Kvus67VNehWtST/cyMnfE3f26xv1ATruZ4jKqjiwVJUnEKFZy2dJYEX6K46m59LwIWaS 3kuYDKYPDO1E7hYQ3ZONUtbuB9RHUrmzWGZzfAJQiLgXyO6FU8l6SO5XvqIWsqkcgW9N dEAw== X-Gm-Message-State: AOAM531jFSs1FTpOomfro6Po2IrvqzpXvSd58tD0R2fiZVMHrVd9VGDj 3w+pfjuC8TB/LbqEBlw/rEGo5iKLKflarRINoBhrFUpLAqrzEA8DU2XDjRnutl6EYY0B749EDsa 8Crhmxeh4d6OfwHh/VnGJcWs2 X-Received: by 2002:aa7:c4c1:: with SMTP id p1mr19783008edr.133.1619429311948; Mon, 26 Apr 2021 02:28:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytAfyLKl2YKK7lKos9PhDPbKzINP26aWILO7ar4wTBgQ7gjsJ4KrtD/Mf8e0g7fXX2pHMNmA== X-Received: by 2002:aa7:c4c1:: with SMTP id p1mr19783001edr.133.1619429311818; Mon, 26 Apr 2021 02:28:31 -0700 (PDT) Received: from ?IPv6:2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e? ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id b8sm14195751edu.41.2021.04.26.02.28.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 26 Apr 2021 02:28:31 -0700 (PDT) Subject: Re: [PATCH] selftests: kvm: Fix the check of return value To: Zhenzhong Duan , linux-kernel@vger.kernel.org Cc: linux-kselftest@vger.kernel.org, kvm@vger.kernel.org, shuah@kernel.org References: <20210426193138.118276-1-zhenzhong.duan@intel.com> From: Paolo Bonzini Message-ID: <0d23822d-1510-d615-c3bf-200b6636b766@redhat.com> Date: Mon, 26 Apr 2021 11:28:29 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: <20210426193138.118276-1-zhenzhong.duan@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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