From nobody Mon Feb 9 11:06:02 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=1621245038; cv=none; d=zohomail.com; s=zohoarc; b=TOcre3h1lal8K6psbdrTBHPQHVknBY04KSmTmtNKq38ikwA78Hw6j0E6PZoHRBW1CvZXVvw/v089PXeDv6XIxpDN9WHm5bshooK0AOwtxhlA3a9vRgDXGjUMD3ls3PbRZmiOXsrOJlrVPyHSJI/kPWfQ2IdJm7st/J8MFdEDlgU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621245038; 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=EMgjUG4Hjacj0rUL2PT4bxNaPXhR5+w4MaKi8XavRME=; b=hJIOfTzf24mI36geauesgyC3UtyFdrGCkTcr7TULXYAuaBHXosOyTo6Yh4rv4lcuAf4S1/3hCv4Vm5ZEJjumedzE2rWu8PxTaFM1XqjDCF8Vm722xV3spOp85Xy/W0JvDqlnOGVcUGgkLDogkheJ+QsswzS8hiCYCqTSjXJvBJc= 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 1621245038308732.4900999841369; Mon, 17 May 2021 02:50:38 -0700 (PDT) Received: from localhost ([::1]:56788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liZtV-00086p-1F for importer@patchew.org; Mon, 17 May 2021 05:50:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1liZOS-0003er-Dm; Mon, 17 May 2021 05:18:32 -0400 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:38855) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1liZOM-0005yG-NM; Mon, 17 May 2021 05:18:32 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 7DC4E449; Mon, 17 May 2021 05:18:24 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 17 May 2021 05:18:25 -0400 Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 17 May 2021 05:18:22 -0400 (EDT) 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=fm3; bh=EMgjUG4Hjacj0 rUL2PT4bxNaPXhR5+w4MaKi8XavRME=; b=Srn/NZOzo2ZZkU+3LMUic8TaRhi4+ 2PRt23hRbxxoiaZj9sFWmuj+E1RwDbP7gHalrvCVyZhS37wvOOSA3iVIJaSwtQdg hykP6QQ2nDQfNhpSgAWsXQ/N2OtoITjaah4JgU6MGYK0Bl0oTpAwyN+LbqwcAo/t v60jMxrd91n0HG9EwyPls1uvYnVO6ZZ5kksXg4K6VzDq4AR6e171fAhBZN1prvL6 ebR4Mvojlwl6eDlKHBpZq/svofR5T5/cT/JvJaoWrcODyVpr77KvcA/q2KQPbiBz qfmMnQ9JnD3Cny0Z+W//NlfAq1gelJwpLxi5iMVUpF9+Lgs1j4scw/zSg== 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=EMgjUG4Hjacj0rUL2PT4bxNaPXhR5+w4MaKi8XavRME=; b=fm/oFykZ hGWSzUHAU6v+qbl/mdKflcfxyHzMA9ea1Z79YSV8ZKd+73PBwS15d6M0NT4udych S1duOC3Xt5SX28O/4yta05buJ1Iaeml0vASx2XOFc1cRV2bGFBWmPdD3WmwRuZK8 O+nvQb41jqSIUT/hLOSr604sI1TVw9SxkI6pelY7AQxzUuI8e1j6XDSKBRUDakp2 XwvSO1ZIO8zMq0zEJrE0W3mPblqWCVexcZVvxykcwKJDtY3ON+5xs7hUk0Jb+w7B VWj7WCP2hgAsj2MtgmyigQdSPovefl1x6HJh+dNvLW21CqaV8R8T/Yj5lht6tyUr 0y3a8SvPtba7pw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvdeihedgudegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefmlhgruhhs ucflvghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrghtth gvrhhnpeeuleetgeeiuefhgfekfefgveejiefgteekiedtgfdtieefhfdthfefueffvefg keenucfkphepkedtrdduieejrdelkedrudeltdenucevlhhushhtvghrufhiiigvpeegne curfgrrhgrmhepmhgrihhlfhhrohhmpehithhssehirhhrvghlvghvrghnthdrughk X-ME-Proxy: From: Klaus Jensen To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 13/20] hw/block/nvme: replace nvme_ns_status Date: Mon, 17 May 2021 11:17:30 +0200 Message-Id: <20210517091737.841787-14-its@irrelevant.dk> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517091737.841787-1-its@irrelevant.dk> References: <20210517091737.841787-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.24; envelope-from=its@irrelevant.dk; helo=wout1-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, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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 , 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: Klaus Jensen The inline nvme_ns_status() helper only has a single call site. Remove it from the header file and inline it for real. Signed-off-by: Klaus Jensen Reviewed-by: Keith Busch --- hw/block/nvme.h | 5 ----- hw/block/nvme.c | 15 ++++++++------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/hw/block/nvme.h b/hw/block/nvme.h index 2c4e7b90fa54..d9bee7e5a05c 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -137,11 +137,6 @@ typedef struct NvmeNamespace { } features; } NvmeNamespace; =20 -static inline uint16_t nvme_ns_status(NvmeNamespace *ns) -{ - return ns->status; -} - static inline uint32_t nvme_nsid(NvmeNamespace *ns) { if (ns) { diff --git a/hw/block/nvme.c b/hw/block/nvme.c index e7bd22b8b2ed..710af6a7147c 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -3609,8 +3609,8 @@ static uint16_t nvme_zone_mgmt_recv(NvmeCtrl *n, Nvme= Request *req) =20 static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeRequest *req) { + NvmeNamespace *ns; uint32_t nsid =3D le32_to_cpu(req->cmd.nsid); - uint16_t status; =20 trace_pci_nvme_io_cmd(nvme_cid(req), nsid, nvme_sqid(req), req->cmd.opcode, nvme_io_opc_str(req->cmd.opcode= )); @@ -3642,21 +3642,22 @@ static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeReques= t *req) return nvme_flush(n, req); } =20 - req->ns =3D nvme_ns(n, nsid); - if (unlikely(!req->ns)) { + ns =3D nvme_ns(n, nsid); + if (unlikely(!ns)) { return NVME_INVALID_FIELD | NVME_DNR; } =20 - if (!(req->ns->iocs[req->cmd.opcode] & NVME_CMD_EFF_CSUPP)) { + if (!(ns->iocs[req->cmd.opcode] & NVME_CMD_EFF_CSUPP)) { trace_pci_nvme_err_invalid_opc(req->cmd.opcode); return NVME_INVALID_OPCODE | NVME_DNR; } =20 - status =3D nvme_ns_status(req->ns); - if (unlikely(status)) { - return status; + if (ns->status) { + return ns->status; } =20 + req->ns =3D ns; + switch (req->cmd.opcode) { case NVME_CMD_WRITE_ZEROES: return nvme_write_zeroes(n, req); --=20 2.31.1