[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 09/16] nvme: factor out property/constraint checks
From: |
Maxim Levitsky |
Subject: |
Re: [PATCH v2 09/16] nvme: factor out property/constraint checks |
Date: |
Tue, 21 Apr 2020 17:53:30 +0300 |
On Wed, 2020-04-15 at 15:01 +0200, Klaus Jensen wrote:
> From: Klaus Jensen <address@hidden>
>
> Signed-off-by: Klaus Jensen <address@hidden>
> ---
> hw/block/nvme.c | 43 ++++++++++++++++++++++++++++---------------
> 1 file changed, 28 insertions(+), 15 deletions(-)
>
> diff --git a/hw/block/nvme.c b/hw/block/nvme.c
> index 44856e873fd1..5f9ebbd6a1d5 100644
> --- a/hw/block/nvme.c
> +++ b/hw/block/nvme.c
> @@ -1311,24 +1311,19 @@ static const MemoryRegionOps nvme_cmb_ops = {
> },
> };
>
> -static void nvme_realize(PCIDevice *pci_dev, Error **errp)
> +static void nvme_check_constraints(NvmeCtrl *n, Error **errp)
> {
> - NvmeCtrl *n = NVME(pci_dev);
> - NvmeIdCtrl *id = &n->id_ctrl;
> + NvmeParams *params = &n->params;
>
> - int i;
> - int64_t bs_size;
> - uint8_t *pci_conf;
> -
> - if (n->params.num_queues) {
> + if (params->num_queues) {
> warn_report("num_queues is deprecated; please use max_ioqpairs "
> "instead");
>
> - n->params.max_ioqpairs = n->params.num_queues - 1;
> + params->max_ioqpairs = params->num_queues - 1;
> }
>
> - if (n->params.max_ioqpairs < 1 ||
> - n->params.max_ioqpairs > PCI_MSIX_FLAGS_QSIZE) {
> + if (params->max_ioqpairs < 1 ||
> + params->max_ioqpairs > PCI_MSIX_FLAGS_QSIZE) {
> error_setg(errp, "max_ioqpairs must be between 1 and %d",
> PCI_MSIX_FLAGS_QSIZE);
> return;
> @@ -1339,16 +1334,34 @@ static void nvme_realize(PCIDevice *pci_dev, Error
> **errp)
> return;
> }
>
> + if (!params->serial) {
> + error_setg(errp, "serial property not set");
> + return;
> + }
> +}
> +
> +static void nvme_realize(PCIDevice *pci_dev, Error **errp)
> +{
> + NvmeCtrl *n = NVME(pci_dev);
> + NvmeIdCtrl *id = &n->id_ctrl;
> + Error *err = NULL;
Yep, lets name it indeed local_err.
> +
> + int i;
> + int64_t bs_size;
> + uint8_t *pci_conf;
> +
> + nvme_check_constraints(n, &err);
> + if (err) {
> + error_propagate(errp, err);
> + return;
> + }
> +
> bs_size = blk_getlength(n->conf.blk);
> if (bs_size < 0) {
> error_setg(errp, "could not get backing file size");
> return;
> }
>
> - if (!n->params.serial) {
> - error_setg(errp, "serial property not set");
> - return;
> - }
> blkconf_blocksizes(&n->conf);
> if (!blkconf_apply_backend_options(&n->conf,
> blk_is_read_only(n->conf.blk),
> false, errp)) {
Reviewed-by: Maxim Levitsky <address@hidden>
Best regards,
Maxim Levitsky
- Re: [PATCH v2 01/16] nvme: fix pci doorbell size calculation, (continued)
- [PATCH v2 06/16] nvme: refactor nvme_addr_read, Klaus Jensen, 2020/04/15
- [PATCH v2 04/16] nvme: move device parameters to separate struct, Klaus Jensen, 2020/04/15
- [PATCH v2 08/16] nvme: remove redundant cmbloc/cmbsz members, Klaus Jensen, 2020/04/15
- [PATCH v2 10/16] nvme: factor out device state setup, Klaus Jensen, 2020/04/15
- [PATCH v2 09/16] nvme: factor out property/constraint checks, Klaus Jensen, 2020/04/15
- [PATCH v2 05/16] nvme: use constants in identify, Klaus Jensen, 2020/04/15
- [PATCH v2 07/16] nvme: add max_ioqpairs device parameter, Klaus Jensen, 2020/04/15
- [PATCH v2 03/16] nvme: remove superfluous breaks, Klaus Jensen, 2020/04/15
- [PATCH v2 02/16] nvme: rename trace events to pci_nvme, Klaus Jensen, 2020/04/15
- [PATCH v2 13/16] nvme: factor out namespace setup, Klaus Jensen, 2020/04/15