From nobody Tue Feb 10 04:13:16 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1648274769; cv=none; d=zohomail.com; s=zohoarc; b=UgoXXQmzdy7vQaySGc5CZBPWLgY51+CMlDNMZs8eRszP8Wb0Mh5/lQPR15qzQ/EHgof4okGebs3acSW1EGBvN6I46V73Z6g0KQaSwHKtKZVZNh1ucboeh7Ma69CCfZEwFJ/fawrRZWs1JnhKMOlMKWCcSZVjL+kmjk++6nigqy0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648274769; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=4y9P6XYV53tIeFbnWndfKxKqvbISWHzsa0Pg3vufjg0=; b=UP4hLPjVlutj6gYzT4oj9A6QuetXT6Dnn/qfv0+sTuhD19l9gWe0eVkOQMfGU1LVgWIbRABq9rqVfF9acFYu1Wg+fqWRmSRYCUwxyCjIAD2quptn+uA/eCHqkbQxLYewKDcpCVA4k+st/xD5NFVTMIC1Rcs5pW8T6D9IUb4nCjY= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164827476937649.18873586606924; Fri, 25 Mar 2022 23:06:09 -0700 (PDT) Received: from localhost ([::1]:37658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXzYu-00017o-AY for importer@patchew.org; Sat, 26 Mar 2022 02:06:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXzVd-000374-Gm for qemu-devel@nongnu.org; Sat, 26 Mar 2022 02:02:46 -0400 Received: from szxga03-in.huawei.com ([45.249.212.189]:4216) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXzVa-00005m-Rw for qemu-devel@nongnu.org; Sat, 26 Mar 2022 02:02:45 -0400 Received: from dggpeml500021.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4KQStv6sbKz9stq; Sat, 26 Mar 2022 13:58:31 +0800 (CST) Received: from dggpeml100016.china.huawei.com (7.185.36.216) by dggpeml500021.china.huawei.com (7.185.36.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Sat, 26 Mar 2022 14:02:30 +0800 Received: from DESKTOP-27KDQMV.china.huawei.com (10.174.148.223) by dggpeml100016.china.huawei.com (7.185.36.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Sat, 26 Mar 2022 14:02:30 +0800 To: CC: , , , , , , "Longpeng(Mike)" Subject: [PATCH v6 1/5] vfio: simplify the conditional statements in vfio_msi_enable Date: Sat, 26 Mar 2022 14:02:22 +0800 Message-ID: <20220326060226.1892-2-longpeng2@huawei.com> X-Mailer: git-send-email 2.25.0.windows.1 In-Reply-To: <20220326060226.1892-1-longpeng2@huawei.com> References: <20220326060226.1892-1-longpeng2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.174.148.223] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpeml100016.china.huawei.com (7.185.36.216) X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.189; envelope-from=longpeng2@huawei.com; helo=szxga03-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: "Longpeng(Mike)" From: "Longpeng(Mike)" via X-ZM-MESSAGEID: 1648274769628100002 Content-Type: text/plain; charset="utf-8" It's unnecessary to test against the specific return value of VFIO_DEVICE_SET_IRQS, since any positive return is an error indicating the number of vectors we should retry with. Signed-off-by: Longpeng(Mike) --- hw/vfio/pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index d07a4e99b1..1433989aeb 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -653,7 +653,7 @@ retry: if (ret) { if (ret < 0) { error_report("vfio: Error: Failed to setup MSI fds: %m"); - } else if (ret !=3D vdev->nr_vectors) { + } else { error_report("vfio: Error: Failed to enable %d " "MSI vectors, retry with %d", vdev->nr_vectors, r= et); } @@ -671,7 +671,7 @@ retry: g_free(vdev->msi_vectors); vdev->msi_vectors =3D NULL; =20 - if (ret > 0 && ret !=3D vdev->nr_vectors) { + if (ret > 0) { vdev->nr_vectors =3D ret; goto retry; } --=20 2.23.0