mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/mem/cxl_type3: Improve error handling in realize()

Browse Source 
msix_init_exclusive_bar() can fail, so if it does cleanup the address space.

Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Gregory Price <gregory.price@memverge.com>
Tested-by: Gregory Price <gregory.price@memverge.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Message-Id: <20230206172816.8201-2-Jonathan.Cameron@huawei.com>
Reviewed-by: Fan Ni <fan.ni@samsung.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Jonathan Cameron 2023-02-06 17:28:07 +00:00 committed by Michael S. Tsirkin
parent 3456fedb77
commit de8a7394f0
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/mem/cxl_type3.c
View File

@ -401,7 +401,7 @@ static void ct3_realize(PCIDevice *pci_dev, Error **errp)
MemoryRegion *mr = &regs->component_registers; MemoryRegion *mr = &regs->component_registers;
uint8_t *pci_conf = pci_dev->config; uint8_t *pci_conf = pci_dev->config;
unsigned short msix_num = 1; unsigned short msix_num = 1;
int i; int i, rc;
if (!cxl_setup_memory(ct3d, errp)) { if (!cxl_setup_memory(ct3d, errp)) {
return; return;
@ -438,7 +438,10 @@ static void ct3_realize(PCIDevice *pci_dev, Error **errp)
&ct3d->cxl_dstate.device_registers); &ct3d->cxl_dstate.device_registers);
/* MSI(-X) Initailization */ /* MSI(-X) Initailization */
msix_init_exclusive_bar(pci_dev, msix_num, 4, NULL); rc = msix_init_exclusive_bar(pci_dev, msix_num, 4, NULL);
if (rc) {
goto err_address_space_free;
}
for (i = 0; i < msix_num; i++) { for (i = 0; i < msix_num; i++) {
msix_vector_use(pci_dev, i); msix_vector_use(pci_dev, i);
} }
@ -450,6 +453,11 @@ static void ct3_realize(PCIDevice *pci_dev, Error **errp)
cxl_cstate->cdat.free_cdat_table = ct3_free_cdat_table; cxl_cstate->cdat.free_cdat_table = ct3_free_cdat_table;
cxl_cstate->cdat.private = ct3d; cxl_cstate->cdat.private = ct3d;
cxl_doe_cdat_init(cxl_cstate, errp); cxl_doe_cdat_init(cxl_cstate, errp);
return;
err_address_space_free:
address_space_destroy(&ct3d->hostmem_as);
return;
} }
static void ct3_exit(PCIDevice *pci_dev) static void ct3_exit(PCIDevice *pci_dev)