Re: [PATCH v3 15/16] nvme: factor out cmb/pmr setup

[Philippe Mathieu-Daudé]

On 4/22/20 9:09 AM, Klaus Jensen wrote:
> From: Klaus Jensen <address@hidden>
>
> Signed-off-by: Klaus Jensen <address@hidden>
> ---
>   hw/block/nvme.c | 146 ++++++++++++++++++++++++++----------------------
>   1 file changed, 79 insertions(+), 67 deletions(-)
>
> diff --git a/hw/block/nvme.c b/hw/block/nvme.c
> index 5dddb97a7394..bc4f6b20045b 100644
> --- a/hw/block/nvme.c
> +++ b/hw/block/nvme.c
> @@ -57,6 +57,7 @@
>   
>   #define NVME_REG_SIZE 0x1000
>   #define NVME_DB_SIZE  4
> +#define NVME_CMB_BIR 2
>   
>   #define NVME_GUEST_ERR(trace, fmt, ...) \
>       do { \
> @@ -1436,6 +1437,78 @@ static void nvme_init_namespace(NvmeCtrl *n, 
> NvmeNamespace *ns, Error **errp)
>       id_ns->nuse = id_ns->ncap;
>   }
[...]
>   static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev)
>   {
>       uint8_t *pci_conf = pci_dev->config;
> @@ -1450,6 +1523,12 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice 
> *pci_dev)
>       pci_register_bar(pci_dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY |
>                        PCI_BASE_ADDRESS_MEM_TYPE_64, &n->iomem);
>       msix_init_exclusive_bar(pci_dev, n->params.max_ioqpairs + 1, 4, NULL);
> +
> +    if (n->params.cmb_size_mb) {
> +        nvme_init_cmb(n, pci_dev);
> +    } else if (n->pmrdev) {
> +        nvme_init_pmr(n, pci_dev);

Why not splitting this in 2 trivial patches? The easiest a patch is to 
review, the less likely bug can be missed. Here I'm scrolling over 2 
different blocks so to feel confident I'm not missing something I'd have 
to manually edit and re-do your patch.

> +    }
>   }
>   
[...]