openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hw/block/nvme: remove num_namespaces member 

The NvmeCtrl num_namespaces member is just an indirection for the
NVME_MAX_NAMESPACES constant.

Remove the indirection.

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:46:00 +02:00
parent 72ea5c2c20
commit 9d394c80f1
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/block/nvme.c
View File

@ -393,7 +393,8 @@ static int nvme_addr_write(NvmeCtrl *n, hwaddr addr, void *buf, int size)
static bool nvme_nsid_valid(NvmeCtrl *n, uint32_t nsid) static bool nvme_nsid_valid(NvmeCtrl *n, uint32_t nsid)
{ {
return nsid && (nsid == NVME_NSID_BROADCAST || nsid <= n->num_namespaces); return nsid &&
(nsid == NVME_NSID_BROADCAST || nsid <= NVME_MAX_NAMESPACES);
} }
static int nvme_check_sqid(NvmeCtrl *n, uint16_t sqid) static int nvme_check_sqid(NvmeCtrl *n, uint16_t sqid)
@ -2882,7 +2883,7 @@ static uint16_t nvme_flush(NvmeCtrl *n, NvmeRequest *req)
/* 1-initialize; see comment in nvme_dsm */ /* 1-initialize; see comment in nvme_dsm */
*num_flushes = 1; *num_flushes = 1;
for (int i = 1; i <= n->num_namespaces; i++) { for (int i = 1; i <= NVME_MAX_NAMESPACES; i++) {
ns = nvme_ns(n, i); ns = nvme_ns(n, i);
if (!ns) { if (!ns) {
continue; continue;
@ -3850,7 +3851,7 @@ static uint16_t nvme_smart_info(NvmeCtrl *n, uint8_t rae, uint32_t buf_len,
} else { } else {
int i; int i;
for (i = 1; i <= n->num_namespaces; i++) { for (i = 1; i <= NVME_MAX_NAMESPACES; i++) {
ns = nvme_ns(n, i); ns = nvme_ns(n, i);
if (!ns) { if (!ns) {
continue; continue;
@ -4347,7 +4348,7 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeRequest *req,
return NVME_INVALID_NSID | NVME_DNR; return NVME_INVALID_NSID | NVME_DNR;
} }
for (i = 1; i <= n->num_namespaces; i++) { for (i = 1; i <= NVME_MAX_NAMESPACES; i++) {
ns = nvme_ns(n, i); ns = nvme_ns(n, i);
if (!ns) { if (!ns) {
if (!active) { if (!active) {
@ -4395,7 +4396,7 @@ static uint16_t nvme_identify_nslist_csi(NvmeCtrl *n, NvmeRequest *req,
return NVME_INVALID_FIELD | NVME_DNR; return NVME_INVALID_FIELD | NVME_DNR;
} }
for (i = 1; i <= n->num_namespaces; i++) { for (i = 1; i <= NVME_MAX_NAMESPACES; i++) {
ns = nvme_ns(n, i); ns = nvme_ns(n, i);
if (!ns) { if (!ns) {
if (!active) { if (!active) {
@ -4661,7 +4662,7 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeRequest *req)
goto out; goto out;
case NVME_VOLATILE_WRITE_CACHE: case NVME_VOLATILE_WRITE_CACHE:
result = 0; result = 0;
for (i = 1; i <= n->num_namespaces; i++) { for (i = 1; i <= NVME_MAX_NAMESPACES; i++) {
ns = nvme_ns(n, i); ns = nvme_ns(n, i);
if (!ns) { if (!ns) {
continue; continue;
@ -4808,7 +4809,7 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeRequest *req)
break; break;
case NVME_ERROR_RECOVERY: case NVME_ERROR_RECOVERY:
if (nsid == NVME_NSID_BROADCAST) { if (nsid == NVME_NSID_BROADCAST) {
for (i = 1; i <= n->num_namespaces; i++) { for (i = 1; i <= NVME_MAX_NAMESPACES; i++) {
ns = nvme_ns(n, i); ns = nvme_ns(n, i);
if (!ns) { if (!ns) {
@ -4829,7 +4830,7 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeRequest *req)
} }
break; break;
case NVME_VOLATILE_WRITE_CACHE: case NVME_VOLATILE_WRITE_CACHE:
for (i = 1; i <= n->num_namespaces; i++) { for (i = 1; i <= NVME_MAX_NAMESPACES; i++) {
ns = nvme_ns(n, i); ns = nvme_ns(n, i);
if (!ns) { if (!ns) {
continue; continue;
@ -5122,7 +5123,7 @@ static uint16_t nvme_format(NvmeCtrl *n, NvmeRequest *req)
req->status = status; req->status = status;
} }
} else { } else {
for (i = 1; i <= n->num_namespaces; i++) { for (i = 1; i <= NVME_MAX_NAMESPACES; i++) {
ns = nvme_ns(n, i); ns = nvme_ns(n, i);
if (!ns) { if (!ns) {
continue; continue;
@ -5233,7 +5234,7 @@ static void nvme_ctrl_reset(NvmeCtrl *n)
NvmeNamespace *ns; NvmeNamespace *ns;
int i; int i;
for (i = 1; i <= n->num_namespaces; i++) { for (i = 1; i <= NVME_MAX_NAMESPACES; i++) {
ns = nvme_ns(n, i); ns = nvme_ns(n, i);
if (!ns) { if (!ns) {
continue; continue;
@ -5275,7 +5276,7 @@ static void nvme_ctrl_shutdown(NvmeCtrl *n)
memory_region_msync(&n->pmr.dev->mr, 0, n->pmr.dev->size); memory_region_msync(&n->pmr.dev->mr, 0, n->pmr.dev->size);
} }
for (i = 1; i <= n->num_namespaces; i++) { for (i = 1; i <= NVME_MAX_NAMESPACES; i++) {
ns = nvme_ns(n, i); ns = nvme_ns(n, i);
if (!ns) { if (!ns) {
continue; continue;
@ -5290,7 +5291,7 @@ static void nvme_select_iocs(NvmeCtrl *n)
NvmeNamespace *ns; NvmeNamespace *ns;
int i; int i;
for (i = 1; i <= n->num_namespaces; i++) { for (i = 1; i <= NVME_MAX_NAMESPACES; i++) {
ns = nvme_ns(n, i); ns = nvme_ns(n, i);
if (!ns) { if (!ns) {
continue; continue;
@ -5917,7 +5918,6 @@ static void nvme_check_constraints(NvmeCtrl *n, Error **errp)
static void nvme_init_state(NvmeCtrl *n) static void nvme_init_state(NvmeCtrl *n)
{ {
n->num_namespaces = NVME_MAX_NAMESPACES;
/* add one to max_ioqpairs to account for the admin queue pair */ /* add one to max_ioqpairs to account for the admin queue pair */
n->reg_size = pow2ceil(sizeof(NvmeBar) + n->reg_size = pow2ceil(sizeof(NvmeBar) +
2 * (n->params.max_ioqpairs + 1) * NVME_DB_SIZE); 2 * (n->params.max_ioqpairs + 1) * NVME_DB_SIZE);
@ -6098,7 +6098,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev)
id->sqes = (0x6 << 4) | 0x6; id->sqes = (0x6 << 4) | 0x6;
id->cqes = (0x4 << 4) | 0x4; id->cqes = (0x4 << 4) | 0x4;
id->nn = cpu_to_le32(n->num_namespaces); id->nn = cpu_to_le32(NVME_MAX_NAMESPACES);
id->oncs = cpu_to_le16(NVME_ONCS_WRITE_ZEROES | NVME_ONCS_TIMESTAMP | id->oncs = cpu_to_le16(NVME_ONCS_WRITE_ZEROES | NVME_ONCS_TIMESTAMP |
NVME_ONCS_FEATURES | NVME_ONCS_DSM | NVME_ONCS_FEATURES | NVME_ONCS_DSM |
NVME_ONCS_COMPARE | NVME_ONCS_COPY); NVME_ONCS_COMPARE | NVME_ONCS_COPY);
@ -6217,7 +6217,7 @@ static void nvme_exit(PCIDevice *pci_dev)
nvme_ctrl_reset(n); nvme_ctrl_reset(n);
for (i = 1; i <= n->num_namespaces; i++) { for (i = 1; i <= NVME_MAX_NAMESPACES; i++) {
ns = nvme_ns(n, i); ns = nvme_ns(n, i);
if (!ns) { if (!ns) {
continue; continue;

1
hw/block/nvme.h
View File

@ -401,7 +401,6 @@ typedef struct NvmeCtrl {
uint16_t cqe_size; uint16_t cqe_size;
uint16_t sqe_size; uint16_t sqe_size;
uint32_t reg_size; uint32_t reg_size;
uint32_t num_namespaces;
uint32_t max_q_ents; uint32_t max_q_ents;
uint8_t outstanding_aers; uint8_t outstanding_aers;
uint32_t irq_status; uint32_t irq_status;