[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/10] xen/pt: Check for return values for xen_ho
From: |
Konrad Rzeszutek Wilk |
Subject: |
[Qemu-devel] [PATCH v2 09/10] xen/pt: Check for return values for xen_host_pci_[get|set] in init |
Date: |
Tue, 8 Sep 2015 10:10:01 -0400 |
and if we have failures we call xen_pt_destroy introduced in
'xen/pt: Move bulk of xen_pt_unregister_device in its own routine.'
and free all of the allocated structures.
Acked-by: Stefano Stabellini <address@hidden>
Signed-off-by: Konrad Rzeszutek Wilk <address@hidden>
---
hw/xen/xen_pt.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
index 5a49a86..80b687f 100644
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -774,10 +774,11 @@ static int xen_pt_initfn(PCIDevice *d)
}
/* Initialize virtualized PCI configuration (Extended 256 Bytes) */
- if (xen_host_pci_get_block(&s->real_device, 0, d->config,
- PCI_CONFIG_SPACE_SIZE) < 0) {
- xen_host_pci_device_put(&s->real_device);
- return -1;
+ rc = xen_host_pci_get_block(&s->real_device, 0, d->config,
+ PCI_CONFIG_SPACE_SIZE);
+ if (rc < 0) {
+ XEN_PT_ERR(d,"Could not read PCI_CONFIG space! (rc:%d)\n", rc);
+ goto err_out;
}
s->memory_listener = xen_pt_memory_listener;
@@ -787,17 +788,17 @@ static int xen_pt_initfn(PCIDevice *d)
xen_pt_register_regions(s, &cmd);
/* reinitialize each config register to be emulated */
- if (xen_pt_config_init(s)) {
+ rc = xen_pt_config_init(s);
+ if (rc) {
XEN_PT_ERR(d, "PCI Config space initialisation failed.\n");
- xen_host_pci_device_put(&s->real_device);
- return -1;
+ goto err_out;
}
/* Bind interrupt */
rc = xen_host_pci_get_byte(&s->real_device, PCI_INTERRUPT_PIN, &scratch);
if (rc) {
XEN_PT_ERR(d, "Failed to read PCI_INTERRUPT_PIN! (rc:%d)\n", rc);
- scratch = 0;
+ goto err_out;
}
if (!scratch) {
XEN_PT_LOG(d, "no pin interrupt\n");
@@ -854,12 +855,14 @@ out:
rc = xen_host_pci_get_word(&s->real_device, PCI_COMMAND, &val);
if (rc) {
XEN_PT_ERR(d, "Failed to read PCI_COMMAND! (rc: %d)\n", rc);
+ goto err_out;
} else {
val |= cmd;
rc = xen_host_pci_set_word(&s->real_device, PCI_COMMAND, val);
if (rc) {
XEN_PT_ERR(d, "Failed to write PCI_COMMAND val=0x%x!(rc:
%d)\n",
val, rc);
+ goto err_out;
}
}
}
@@ -872,6 +875,11 @@ out:
s->hostaddr.bus, s->hostaddr.slot, s->hostaddr.function);
return 0;
+
+err_out:
+ xen_pt_destroy(d);
+ assert(rc);
+ return rc;
}
static void xen_pt_unregister_device(PCIDevice *d)
--
2.1.0
- [Qemu-devel] [PATCH v2] Remove XenPTReg->data and use dev.config for guest configuration values., Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 10/10] xen/pt: Don't slurp wholesale the PCI configuration registers, Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 09/10] xen/pt: Check for return values for xen_host_pci_[get|set] in init,
Konrad Rzeszutek Wilk <=
- [Qemu-devel] [PATCH v2 05/10] xen/pt: Log xen_host_pci_get in two init functions, Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 07/10] xen/pt: Make xen_pt_unregister_device idempotent, Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 08/10] xen/pt: Move bulk of xen_pt_unregister_device in its own routine., Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 04/10] xen/pt: Remove XenPTReg->data field., Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 02/10] xen/pt: Sync up the dev.config and data values., Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 03/10] xen/pt: Check if reg->init function sets the 'data' past the reg->size, Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 06/10] xen/pt: Log xen_host_pci_get/set errors in MSI code., Konrad Rzeszutek Wilk, 2015/09/08
- [Qemu-devel] [PATCH v2 01/10] xen/pt: Use xen_host_pci_get_[byte|word] instead of dev.config, Konrad Rzeszutek Wilk, 2015/09/08