[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 28/29] xen/pt: Check for return values for xen_host_p
From: |
Stefano Stabellini |
Subject: |
[Qemu-devel] [PULL 28/29] xen/pt: Check for return values for xen_host_pci_[get|set] in init |
Date: |
Thu, 10 Sep 2015 18:16:00 +0100 |
From: Konrad Rzeszutek Wilk <address@hidden>
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>
Signed-off-by: Stefano Stabellini <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 1334ef1..c07609c 100644
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -790,10 +790,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;
@@ -823,17 +824,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");
@@ -890,12 +891,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;
}
}
}
@@ -908,6 +911,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)
--
1.7.10.4
- [Qemu-devel] [PULL 03/29] pc_init1: pass parameters just with types, (continued)
- [Qemu-devel] [PULL 03/29] pc_init1: pass parameters just with types, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 07/29] xen, gfx passthrough: retrieve VGA BIOS to work, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 05/29] hw/pci-assign: split pci-assign.c, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 09/29] xen, gfx passthrough: register a isa bridge, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 06/29] xen, gfx passthrough: basic graphics passthrough support, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 08/29] igd gfx passthrough: create a isa bridge, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 26/29] xen/pt: Make xen_pt_unregister_device idempotent, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 13/29] xen/HVM: atomically access pointers in bufioreq handling, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 12/29] xen-hvm: When using xc_domain_add_to_physmap also include errno when reporting, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 22/29] xen/pt: Check if reg->init function sets the 'data' past the reg->size, Stefano Stabellini, 2015/09/10
- [Qemu-devel] [PULL 28/29] xen/pt: Check for return values for xen_host_pci_[get|set] in init,
Stefano Stabellini <=
- [Qemu-devel] [PULL 21/29] xen/pt: Sync up the dev.config and data values., Stefano Stabellini, 2015/09/10
- Re: [Qemu-devel] [PULL 21/29] xen/pt: Sync up the dev.config and data values., Paolo Bonzini, 2015/09/14
- Re: [Qemu-devel] [PULL 21/29] xen/pt: Sync up the dev.config and data values., Stefano Stabellini, 2015/09/15
- Re: [Qemu-devel] [PULL 21/29] xen/pt: Sync up the dev.config and data values., Konrad Rzeszutek Wilk, 2015/09/15
- Re: [Qemu-devel] [PULL 21/29] xen/pt: Sync up the dev.config and data values., Stefano Stabellini, 2015/09/15
- Re: [Qemu-devel] [PULL 21/29] xen/pt: Sync up the dev.config and data values., Paolo Bonzini, 2015/09/15
- Re: [Qemu-devel] [PULL 21/29] xen/pt: Sync up the dev.config and data values., Konrad Rzeszutek Wilk, 2015/09/15
[Qemu-devel] [PULL 14/29] xen/pt: Update comments with proper function name., Stefano Stabellini, 2015/09/10
[Qemu-devel] [PULL 25/29] xen/pt: Log xen_host_pci_get/set errors in MSI code., Stefano Stabellini, 2015/09/10
[Qemu-devel] [PULL 24/29] xen/pt: Log xen_host_pci_get in two init functions, Stefano Stabellini, 2015/09/10