[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH stable-1.1 21/26] pci_bridge_dev: fix error path in
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH stable-1.1 21/26] pci_bridge_dev: fix error path in pci_bridge_dev_initfn() |
Date: |
Fri, 22 Jun 2012 19:33:25 -0500 |
From: Jason Baron <address@hidden>
Currently, we do not properly cleanup, if pci_bridge_dev_initfn
fails to initialize properly. Make sure to call pci_bridge_exitfn()
in the error path.
Signed-off-by: Jason Baron <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/pci_bridge_dev.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/hw/pci_bridge_dev.c b/hw/pci_bridge_dev.c
index eccaa58..ad63703 100644
--- a/hw/pci_bridge_dev.c
+++ b/hw/pci_bridge_dev.c
@@ -52,7 +52,7 @@ static int pci_bridge_dev_initfn(PCIDevice *dev)
{
PCIBridge *br = DO_UPCAST(PCIBridge, dev, dev);
PCIBridgeDev *bridge_dev = DO_UPCAST(PCIBridgeDev, bridge, br);
- int err;
+ int err, ret;
pci_bridge_map_irq(br, NULL, pci_bridge_dev_map_irq_fn);
err = pci_bridge_initfn(dev);
if (err) {
@@ -86,6 +86,8 @@ slotid_error:
shpc_cleanup(dev, &bridge_dev->bar);
shpc_error:
memory_region_destroy(&bridge_dev->bar);
+ ret = pci_bridge_exitfn(dev);
+ assert(!ret);
bridge_error:
return err;
}
--
1.7.4.1
- [Qemu-devel] [PATCH stable-1.1 09/26] target-xtensa: fix CCOUNT for conditional branches, (continued)
- [Qemu-devel] [PATCH stable-1.1 09/26] target-xtensa: fix CCOUNT for conditional branches, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 10/26] trace/simple.c: fix deprecated glib2 interface, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 11/26] configure: report missing libraries for virtfs, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 12/26] kvm/apic: correct short memset, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 13/26] kvm: i8254: Fix conversion of in-kernel to userspace state, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 14/26] qcow2: Silence false warning, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 15/26] monitor: Fix memory leak with readline completion, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 16/26] configure: Fix build for some versions of glibc (9pfs), Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 17/26] rtl8139: honor RxOverflow flag in can_receive method, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 18/26] ahci: Fix reset of MSI function, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 21/26] pci_bridge_dev: fix error path in pci_bridge_dev_initfn(),
Michael Roth <=
- [Qemu-devel] [PATCH stable-1.1 22/26] qcow2: fix endianness conversion, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 23/26] Prevent disk data loss when closing qemu, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 24/26] qcow2: fix autoclear image header update, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 20/26] qdev: release parent properties on dc->init failure, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 25/26] fdc: fix implied seek while there is no media in drive, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 19/26] intel-hda: Fix reset of MSI function, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 26/26] build: install qmp-commands.txt, Michael Roth, 2012/06/22
- Re: [Qemu-devel] [PATCH stable-1.1 00/26] Initial tree and candidates for stable-1.1, Stefano Stabellini, 2012/06/25
- Re: [Qemu-devel] [PATCH stable-1.1 00/26] Initial tree and candidates for stable-1.1, Kevin Wolf, 2012/06/25