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>,
	Anthony Liguori <aliguori@amazon.com>,
	Kirill Batuzov <batuzovk@ispras.ru>
Subject: [Qemu-devel] [PULL v2 02/11] acpi-build: properly decrement objects' reference counters
Date: Wed, 7 May 2014 19:16:54 +0300	[thread overview]
Message-ID: <1399479367-31336-3-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1399479367-31336-1-git-send-email-mst@redhat.com>

From: Kirill Batuzov <batuzovk@ispras.ru>

Object returned by object_property_get_qobject needs its reference counter to
be decremented when it is not needed by caller anymore.

Signed-off-by: Kirill Batuzov <batuzovk@ispras.ru>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/i386/acpi-build.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index c98df88..1ef8ca9 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -156,18 +156,21 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)
     } else {
         pm->s3_disabled = false;
     }
+    qobject_decref(o);
     o = object_property_get_qobject(obj, ACPI_PM_PROP_S4_DISABLED, NULL);
     if (o) {
         pm->s4_disabled = qint_get_int(qobject_to_qint(o));
     } else {
         pm->s4_disabled = false;
     }
+    qobject_decref(o);
     o = object_property_get_qobject(obj, ACPI_PM_PROP_S4_VAL, NULL);
     if (o) {
         pm->s4_val = qint_get_int(qobject_to_qint(o));
     } else {
         pm->s4_val = false;
     }
+    qobject_decref(o);
 
     /* Fill in mandatory properties */
     pm->sci_int = object_property_get_int(obj, ACPI_PM_PROP_SCI_INT, NULL);
@@ -973,6 +976,7 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state)
         }
     }
 
+    qobject_decref(bsel);
     build_free_array(bus_table);
     build_pci_bus_state_cleanup(child);
     g_free(child);
@@ -1362,10 +1366,12 @@ static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg)
         return false;
     }
     mcfg->mcfg_base = qint_get_int(qobject_to_qint(o));
+    qobject_decref(o);
 
     o = object_property_get_qobject(pci_host, PCIE_HOST_MCFG_SIZE, NULL);
     assert(o);
     mcfg->mcfg_size = qint_get_int(qobject_to_qint(o));
+    qobject_decref(o);
     return true;
 }
 
-- 
MST

  parent reply	other threads:[~2014-05-07 16:18 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-07 16:16 [Qemu-devel] [PULL v2 00/11] pc,net,MAINTAINERS,build updates Michael S. Tsirkin
2014-05-07 16:16 ` [Qemu-devel] [PULL v2 01/11] acpi/pcihp.c: Rewrite acpi_pcihp_get_bsel using object_property_get_int Michael S. Tsirkin
2014-05-07 16:16 ` Michael S. Tsirkin [this message]
2014-05-07 16:16 ` [Qemu-devel] [PULL v2 03/11] acpi: fix tables for no-hpet configuration Michael S. Tsirkin
2014-05-07 16:17 ` [Qemu-devel] [PULL v2 04/11] i8259: don't abort when trying to use level sensitive irqs Michael S. Tsirkin
2014-05-07 16:17 ` [Qemu-devel] [PULL v2 05/11] pc: add compat_props placeholder for 2.0 machine type Michael S. Tsirkin
2014-05-07 16:17 ` [Qemu-devel] [PULL v2 06/11] apic: use emulated lapic version 0x14 on pc machines >= 2.1 Michael S. Tsirkin
2014-05-07 16:17 ` [Qemu-devel] [PULL v2 07/11] smbus: allow returning an error from reads Michael S. Tsirkin
2014-05-07 16:17 ` [Qemu-devel] [PULL v2 08/11] smbus: return -1 if nothing found at the given address Michael S. Tsirkin
2014-05-07 16:17 ` [Qemu-devel] [PULL v2 09/11] pm_smbus: correctly report unclaimed cycles Michael S. Tsirkin
2014-05-07 16:17 ` [Qemu-devel] [PULL v2 10/11] MAINTAINERS: addresses for responsible disclosure Michael S. Tsirkin
2014-05-07 16:17 ` [Qemu-devel] [PULL v2 11/11] configure: make source tree build more robust Michael S. Tsirkin
2014-05-07 17:14 ` [Qemu-devel] [PULL v2 00/11] pc,net,MAINTAINERS,build updates 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=1399479367-31336-3-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=aliguori@amazon.com \
    --cc=batuzovk@ispras.ru \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /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).