From nobody Mon Feb 9 12:55:04 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=fail(p=none dis=none) header.from=linux.alibaba.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1661512056350967.863093021863; Fri, 26 Aug 2022 04:07:36 -0700 (PDT) Received: from localhost ([::1]:55134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRXBX-0003bt-6F for importer@patchew.org; Fri, 26 Aug 2022 07:07:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRX0z-0002jd-Kf for qemu-devel@nongnu.org; Fri, 26 Aug 2022 06:56:41 -0400 Received: from out30-131.freemail.mail.aliyun.com ([115.124.30.131]:48524) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRX0s-00018A-88 for qemu-devel@nongnu.org; Fri, 26 Aug 2022 06:56:38 -0400 Received: from localhost(mailfrom:kangjie.xu@linux.alibaba.com fp:SMTPD_---0VNJ-pqc_1661511385) by smtp.aliyun-inc.com; Fri, 26 Aug 2022 18:56:26 +0800 X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R821e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=ay29a033018046059; MF=kangjie.xu@linux.alibaba.com; NM=1; PH=DS; RN=6; SR=0; TI=SMTPD_---0VNJ-pqc_1661511385; From: Kangjie Xu To: qemu-devel@nongnu.org Cc: mst@redhat.com, jasowang@redhat.com, arei.gonglei@huawei.com, hengqi@linux.alibaba.com, xuanzhuo@linux.alibaba.com Subject: [PATCH 5/8] vhost-net: vhost-user: update vhost_net_virtqueue_reset() Date: Fri, 26 Aug 2022 18:56:17 +0800 Message-Id: <15a36a72635b8ee3d927a83b3109e04433313d89.1661510725.git.kangjie.xu@linux.alibaba.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=115.124.30.131; envelope-from=kangjie.xu@linux.alibaba.com; helo=out30-131.freemail.mail.aliyun.com X-Spam_score_int: -98 X-Spam_score: -9.9 X-Spam_bar: --------- X-Spam_report: (-9.9 / 5.0 requ) BAYES_00=-1.9, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001, USER_IN_DEF_SPF_WL=-7.5 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" X-ZM-MESSAGEID: 1661512056778100003 Content-Type: text/plain; charset="utf-8" Update vhost_net_virtqueue_reset() for vhost-user scenario. In order to reuse some functions, we process the idx for vhost-user scenario because vhost_get_vq_index behave differently for vhost-user. Signed-off-by: Kangjie Xu Signed-off-by: Xuan Zhuo --- hw/net/vhost_net.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index c0c1456172..8ad5743f7c 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -522,19 +522,28 @@ void vhost_net_virtqueue_reset(VirtIODevice *vdev, Ne= tClientState *nc, VHostNetState *net =3D get_vhost_net(nc->peer); const VhostOps *vhost_ops =3D net->dev.vhost_ops; struct vhost_vring_file file =3D { .fd =3D -1 }; - int idx; + struct vhost_vring_state state; + int idx, r; =20 /* should only be called after backend is connected */ assert(vhost_ops); =20 idx =3D vhost_ops->vhost_get_vq_index(&net->dev, vq_index); + if (net->nc->info->type =3D=3D NET_CLIENT_DRIVER_VHOST_USER) { + idx -=3D net->dev.vq_index; + } =20 if (net->nc->info->type =3D=3D NET_CLIENT_DRIVER_TAP) { file.index =3D idx; - int r =3D vhost_net_set_backend(&net->dev, &file); + r =3D vhost_net_set_backend(&net->dev, &file); assert(r >=3D 0); } =20 + if (vhost_ops->vhost_reset_vring) { + state.index =3D net->dev.vq_index + idx; + r =3D vhost_ops->vhost_reset_vring(&net->dev, &state); + } + vhost_virtqueue_unmap(&net->dev, vdev, net->dev.vqs + idx, idx); } =20 --=20 2.32.0