Re: [PATCH V4 4/6] hw/block/nvme: support for multi-controller in subsystem

[Keith Busch]

On Fri, Jan 22, 2021 at 07:09:06AM +0900, Minwoo Im wrote:
> -static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev)
> +static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev, uint16_t cntlid)
>  {
>      NvmeIdCtrl *id = &n->id_ctrl;
>      uint8_t *pci_conf = pci_dev->config;
>  
> +    n->cntlid = cntlid;

I don't think 'cntlid' is important enough to be a function parameter.
You can just set it within the 'NvmeCtrl' struct before calling this
function like all the other properties.

> @@ -4517,7 +4543,11 @@ static void nvme_realize(PCIDevice *pci_dev, Error 
> **errp)
>          return;
>      }
>  
> -    nvme_init_ctrl(n, pci_dev);
> +    cntlid = nvme_init_subsys(n, errp);
> +    if (cntlid < 0) {

    error_propogate();

> +        return;
> +    }
> +    nvme_init_ctrl(n, pci_dev, cntlid);