qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Wei Jiangang <weijg.fnst@cn.fujitsu.com>,
	Cao jin <caoj.fnst@cn.fujitsu.com>,
	Marcel Apfelbaum <marcel@redhat.com>,
	Markus Armbruster <armbru@redhat.com>
Subject: [Qemu-devel] [PULL 15/15] hw/pci-bridge: Add missing unref in case register-bus fails
Date: Fri, 8 Apr 2016 11:02:56 +0300	[thread overview]
Message-ID: <1460102154-16096-16-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1460102154-16096-1-git-send-email-mst@redhat.com>

From: Wei Jiangang <weijg.fnst@cn.fujitsu.com>

The error paths after a successful qdev_create/pci_bus_new
should contain a object_unref/object_unparent.
pxb_dev_init_common() did not yet, so add it.

Signed-off-by: Wei Jiangang <weijg.fnst@cn.fujitsu.com>
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
 hw/pci-bridge/pci_expander_bridge.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c
index 5e7e546..ba320bd 100644
--- a/hw/pci-bridge/pci_expander_bridge.c
+++ b/hw/pci-bridge/pci_expander_bridge.c
@@ -249,7 +249,7 @@ static int pxb_dev_init_common(PCIDevice *dev, bool pcie)
     PCI_HOST_BRIDGE(ds)->bus = bus;
 
     if (pxb_register_bus(dev, bus)) {
-        return -EINVAL;
+        goto err_register_bus;
     }
 
     qdev_init_nofail(ds);
@@ -263,6 +263,12 @@ static int pxb_dev_init_common(PCIDevice *dev, bool pcie)
 
     pxb_dev_list = g_list_insert_sorted(pxb_dev_list, pxb, pxb_compare);
     return 0;
+
+err_register_bus:
+    object_unref(OBJECT(bds));
+    object_unparent(OBJECT(bus));
+    object_unref(OBJECT(ds));
+    return -EINVAL;
 }
 
 static int pxb_dev_initfn(PCIDevice *dev)
-- 
MST

  parent reply	other threads:[~2016-04-08  8:03 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-08  8:02 [Qemu-devel] [PULL 00/15] pci, virtio, acpi: fixes for 2.6 Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 01/15] acpi: Add missing GCC_FMT_ATTR Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 02/15] pci-testdev: fast mmio support Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 03/15] xen: piix reuse pci generic class init function Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 04/15] Sort the fw_cfg file list Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 05/15] Migration: Add i82801b11 migration data Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 06/15] virtio-balloon: reset the statistic timer to load device Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 07/15] tests/bios-tables-test: fix assert Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 08/15] virtio: make virtio_queue_notify_vq static Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 09/15] virtio-blk: fix disabled mode Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 10/15] virtio-scsi: " Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 11/15] virtio: add aio handler Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 12/15] virtio-blk: use aio handler for data plane Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 13/15] virtio-scsi: " Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 14/15] virtio: merge virtio_queue_aio_set_host_notifier_handler with virtio_queue_set_aio Michael S. Tsirkin
2016-04-08  8:02 ` Michael S. Tsirkin [this message]
2016-04-08 12:45 ` [Qemu-devel] [PULL 00/15] pci, virtio, acpi: fixes for 2.6 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1460102154-16096-16-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=armbru@redhat.com \
    --cc=caoj.fnst@cn.fujitsu.com \
    --cc=marcel@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=weijg.fnst@cn.fujitsu.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).