From nobody Tue Feb 10 06:58:08 2026 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=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1770371759; cv=none; d=zohomail.com; s=zohoarc; b=BJKvpTSwbPuZOG6mqOlLtWi26eiAMixR5qXTuqKYD4GSHjy5M3iUIopOVnFNuRf8iECKrLKg4ku3GFpj/U8SHZx0eTDn1XmFExuI1rKyibjFeMDFGSin1Kok/LFGJKFDEvbumuSaS6+oyO06xzQ2jqpNYPV+Kkstg2rKCuOROEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770371759; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=McaUj7C7juJONfX1pthkIVKcqzza7THk4u91y7xBCpQ=; b=DVp1yB1BS5RpXF/UWeh6/abLReMI0Cmp+LYTSEDbJt8hGhwEVRHjIHZcPslvTRk3q5Wv6grJycB4Ba5VrR+/o9s0S7mzpBFwZ/BtacvkpmcQvIJR3wYQ9Z1m1KFGHm0neS0OfQDwrKnqj3l9h0t4mVGqgBvc77lQLcEaH6bRAt8= 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 177037175947124.339370633325643; Fri, 6 Feb 2026 01:55:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1voIXE-0001wa-BY; Fri, 06 Feb 2026 04:53:56 -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 1voIWl-0001mX-1u for qemu-devel@nongnu.org; Fri, 06 Feb 2026 04:53:30 -0500 Received: from forwardcorp1d.mail.yandex.net ([178.154.239.200]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1voIWj-0000J8-DK for qemu-devel@nongnu.org; Fri, 06 Feb 2026 04:53:26 -0500 Received: from mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:1593:0:640:6beb:0]) by forwardcorp1d.mail.yandex.net (Yandex) with ESMTPS id 30FCD807A4; Fri, 06 Feb 2026 12:53:24 +0300 (MSK) Received: from vsementsov-lin (unknown [2a02:6bf:8080:52d::1:1f]) by mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id 2rKPQc0AN0U0-nT7yIeoy; Fri, 06 Feb 2026 12:53:23 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1770371603; bh=McaUj7C7juJONfX1pthkIVKcqzza7THk4u91y7xBCpQ=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=CVQP8spUEniGLL3LuJfG2MWUOhYEYA0HLD1opxlLvaa2nPFEQIw+bX1XGSEpxwEdU 5qXX4jk9crITqwVhNWY+ZzACoJQauBQO2gooIHGcY4SmSSEmGey2YrvLMj7A5mTUhM m8xaD47uNYziyux323/89j1maJOpA5TPjIfGsp8A= Authentication-Results: mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: mst@redhat.com Cc: sgarzare@redhat.com, raphael@enfabrica.net, qemu-devel@nongnu.org, vsementsov@yandex-team.ru, yc-core@yandex-team.ru, d-tatianin@yandex-team.ru, Raphael Norwitz Subject: [PATCH v5 14/23] vhost: move vrings mapping to the top of vhost_virtqueue_start() Date: Fri, 6 Feb 2026 12:52:48 +0300 Message-ID: <20260206095258.894504-15-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260206095258.894504-1-vsementsov@yandex-team.ru> References: <20260206095258.894504-1-vsementsov@yandex-team.ru> 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=178.154.239.200; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1d.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 List-Id: qemu development 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 @yandex-team.ru) X-ZM-MESSAGEID: 1770371762014158500 Content-Type: text/plain; charset="utf-8" This simplifies further refactoring and final introduction of vhost backend live migration. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Raphael Norwitz Reviewed-by: Daniil Tatianin --- hw/virtio/vhost.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 52453b36e3..e4cffd50d5 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1305,29 +1305,6 @@ int vhost_virtqueue_start(struct vhost_dev *dev, return 0; } =20 - vq->num =3D state.num =3D virtio_queue_get_num(vdev, idx); - r =3D dev->vhost_ops->vhost_set_vring_num(dev, &state); - if (r) { - VHOST_OPS_DEBUG(r, "vhost_set_vring_num failed"); - return r; - } - - state.num =3D virtio_queue_get_last_avail_idx(vdev, idx); - r =3D dev->vhost_ops->vhost_set_vring_base(dev, &state); - if (r) { - VHOST_OPS_DEBUG(r, "vhost_set_vring_base failed"); - return r; - } - - if (vhost_needs_vring_endian(vdev)) { - r =3D vhost_virtqueue_set_vring_endian_legacy(dev, - virtio_is_big_endian(v= dev), - vhost_vq_index); - if (r) { - return r; - } - } - l =3D vq->desc_size; vq->desc =3D vhost_memory_map(dev, vq->desc_phys, l, false); if (!vq->desc) { @@ -1349,6 +1326,29 @@ int vhost_virtqueue_start(struct vhost_dev *dev, goto fail; } =20 + vq->num =3D state.num =3D virtio_queue_get_num(vdev, idx); + r =3D dev->vhost_ops->vhost_set_vring_num(dev, &state); + if (r) { + VHOST_OPS_DEBUG(r, "vhost_set_vring_num failed"); + goto fail; + } + + state.num =3D virtio_queue_get_last_avail_idx(vdev, idx); + r =3D dev->vhost_ops->vhost_set_vring_base(dev, &state); + if (r) { + VHOST_OPS_DEBUG(r, "vhost_set_vring_base failed"); + goto fail; + } + + if (vhost_needs_vring_endian(vdev)) { + r =3D vhost_virtqueue_set_vring_endian_legacy(dev, + virtio_is_big_endian(v= dev), + vhost_vq_index); + if (r) { + goto fail; + } + } + r =3D vhost_virtqueue_set_addr(dev, vq, vhost_vq_index, dev->log_enabl= ed); if (r < 0) { goto fail; --=20 2.52.0