On Jul 3 10:34, Philippe Mathieu-Daudé wrote: > On 7/3/20 8:34 AM, Klaus Jensen wrote: > > From: Klaus Jensen <k.jen...@samsung.com> > > > > Fix a missing cpu_to conversion. > > > > Signed-off-by: Klaus Jensen <k.jen...@samsung.com> > > Reviewed-by: Dmitry Fomichev <dmitry.fomic...@wdc.com> > > --- > > hw/block/nvme.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > > index f3a5b857bc92..ba523f6768bf 100644 > > --- a/hw/block/nvme.c > > +++ b/hw/block/nvme.c > > @@ -1080,7 +1080,7 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd > > *cmd, NvmeRequest *req) > > > > break; > > case NVME_VOLATILE_WRITE_CACHE: > > - result = blk_enable_write_cache(n->conf.blk); > > + result = cpu_to_le32(blk_enable_write_cache(n->conf.blk)); > > trace_pci_nvme_getfeat_vwcache(result ? "enabled" : "disabled"); > > break; > > case NVME_NUMBER_OF_QUEUES: > > > > This doesn't look correct. What you probably want: > > -- >8 -- > > --- a/hw/block/nvme.c > +++ b/hw/block/nvme.c > @@ -815,8 +815,8 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, > NvmeCmd *cmd, NvmeRequest *req) > trace_pci_nvme_getfeat_vwcache(result ? "enabled" : "disabled"); > break; > case NVME_NUMBER_OF_QUEUES: > - result = cpu_to_le32((n->params.max_ioqpairs - 1) | > - ((n->params.max_ioqpairs - 1) << 16)); > + result = (n->params.max_ioqpairs - 1) > + | ((n->params.max_ioqpairs - 1) << 16); > trace_pci_nvme_getfeat_numq(result); > break; > case NVME_TIMESTAMP: > @@ -825,8 +825,8 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, > NvmeCmd *cmd, NvmeRequest *req) > trace_pci_nvme_err_invalid_getfeat(dw10); > return NVME_INVALID_FIELD | NVME_DNR; > } > + req->cqe.result = cpu_to_le32(result); > > - req->cqe.result = result; > return NVME_SUCCESS; > } > --- >
I replaced this patch with a new one earlier in the series that does what you suggest and then let the change trickle down to other patches that add feature cases.