From nobody Wed Nov 27 02:26:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1701975421; cv=none; d=zohomail.com; s=zohoarc; b=Vo39owR6QKb13KRCGmcRim4X64KW6omTrJFh1vR6lNml7raTSCHQy4OQ/gHMDm7HWhcpTzmJjZ+Ce8lgwagnhg5RoidsHAC9S73eTqrzS33HntD8+rPJTO6SM0fxU4tIkcp16tCrp1Bp4+vt7siEW57KSyJ5VGja/5Yjkv9nT9s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1701975421; h=Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=DJSLEXjKaBkTa2xp+KB2j4QSquhLP8LlYyhXssczufQ=; b=b1eFl7RfM7mb5zWnkOQA6Txrs+fAgZfMTEX3zKbv0roT15kOyXXDX3eamku31xjyI5zpRP1L+wuOBZNrPl571x/T1Fu9LdMDVkGWfpTVDJ6msAIWUUmtavNPG/RvqKXpWnBWjukyBlolJjflG4R8IyLpI5f2sjJKjaTKmeiZdeU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 1701975421027231.0793132975126; Thu, 7 Dec 2023 10:57:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBJSj-0003in-45; Thu, 07 Dec 2023 13:51:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBJSC-0003Xb-SR for qemu-devel@nongnu.org; Thu, 07 Dec 2023 13:50:32 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBJSB-0006rT-2t for qemu-devel@nongnu.org; Thu, 07 Dec 2023 13:50:32 -0500 Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3B7FcRpD001073; Thu, 7 Dec 2023 18:50:29 GMT Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3utdda4h9a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 07 Dec 2023 18:50:28 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 3B7HTkJO039553; Thu, 7 Dec 2023 18:50:28 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3utan7vhky-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 07 Dec 2023 18:50:28 +0000 Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3B7Io90E008067; Thu, 7 Dec 2023 18:50:27 GMT Received: from ban25x6uut24.us.oracle.com (ban25x6uut24.us.oracle.com [10.153.73.24]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 3utan7vh2k-12; Thu, 07 Dec 2023 18:50:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2023-11-20; bh=DJSLEXjKaBkTa2xp+KB2j4QSquhLP8LlYyhXssczufQ=; b=nBh1trneA2dARq5m1y4hIwdG4+6llvFmMeuomaGLMPhANxVh4XYdbUIuQtbfTzR1N4oo y+ont1wz188BUegm5JejhoUqUmIryS99bLFFoWgo3GWSlXm1ZYn+adCyu0yAc5J4aQJs 5ueltAG5P/hi6XmS49/IGCnJNe1ZQo3KYylF9NQOnQNEKgwztLvc04xP0PZBoR6iMmbH KslhFIwhsBaM2UVWrF5pwQj6I7cRV5JNh0cAmLFkUVHzYkhoh5IJo2yWBvBOFa4Btn7C S5TjdXtkYaZh/Mf0dH8qa2eMS7Zuwul/XGPVfsY2Ng/nhYLag48BdBSqNBCGwCdZY+0c Nw== From: Si-Wei Liu To: eperezma@redhat.com, jasowang@redhat.com, mst@redhat.com, dtatulea@nvidia.com, leiyang@redhat.com, yin31149@gmail.com, boris.ostrovsky@oracle.com, jonah.palmer@oracle.com Cc: qemu-devel@nongnu.org Subject: [PATCH 11/40] vdpa: factor out vhost_vdpa_last_dev Date: Thu, 7 Dec 2023 09:39:24 -0800 Message-Id: <1701970793-6865-12-git-send-email-si-wei.liu@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1701970793-6865-1-git-send-email-si-wei.liu@oracle.com> References: <1701970793-6865-1-git-send-email-si-wei.liu@oracle.com> X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-07_15,2023-12-07_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 malwarescore=0 suspectscore=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312070156 X-Proofpoint-GUID: shHTDgZARB2Axot1HvYYH6fkM8Nxt79n X-Proofpoint-ORIG-GUID: shHTDgZARB2Axot1HvYYH6fkM8Nxt79n 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=205.220.165.32; envelope-from=si-wei.liu@oracle.com; helo=mx0a-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @oracle.com) X-ZM-MESSAGEID: 1701975421933100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Generalize duplicated condition check for the last vq of vdpa device to a common function. Signed-off-by: Si-Wei Liu Acked-by: Jason Wang Reviewed-by: Eugenio P=C3=A9rez --- hw/virtio/vhost-vdpa.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 30dff95..2b1cc14 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -593,6 +593,11 @@ static bool vhost_vdpa_first_dev(struct vhost_dev *dev) return v->index =3D=3D 0; } =20 +static bool vhost_vdpa_last_dev(struct vhost_dev *dev) +{ + return dev->vq_index + dev->nvqs =3D=3D dev->vq_index_end; +} + static int vhost_vdpa_get_dev_features(struct vhost_dev *dev, uint64_t *features) { @@ -1432,7 +1437,7 @@ static int vhost_vdpa_dev_start(struct vhost_dev *dev= , bool started) goto out_stop; } =20 - if (dev->vq_index + dev->nvqs !=3D dev->vq_index_end) { + if (!vhost_vdpa_last_dev(dev)) { return 0; } =20 @@ -1467,7 +1472,7 @@ static void vhost_vdpa_reset_status(struct vhost_dev = *dev) { struct vhost_vdpa *v =3D dev->opaque; =20 - if (dev->vq_index + dev->nvqs !=3D dev->vq_index_end) { + if (!vhost_vdpa_last_dev(dev)) { return; } =20 --=20 1.8.3.1