ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/nvme: cleanup error reporting in nvme_init_pci() 

Replace the local Error variable with errp and ERRP_GUARD() and change
the return value to bool.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
This commit is contained in:
Klaus Jensen 2022-11-09 11:40:16 +01:00
parent 784fd35387
commit 973f76cf77
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/nvme/ctrl.c
View File

@ -7290,15 +7290,14 @@ static int nvme_add_pm_capability(PCIDevice *pci_dev, uint8_t offset)
return 0; return 0;
} }
static int nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp) static bool nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp)
{ {
ERRP_GUARD();
uint8_t *pci_conf = pci_dev->config; uint8_t *pci_conf = pci_dev->config;
uint64_t bar_size; uint64_t bar_size;
unsigned msix_table_offset, msix_pba_offset; unsigned msix_table_offset, msix_pba_offset;
int ret; int ret;
Error *err = NULL;
pci_conf[PCI_INTERRUPT_PIN] = 1; pci_conf[PCI_INTERRUPT_PIN] = 1;
pci_config_set_prog_interface(pci_conf, 0x2); pci_config_set_prog_interface(pci_conf, 0x2);
@ -7335,14 +7334,14 @@ static int nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp)
} }
ret = msix_init(pci_dev, n->params.msix_qsize, ret = msix_init(pci_dev, n->params.msix_qsize,
&n->bar0, 0, msix_table_offset, &n->bar0, 0, msix_table_offset,
&n->bar0, 0, msix_pba_offset, 0, &err); &n->bar0, 0, msix_pba_offset, 0, errp);
if (ret < 0) {
if (ret == -ENOTSUP) { if (ret == -ENOTSUP) {
warn_report_err(err); /* report that msix is not supported, but do not error out */
} else { warn_report_err(*errp);
error_propagate(errp, err); *errp = NULL;
return ret; } else if (ret < 0) {
} /* propagate error to caller */
return false;
} }
nvme_update_msixcap_ts(pci_dev, n->conf_msix_qsize); nvme_update_msixcap_ts(pci_dev, n->conf_msix_qsize);
@ -7359,7 +7358,7 @@ static int nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp)
nvme_init_sriov(n, pci_dev, 0x120); nvme_init_sriov(n, pci_dev, 0x120);
} }
return 0; return true;
} }
static void nvme_init_subnqn(NvmeCtrl *n) static void nvme_init_subnqn(NvmeCtrl *n)
@ -7535,7 +7534,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
return; return;
} }
nvme_init_state(n); nvme_init_state(n);
if (nvme_init_pci(n, pci_dev, errp)) { if (!nvme_init_pci(n, pci_dev, errp)) {
return; return;
} }
nvme_init_ctrl(n, pci_dev); nvme_init_ctrl(n, pci_dev);