From nobody Mon Feb 9 16:19:08 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 ARC-Seal: i=1; a=rsa-sha256; t=1615210430; cv=none; d=zohomail.com; s=zohoarc; b=k1ZUfW0Epn/MEFt9LU8k6L+9VsK8FDWYYyWVekyb3I9ilkm7tepOWhMMWONTtQvtUN9Fn0y+th+O5ZDr8K6t5iSlAlztbK3YH0H6LJs+g/5tiY6COxRATE8TnwXpPxs/Y3KRuX2Kr6WmzQKMmvYrczkfCmGl3L3jwYx1IHgmDnw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615210430; h=Content-Transfer-Encoding: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=8zXaYJzmqLk7dBa+35vM1k/3bvkEcxp12F98Lbyfo84=; b=hkX8fhnhrMQwhWGB9vFaLCA8eI5URjXkpWD0sPZQGh+QKPEf2oK4NJmYKzcS4iJn6Qr+tresQU3fJYc0VrqLhDGcIjaFEXWGW+bW/yhZ78uDWuIrxKtuiCpA/rOS2PPPmwqA3Sryn8D/0gW/NbTrB6Sb6dIQU6fIRc8r/i2SJOY= 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 1615210430404279.62739464448157; Mon, 8 Mar 2021 05:33:50 -0800 (PST) Received: from localhost ([::1]:57122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJG16-0006do-S4 for importer@patchew.org; Mon, 08 Mar 2021 08:33:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJEwJ-0003xu-BQ; Mon, 08 Mar 2021 07:24:47 -0500 Received: from wnew4-smtp.messagingengine.com ([64.147.123.18]:36527) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJEwH-0007FZ-N1; Mon, 08 Mar 2021 07:24:47 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.west.internal (Postfix) with ESMTP id 8CA3B32BC; Mon, 8 Mar 2021 07:24:11 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 08 Mar 2021 07:24:12 -0500 Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by mail.messagingengine.com (Postfix) with ESMTPA id B0C971080066; Mon, 8 Mar 2021 07:24:09 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=8zXaYJzmqLk7d Ba+35vM1k/3bvkEcxp12F98Lbyfo84=; b=AGGkOyXrXSxn98EGOf7aH/3gxho0t CEJ16erTXzIIUG88fateiAUEM7BfOJMxqSIfZX8kwQm1Ng02ZOteOWgx2L0KjCbF +2LTIQQJujRTI5qI0tRyB9lpIX4qwnrBaQt62Rm+zKry4iWfjggNYTkPcOecvD/v RD5cIb0DqsvuS6wlBlHQ3EBOOBURcd6TtkUrzgslcG8rk+YJmmsmArqe04+rNFYr 3oYvAYeFwPGhdOWprWTIiJCLOrfD9txZT1qyim8SYwtIIf/ZOZ4fkHT/BBvRV5SJ +GdxpFaOEFkOjphgeMd4FQsOtHQXkMkv3yVsAV5X+eeUE5v+oBElCM6Uw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=8zXaYJzmqLk7dBa+35vM1k/3bvkEcxp12F98Lbyfo84=; b=fsIPdJ/1 fg387+yEkfmFWPkxsi2i2IjqqQNZGG4lpvBAY9hu3irNdTnpC5lT92pgssPwPSWe ybpr4TCJVN7tksdNVXan4pWAO1SMTBoxmn0TKeT+GQWY7q8rEAe2VYimBu/tjZCS cM0F6UBm0EGy2DcjcjGzb+ENf4jJCUgTeeQh6/mCyzlbgFcqqThDzwJbE/R6p1KG 34rjPvs7zICEnHHBaxWfXZXyzhQznL3E0ZN2qkoJIT4vCr2EugRORya0f9TPBZgz Xiibhbih4/0loQCHX2c5tB+sLNv47osnwhNR5qptNa4oOKRJojEu5pQFXfZaxR/h hjKQEb9l3R6frg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudduvddgfedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefmlhgruhhs ucflvghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrghtth gvrhhnpeeuleetgeeiuefhgfekfefgveejiefgteekiedtgfdtieefhfdthfefueffvefg keenucfkphepkedtrdduieejrdelkedrudeltdenucevlhhushhtvghrufhiiigvpeefud enucfrrghrrghmpehmrghilhhfrhhomhepihhtshesihhrrhgvlhgvvhgrnhhtrdgukh X-ME-Proxy: From: Klaus Jensen To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 35/38] hw/block/nvme: refactor nvme_select_ns_iocs Date: Mon, 8 Mar 2021 13:23:10 +0100 Message-Id: <20210308122313.286938-36-its@irrelevant.dk> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210308122313.286938-1-its@irrelevant.dk> References: <20210308122313.286938-1-its@irrelevant.dk> 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=64.147.123.18; envelope-from=its@irrelevant.dk; helo=wnew4-smtp.messagingengine.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Klaus Jensen , Max Reitz , Keith Busch , Minwoo Im , Stefan Hajnoczi , Klaus Jensen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Minwoo Im This patch has no functional changes. This patch just refactored nvme_select_ns_iocs() to iterate the attached namespaces of the controlller and make it invoke __nvme_select_ns_iocs(). Signed-off-by: Minwoo Im Reviewed-by: Keith Busch Reviewed-by: Klaus Jensen Tested-by: Klaus Jensen Signed-off-by: Klaus Jensen --- hw/block/nvme.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 3bfe10f5b517..3f86da6ebc5c 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -4033,6 +4033,25 @@ static void nvme_ctrl_shutdown(NvmeCtrl *n) } } =20 +static void __nvme_select_ns_iocs(NvmeCtrl *n, NvmeNamespace *ns) +{ + ns->iocs =3D nvme_cse_iocs_none; + switch (ns->csi) { + case NVME_CSI_NVM: + if (NVME_CC_CSS(n->bar.cc) !=3D NVME_CC_CSS_ADMIN_ONLY) { + ns->iocs =3D nvme_cse_iocs_nvm; + } + break; + case NVME_CSI_ZONED: + if (NVME_CC_CSS(n->bar.cc) =3D=3D NVME_CC_CSS_CSI) { + ns->iocs =3D nvme_cse_iocs_zoned; + } else if (NVME_CC_CSS(n->bar.cc) =3D=3D NVME_CC_CSS_NVM) { + ns->iocs =3D nvme_cse_iocs_nvm; + } + break; + } +} + static void nvme_select_ns_iocs(NvmeCtrl *n) { NvmeNamespace *ns; @@ -4043,21 +4062,8 @@ static void nvme_select_ns_iocs(NvmeCtrl *n) if (!ns) { continue; } - ns->iocs =3D nvme_cse_iocs_none; - switch (ns->csi) { - case NVME_CSI_NVM: - if (NVME_CC_CSS(n->bar.cc) !=3D NVME_CC_CSS_ADMIN_ONLY) { - ns->iocs =3D nvme_cse_iocs_nvm; - } - break; - case NVME_CSI_ZONED: - if (NVME_CC_CSS(n->bar.cc) =3D=3D NVME_CC_CSS_CSI) { - ns->iocs =3D nvme_cse_iocs_zoned; - } else if (NVME_CC_CSS(n->bar.cc) =3D=3D NVME_CC_CSS_NVM) { - ns->iocs =3D nvme_cse_iocs_nvm; - } - break; - } + + __nvme_select_ns_iocs(n, ns); } } =20 --=20 2.30.1