On Wed, 2020-04-15 at 15:01 +0200, Klaus Jensen wrote: > From: Klaus Jensen <k.jen...@samsung.com> > > Pull the controller memory buffer check to its own function. The check > will be used on its own in later patches. > > Signed-off-by: Klaus Jensen <k.jen...@samsung.com> > Acked-by: Keith Busch <kbu...@kernel.org> > Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > hw/block/nvme.c | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > index 563cccae6795..d026985f62d0 100644 > --- a/hw/block/nvme.c > +++ b/hw/block/nvme.c > @@ -55,14 +55,22 @@ > > static void nvme_process_sq(void *opaque); > > +static bool nvme_addr_is_cmb(NvmeCtrl *n, hwaddr addr) > +{ > + hwaddr low = n->ctrl_mem.addr; > + hwaddr hi = n->ctrl_mem.addr + int128_get64(n->ctrl_mem.size); > + > + return addr >= low && addr < hi; > +} > + > static void nvme_addr_read(NvmeCtrl *n, hwaddr addr, void *buf, int size) > { > - if (n->cmbsz && addr >= n->ctrl_mem.addr && > - addr < (n->ctrl_mem.addr + int128_get64(n->ctrl_mem.size))) { > + if (n->cmbsz && nvme_addr_is_cmb(n, addr)) { > memcpy(buf, (void *)&n->cmbuf[addr - n->ctrl_mem.addr], size); > - } else { > - pci_dma_read(&n->parent_obj, addr, buf, size); > + return; > } > + > + pci_dma_read(&n->parent_obj, addr, buf, size); > } > > static int nvme_check_sqid(NvmeCtrl *n, uint16_t sqid)
Looks like I forgot to add reviewed-by to the patch from V6, but it looks all right after our discussion so, Reviewed-by: Maxim Levitsky <mlevit...@redhat.com> Best regards, Maxim Levitsky