From patchwork Thu Apr 24 14:15:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirill Batuzov X-Patchwork-Id: 342646 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5C79814015B for ; Fri, 25 Apr 2014 15:04:45 +1000 (EST) Received: from localhost ([::1]:55879 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WdYJW-0003HU-Ni for incoming@patchwork.ozlabs.org; Fri, 25 Apr 2014 01:04:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60801) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WdUk4-0007fu-41 for qemu-devel@nongnu.org; Thu, 24 Apr 2014 21:17:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WdKS0-0008Nw-Mb for qemu-devel@nongnu.org; Thu, 24 Apr 2014 10:16:39 -0400 Received: from smtp.ispras.ru ([83.149.199.79]:35106) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WdKS0-0007jq-E5 for qemu-devel@nongnu.org; Thu, 24 Apr 2014 10:16:32 -0400 Received: from bulbul.intra.ispras.ru (unknown [83.149.199.91]) by smtp.ispras.ru (Postfix) with ESMTP id BAEC1224AC; Thu, 24 Apr 2014 18:16:05 +0400 (MSK) From: Kirill Batuzov To: qemu-devel@nongnu.org Date: Thu, 24 Apr 2014 18:15:57 +0400 Message-Id: <1398348959-23048-3-git-send-email-batuzovk@ispras.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398348959-23048-1-git-send-email-batuzovk@ispras.ru> References: <1398348959-23048-1-git-send-email-batuzovk@ispras.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.79 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Kirill Batuzov Subject: [Qemu-devel] [PATCH v2 2/4] acpi-build: properly decrement objects' reference counters X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- hw/i386/acpi-build.c | 6 ++++++ 1 file changed, 6 insertions(+) v1 -> v2: No changes. 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; }