Message ID | 20200316142928.153431-38-its@irrelevant.dk |
---|---|
State | New |
Headers | show |
Series | nvme: support NVMe v1.3d, SGLs and multiple namespaces | expand |
On Mon, 2020-03-16 at 07:29 -0700, Klaus Jensen wrote: > From: Klaus Jensen <k.jensen@samsung.com> > > Prepare to support inactive namespaces. > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > --- > hw/block/nvme.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > index b89b96990f52..bf9fb500842a 100644 > --- a/hw/block/nvme.c > +++ b/hw/block/nvme.c > @@ -1505,16 +1505,16 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeIdentify *c, > uint32_t min_nsid = le32_to_cpu(c->nsid); > uint32_t *list; > uint16_t ret; > - int i, j = 0; > + int j = 0; > > trace_nvme_dev_identify_nslist(min_nsid); > > list = g_malloc0(data_len); > - for (i = 0; i < n->num_namespaces; i++) { > - if (i < min_nsid) { > + for (int i = 1; i <= n->num_namespaces; i++) { > + if (i <= min_nsid) { > continue; > } > - list[j++] = cpu_to_le32(i + 1); > + list[j++] = cpu_to_le32(i); > if (j == data_len / sizeof(uint32_t)) { > break; > } Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> Best regards, Maxim Levitsky
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index b89b96990f52..bf9fb500842a 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1505,16 +1505,16 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeIdentify *c, uint32_t min_nsid = le32_to_cpu(c->nsid); uint32_t *list; uint16_t ret; - int i, j = 0; + int j = 0; trace_nvme_dev_identify_nslist(min_nsid); list = g_malloc0(data_len); - for (i = 0; i < n->num_namespaces; i++) { - if (i < min_nsid) { + for (int i = 1; i <= n->num_namespaces; i++) { + if (i <= min_nsid) { continue; } - list[j++] = cpu_to_le32(i + 1); + list[j++] = cpu_to_le32(i); if (j == data_len / sizeof(uint32_t)) { break; }