| Message ID | 20200316142928.153431-7-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:28 -0700, Klaus Jensen wrote: > From: Klaus Jensen <k.jensen@samsung.com> > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > --- > hw/block/nvme.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > index f716f690a594..b38d7e548a60 100644 > --- a/hw/block/nvme.c > +++ b/hw/block/nvme.c > @@ -709,11 +709,11 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeCmd *cmd) > NvmeIdentify *c = (NvmeIdentify *)cmd; > > switch (le32_to_cpu(c->cns)) { > - case 0x00: > + case NVME_ID_CNS_NS: > return nvme_identify_ns(n, c); > - case 0x01: > + case NVME_ID_CNS_CTRL: > return nvme_identify_ctrl(n, c); > - case 0x02: > + case NVME_ID_CNS_NS_ACTIVE_LIST: > return nvme_identify_nslist(n, c); > default: > trace_nvme_dev_err_invalid_identify_cns(le32_to_cpu(c->cns)); This is a very good candidate to be squished with the patch 5 IMHO, but you can leave this as is as well. I don't mind. Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> Best regards, Maxim Levitsky
On Mar 25 12:37, Maxim Levitsky wrote: > On Mon, 2020-03-16 at 07:28 -0700, Klaus Jensen wrote: > > From: Klaus Jensen <k.jensen@samsung.com> > > > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > > --- > > hw/block/nvme.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > > index f716f690a594..b38d7e548a60 100644 > > --- a/hw/block/nvme.c > > +++ b/hw/block/nvme.c > > @@ -709,11 +709,11 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeCmd *cmd) > > NvmeIdentify *c = (NvmeIdentify *)cmd; > > > > switch (le32_to_cpu(c->cns)) { > > - case 0x00: > > + case NVME_ID_CNS_NS: > > return nvme_identify_ns(n, c); > > - case 0x01: > > + case NVME_ID_CNS_CTRL: > > return nvme_identify_ctrl(n, c); > > - case 0x02: > > + case NVME_ID_CNS_NS_ACTIVE_LIST: > > return nvme_identify_nslist(n, c); > > default: > > trace_nvme_dev_err_invalid_identify_cns(le32_to_cpu(c->cns)); > > This is a very good candidate to be squished with the patch 5 IMHO, > but you can leave this as is as well. I don't mind. > Squashed! > Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> > > Best regards, > Maxim Levitsky > > > > > >
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index f716f690a594..b38d7e548a60 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -709,11 +709,11 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeCmd *cmd) NvmeIdentify *c = (NvmeIdentify *)cmd; switch (le32_to_cpu(c->cns)) { - case 0x00: + case NVME_ID_CNS_NS: return nvme_identify_ns(n, c); - case 0x01: + case NVME_ID_CNS_CTRL: return nvme_identify_ctrl(n, c); - case 0x02: + case NVME_ID_CNS_NS_ACTIVE_LIST: return nvme_identify_nslist(n, c); default: trace_nvme_dev_err_invalid_identify_cns(le32_to_cpu(c->cns));