SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/block/nvme: streamline namespace array indexing

Browse Source 
Streamline namespace array indexing such that both the subsystem and
controller namespaces arrays are 1-indexed.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
This commit is contained in:
Klaus Jensen 2021-04-14 21:40:40 +02:00
parent 3ef73f9462
commit 72ea5c2c20
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/block/nvme.c
View File

@ -4990,7 +4990,7 @@ static uint16_t nvme_ns_attachment(NvmeCtrl *n, NvmeRequest *req)
return NVME_NS_NOT_ATTACHED | NVME_DNR; return NVME_NS_NOT_ATTACHED | NVME_DNR;
} }
ctrl->namespaces[nsid - 1] = NULL; ctrl->namespaces[nsid] = NULL;
ns->attached--; ns->attached--;
nvme_update_dmrsl(ctrl); nvme_update_dmrsl(ctrl);
@ -6163,7 +6163,7 @@ void nvme_attach_ns(NvmeCtrl *n, NvmeNamespace *ns)
uint32_t nsid = ns->params.nsid; uint32_t nsid = ns->params.nsid;
assert(nsid && nsid <= NVME_MAX_NAMESPACES); assert(nsid && nsid <= NVME_MAX_NAMESPACES);
n->namespaces[nsid - 1] = ns; n->namespaces[nsid] = ns;
ns->attached++; ns->attached++;
n->dmrsl = MIN_NON_ZERO(n->dmrsl, n->dmrsl = MIN_NON_ZERO(n->dmrsl,

4
hw/block/nvme.h
View File

@ -438,7 +438,7 @@ typedef struct NvmeCtrl {
NvmeSubsystem *subsys; NvmeSubsystem *subsys;
NvmeNamespace namespace; NvmeNamespace namespace;
NvmeNamespace *namespaces[NVME_MAX_NAMESPACES]; NvmeNamespace *namespaces[NVME_MAX_NAMESPACES + 1];
NvmeSQueue **sq; NvmeSQueue **sq;
NvmeCQueue **cq; NvmeCQueue **cq;
NvmeSQueue admin_sq; NvmeSQueue admin_sq;
@ -460,7 +460,7 @@ static inline NvmeNamespace *nvme_ns(NvmeCtrl *n, uint32_t nsid)
return NULL; return NULL;
} }
return n->namespaces[nsid - 1]; return n->namespaces[nsid];
} }
static inline NvmeCQueue *nvme_cq(NvmeRequest *req) static inline NvmeCQueue *nvme_cq(NvmeRequest *req)