[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/10] acpi-build: properly decrement objects' refere
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 02/10] acpi-build: properly decrement objects' reference counters |
Date: |
Wed, 7 May 2014 18:41:18 +0300 |
From: Kirill Batuzov <address@hidden>
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 <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
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
- [Qemu-devel] [PULL 00/10] pc,net,MAINTAINERS,build updates, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL 01/10] acpi/pcihp.c: Rewrite acpi_pcihp_get_bsel using object_property_get_int, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL 02/10] acpi-build: properly decrement objects' reference counters,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 03/10] acpi: fix tables for no-hpet configuration, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL 07/10] smbus: allow returning an error from reads, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL 06/10] apic: use emulated lapic version 0x14 on pc machines >= 2.1, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL 08/10] smbus: return -1 if nothing found at the given address, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL 04/10] i8259: don't abort when trying to use level sensitive irqs, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL 05/10] pc: add compat_props placeholder for 2.0 machine type, Michael S. Tsirkin, 2014/05/07
- Re: [Qemu-devel] [PULL 00/10] pc,net,MAINTAINERS,build updates, Peter Maydell, 2014/05/07
- [Qemu-devel] [PULL 10/10] MAINTAINERS: addresses for responsible disclosure, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL 09/10] pm_smbus: correctly report unclaimed cycles, Michael S. Tsirkin, 2014/05/07