From nobody Thu Nov 13 20:43:59 2025 Delivered-To: importer@patchew.org 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1582616613; cv=none; d=zohomail.com; s=zohoarc; b=ItK1JklzF/RgC9GkK80M4GJnk8WJHdu3ojaScDOPSGURlTdf7Y7oZdbi+onSoflwAxM3c2QFfpMZ6YLN0OZ0UPMX77WKzbleSbiMuTplscDHYi9DB0zNwMT6iUgOYGrRz1VVNU0+FSNGyQDhbkbe+kOOrOWZb97kwsiItldOkeE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582616613; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tYhYAhq1K0+V8CsPcAiFm+voJKa7oN5XIqsrD074NW4=; b=HHzDDFGOqHxLJXb/BiLukm/AQmrqzu++nJfsaGlQow8IVZ8hkF8Qde2460L/Utf3LKi1zCeO0BMuZZicZpOEuLlUQlgi8e9vpZfs3pWG84sSYw56crcYbRaHt7anFCVWmdk2VXxyM8dvWDqV8O0rXygPjalwBP32ne70gTXKnQ0= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582616613610355.653644254789; Mon, 24 Feb 2020 23:43:33 -0800 (PST) Received: from localhost ([::1]:50064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6UsO-0004uB-IY for importer@patchew.org; Tue, 25 Feb 2020 02:43:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41018) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Uph-0008OM-59 for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:40:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6Upg-0003cC-4V for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:40:45 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:55678 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6Upf-0003bh-PP for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:40:44 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id A1B0A4B482C74B6EBB24; Tue, 25 Feb 2020 15:40:41 +0800 (CST) Received: from localhost.localdomain (10.175.104.216) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.439.0; Tue, 25 Feb 2020 15:40:31 +0800 From: Pan Nengyuan To: Subject: [PATCH 2/4] vhost-user-fs: convert to the new virtio_delete_queue function Date: Tue, 25 Feb 2020 15:55:52 +0800 Message-ID: <20200225075554.10835-3-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200225075554.10835-1-pannengyuan@huawei.com> References: <20200225075554.10835-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.216] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.35 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhang.zhanghailiang@huawei.com, Pan Nengyuan , qemu-devel@nongnu.org, "Dr. David Alan Gilbert" , Stefan Hajnoczi , euler.robot@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" use the new virtio_delete_queue function to cleanup. Signed-off-by: Pan Nengyuan Cc: "Dr. David Alan Gilbert" Cc: Stefan Hajnoczi --- hw/virtio/vhost-user-fs.c | 15 +++++++++------ include/hw/virtio/vhost-user-fs.h | 2 ++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c index 4554d123b7..6136768875 100644 --- a/hw/virtio/vhost-user-fs.c +++ b/hw/virtio/vhost-user-fs.c @@ -209,11 +209,12 @@ static void vuf_device_realize(DeviceState *dev, Erro= r **errp) sizeof(struct virtio_fs_config)); =20 /* Hiprio queue */ - virtio_add_queue(vdev, fs->conf.queue_size, vuf_handle_output); + fs->hiprio_vq =3D virtio_add_queue(vdev, fs->conf.queue_size, vuf_hand= le_output); =20 /* Request queues */ + fs->req_vqs =3D g_new(VirtQueue *, fs->conf.num_request_queues); for (i =3D 0; i < fs->conf.num_request_queues; i++) { - virtio_add_queue(vdev, fs->conf.queue_size, vuf_handle_output); + fs->req_vqs[i] =3D virtio_add_queue(vdev, fs->conf.queue_size, vuf= _handle_output); } =20 /* 1 high prio queue, plus the number configured */ @@ -230,10 +231,11 @@ static void vuf_device_realize(DeviceState *dev, Erro= r **errp) =20 err_virtio: vhost_user_cleanup(&fs->vhost_user); - virtio_del_queue(vdev, 0); + virtio_delete_queue(fs->hiprio_vq); for (i =3D 0; i < fs->conf.num_request_queues; i++) { - virtio_del_queue(vdev, i + 1); + virtio_delete_queue(fs->req_vqs[i]); } + g_free(fs->req_vqs); virtio_cleanup(vdev); g_free(fs->vhost_dev.vqs); return; @@ -252,10 +254,11 @@ static void vuf_device_unrealize(DeviceState *dev, Er= ror **errp) =20 vhost_user_cleanup(&fs->vhost_user); =20 - virtio_del_queue(vdev, 0); + virtio_delete_queue(fs->hiprio_vq); for (i =3D 0; i < fs->conf.num_request_queues; i++) { - virtio_del_queue(vdev, i + 1); + virtio_delete_queue(fs->req_vqs[i]); } + g_free(fs->req_vqs); virtio_cleanup(vdev); g_free(fs->vhost_dev.vqs); fs->vhost_dev.vqs =3D NULL; diff --git a/include/hw/virtio/vhost-user-fs.h b/include/hw/virtio/vhost-us= er-fs.h index 9ff1bdb7cf..6f3030d288 100644 --- a/include/hw/virtio/vhost-user-fs.h +++ b/include/hw/virtio/vhost-user-fs.h @@ -37,6 +37,8 @@ typedef struct { struct vhost_virtqueue *vhost_vqs; struct vhost_dev vhost_dev; VhostUserState vhost_user; + VirtQueue **req_vqs; + VirtQueue *hiprio_vq; =20 /*< public >*/ } VHostUserFS; --=20 2.18.2