From nobody Sat Nov 15 07:46:08 2025 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=1755103986; cv=none; d=zohomail.com; s=zohoarc; b=K6rWik6Mwq99XGf9gmh1XfwOVY5cbKuxWmDTB2ekl/BD/I1J7e0tCKuUlE7+h1P1EJh/jb0jMiNav4e3EbPOrOx6LbHIj7czhc1RPokG/J4NxqcibRqo626jlrDYtU3j45ZY8vXAzfLkxQxgjV+PfGSStZd5dqxcAX3hWdRwuds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755103986; 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=0BbvMhvv176A45n6ck0LNiFq7u1ql13y24c+pUlCJDY=; b=GFt62d99a3vECbUHkQA9F3baYm79Uh0VrB16zgrhokpYoxUs2fJR6gt4qOz1ePWXFavp/ilc2FoeEr0Jc+7c/UIELZlOR1mGoYvOYoAd1wSscjOFQ0BRIColJWvJ7dQDtivLmrCy9WxP+Og2r3eyf29ATmcH7PFHLMyeLMFSjRo= 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 1755103986429394.12029670204356; Wed, 13 Aug 2025 09:53:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1umEfm-0002oS-KM; Wed, 13 Aug 2025 12:49:58 -0400 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 1umEfS-0002gY-BC; Wed, 13 Aug 2025 12:49:38 -0400 Received: from forwardcorp1d.mail.yandex.net ([2a02:6b8:c41:1300:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1umEfD-0007qZ-Uv; Wed, 13 Aug 2025 12:49:37 -0400 Received: from mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net [IPv6:2a02:6b8:c42:cf2d:0:640:140f:0]) by forwardcorp1d.mail.yandex.net (Yandex) with ESMTPS id 0F8D5810DD; Wed, 13 Aug 2025 19:49:13 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:167::1:21]) by mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id wmOQI00FoSw0-8RxqNoLL; Wed, 13 Aug 2025 19:49:12 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1755103752; bh=0BbvMhvv176A45n6ck0LNiFq7u1ql13y24c+pUlCJDY=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=rHJ/Wtt2PoFBIgFpAPhcZwaaMYD3LFhc72Xq/8ACfEbtq1eOSaNQuxuFj90QPDaDG DhOTujADKLrcHIrHeUuoRPSgZxOrhl6I4YgM1L6da7JdIhkI/aIS5yiuUoMbfd5YG5 2q/hlzoLOJA7Z3BA8Ynk9tBkiCP16z+fERap3+Fw= Authentication-Results: mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: mst@redhat.com, peterx@redhat.com, farosas@suse.de, raphael@enfabrica.net Cc: sgarzare@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, kwolf@redhat.com, hreitz@redhat.com, berrange@redhat.com, eblake@redhat.com, armbru@redhat.com, qemu-devel@nongnu.org, qemu-block@nongnu.org, steven.sistare@oracle.com, den-plotnikov@yandex-team.ru, vsementsov@yandex-team.ru Subject: [PATCH 12/33] vhost: simplify calls to vhost_memory_unmap() Date: Wed, 13 Aug 2025 19:48:33 +0300 Message-ID: <20250813164856.950363-13-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250813164856.950363-1-vsementsov@yandex-team.ru> References: <20250813164856.950363-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=2a02:6b8:c41:1300:1:45:d181:df01; 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, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=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 @yandex-team.ru) X-ZM-MESSAGEID: 1755103986850116600 Content-Type: text/plain; charset="utf-8" No reason to calculate memory size again, as we have corresponding variable for each vring. Signed-off-by: Vladimir Sementsov-Ogievskiy --- hw/virtio/vhost.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 1fdc1937b6..bc1821eadd 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1370,12 +1370,9 @@ int vhost_virtqueue_start(struct vhost_dev *dev, return 0; =20 fail: - vhost_memory_unmap(dev, vq->used, virtio_queue_get_used_size(vdev, idx= ), - 0, 0); - vhost_memory_unmap(dev, vq->avail, virtio_queue_get_avail_size(vdev, i= dx), - 0, 0); - vhost_memory_unmap(dev, vq->desc, virtio_queue_get_desc_size(vdev, idx= ), - 0, 0); + vhost_memory_unmap(dev, vq->used, vq->used_size, 0, 0); + vhost_memory_unmap(dev, vq->avail, vq->avail_size, 0, 0); + vhost_memory_unmap(dev, vq->desc, vq->desc_size, 0, 0); return r; } =20 @@ -1422,12 +1419,9 @@ static int do_vhost_virtqueue_stop(struct vhost_dev = *dev, vhost_vq_index); } =20 - vhost_memory_unmap(dev, vq->used, virtio_queue_get_used_size(vdev, idx= ), - 1, virtio_queue_get_used_size(vdev, idx)); - vhost_memory_unmap(dev, vq->avail, virtio_queue_get_avail_size(vdev, i= dx), - 0, virtio_queue_get_avail_size(vdev, idx)); - vhost_memory_unmap(dev, vq->desc, virtio_queue_get_desc_size(vdev, idx= ), - 0, virtio_queue_get_desc_size(vdev, idx)); + vhost_memory_unmap(dev, vq->used, vq->used_size, 1, vq->used_size); + vhost_memory_unmap(dev, vq->avail, vq->avail_size, 0, vq->avail_size); + vhost_memory_unmap(dev, vq->desc, vq->desc_size, 0, vq->desc_size); return r; } =20 --=20 2.48.1