[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/14] hw/block/nvme: replace nvme_ns_status
From: |
Klaus Jensen |
Subject: |
[PATCH 07/14] hw/block/nvme: replace nvme_ns_status |
Date: |
Mon, 19 Apr 2021 21:27:54 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
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 <k.jensen@samsung.com>
---
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;
-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 2c0af579e7a8..bcef6038ae09 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -3594,8 +3594,8 @@ static uint16_t nvme_zone_mgmt_recv(NvmeCtrl *n,
NvmeRequest *req)
static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeRequest *req)
{
+ NvmeNamespace *ns;
uint32_t nsid = le32_to_cpu(req->cmd.nsid);
- uint16_t status;
trace_pci_nvme_io_cmd(nvme_cid(req), nsid, nvme_sqid(req),
req->cmd.opcode, nvme_io_opc_str(req->cmd.opcode));
@@ -3627,21 +3627,22 @@ static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeRequest
*req)
return nvme_flush(n, req);
}
- req->ns = nvme_ns(n, nsid);
- if (unlikely(!req->ns)) {
+ ns = nvme_ns(n, nsid);
+ if (unlikely(!ns)) {
return NVME_INVALID_FIELD | NVME_DNR;
}
- 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;
}
- status = nvme_ns_status(req->ns);
- if (unlikely(status)) {
- return status;
+ if (ns->status) {
+ return ns->status;
}
+ req->ns = ns;
+
switch (req->cmd.opcode) {
case NVME_CMD_WRITE_ZEROES:
return nvme_write_zeroes(n, req);
--
2.31.1
- [PATCH 00/14] hw(/block/)nvme: spring cleaning, Klaus Jensen, 2021/04/19
- [PATCH 01/14] hw/block/nvme: rename __nvme_zrm_open, Klaus Jensen, 2021/04/19
- [PATCH 02/14] hw/block/nvme: rename __nvme_advance_zone_wp, Klaus Jensen, 2021/04/19
- [PATCH 03/14] hw/block/nvme: rename __nvme_select_ns_iocs, Klaus Jensen, 2021/04/19
- [PATCH 07/14] hw/block/nvme: replace nvme_ns_status,
Klaus Jensen <=
- [PATCH 05/14] hw/block/nvme: cleanup includes, Klaus Jensen, 2021/04/19
- [PATCH 04/14] hw/block/nvme: consolidate header files, Klaus Jensen, 2021/04/19
- [PATCH 06/14] hw/block/nvme: remove non-shared defines from header file, Klaus Jensen, 2021/04/19
- [PATCH 10/14] hw/block/nvme: streamline namespace array indexing, Klaus Jensen, 2021/04/19
- [PATCH 08/14] hw/block/nvme: cache lba and ms sizes, Klaus Jensen, 2021/04/19
- [PATCH 12/14] hw/block/nvme: remove irrelevant zone resource checks, Klaus Jensen, 2021/04/19
- [PATCH 11/14] hw/block/nvme: remove num_namespaces member, Klaus Jensen, 2021/04/19
- [PATCH 13/14] hw/block/nvme: move zoned constraints checks, Klaus Jensen, 2021/04/19
- [PATCH 09/14] hw/block/nvme: add metadata offset helper, Klaus Jensen, 2021/04/19
- [PATCH 14/14] hw/nvme: move nvme emulation out of hw/block, Klaus Jensen, 2021/04/19