Re: [PATCH V4 2/6] hw/block/nvme: support to map controller to a subsystem

[Keith Busch]

On Fri, Jan 22, 2021 at 07:09:04AM +0900, Minwoo Im wrote:
> --- a/hw/block/nvme.c
> +++ b/hw/block/nvme.c
> @@ -23,6 +23,7 @@
>   *              max_ioqpairs=<N[optional]>, \
>   *              aerl=<N[optional]>, aer_max_queued=<N[optional]>, \
>   *              mdts=<N[optional]>,zoned.append_size_limit=<N[optional]> \
> + *              ,subsys=<subsys_id> \

For consistency, the ',' goes in the preceeding line.

>   *      -device nvme-ns,drive=<drive_id>,bus=<bus_name>,nsid=<nsid>,\
>   *              zoned=<true|false[optional]>
>   *      -device nvme-subsys,id=<subsys_id>

> @@ -4404,11 +4412,25 @@ static int nvme_init_pci(NvmeCtrl *n, PCIDevice 
> *pci_dev, Error **errp)
>      return 0;
>  }
>  
> +static void nvme_init_subnqn(NvmeCtrl *n)
> +{
> +    NvmeSubsystem *subsys = n->subsys;
> +    NvmeIdCtrl *id = &n->id_ctrl;
> +    char *subnqn;
> +
> +    if (!subsys) {
> +        subnqn = g_strdup_printf("nqn.2019-08.org.qemu:%s", 
> n->params.serial);
> +        strpadcpy((char *)id->subnqn, sizeof(id->subnqn), subnqn, '\0');
> +        g_free(subnqn);

    snprintf(id->subnqn, sizeof(id->subnqn), "nqn.2019-08.org.qemu:%s", 
n->params.serial);

> +    } else {
> +        pstrcpy((char *)id->subnqn, sizeof(id->subnqn), 
> (char*)subsys->subnqn);
> +    }
> +}