Commit 1c0c2163 authored by Klaus Jensen's avatar Klaus Jensen Committed by Kevin Wolf
Browse files

hw/block/nvme: verify msix_init_exclusive_bar() return value 



Pass an Error to msix_init_exclusive_bar() and check it.

Signed-off-by: default avatarKlaus Jensen <k.jensen@samsung.com>
Message-Id: <20200609190333.59390-23-its@irrelevant.dk>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 6a25a4b4

hw/block/nvme.c

+10 −3
Original line number Diff line number Diff line
@@ -1522,7 +1522,7 @@ static void nvme_init_pmr(NvmeCtrl *n, PCIDevice *pci_dev) 
                     PCI_BASE_ADDRESS_MEM_PREFETCH, &n->pmrdev->mr);

}



static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev)

static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp)

{

    uint8_t *pci_conf = pci_dev->config;
@@ -1535,7 +1535,9 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev) 
                          n->reg_size);

    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.msix_qsize, 4, NULL);

    if (msix_init_exclusive_bar(pci_dev, n->params.msix_qsize, 4, errp)) {

        return;

    }



    if (n->params.cmb_size_mb) {

        nvme_init_cmb(n, pci_dev);
@@ -1603,7 +1605,12 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) 
        return;

    }



    nvme_init_pci(n, pci_dev);

    nvme_init_pci(n, pci_dev, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        return;

    }



    nvme_init_ctrl(n, pci_dev);



    for (i = 0; i < n->num_namespaces; i++) {