[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH v2 1/7] hw/ppc/ppc440_bamboo.c: Add a member in Ma
From: |
Shannon Zhao |
Subject: |
[Qemu-trivial] [PATCH v2 1/7] hw/ppc/ppc440_bamboo.c: Add a member in MachineState to store irq array |
Date: |
Sat, 30 May 2015 15:54:31 +0800 |
From: Shannon Zhao <address@hidden>
Here we add a member in MachineState to store the irq array returned
from qemu_allocate_irqs. Then these irq arrays will be free before QEMU
exit and it fixes the memory leak spotted by valgrind.
valgrind complains about:
==6366== 4,936 (256 direct, 4,680 indirect) bytes in 1 blocks are definitely
lost in loss record 3,245 of 3,271
==6366== at 0x4C2845D: malloc (in
/usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==6366== by 0x336F47: malloc_and_trace (vl.c:2556)
==6366== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3)
==6366== by 0x3C093B: qemu_extend_irqs (irq.c:55)
==6366== by 0x3C09C7: qemu_allocate_irqs (irq.c:64)
==6366== by 0x265091: ppcuic_init (ppc4xx_devs.c:317)
==6366== by 0x26A90A: bamboo_init (ppc440_bamboo.c:205)
==6366== by 0x33B312: main (vl.c:4249)
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
---
hw/ppc/ppc440_bamboo.c | 17 +++++++++--------
include/hw/boards.h | 1 +
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 778970a..f533b06 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -170,7 +170,6 @@ static void bamboo_init(MachineState *machine)
= g_malloc(PPC440EP_SDRAM_NR_BANKS * sizeof(*ram_memories));
hwaddr ram_bases[PPC440EP_SDRAM_NR_BANKS];
hwaddr ram_sizes[PPC440EP_SDRAM_NR_BANKS];
- qemu_irq *pic;
qemu_irq *irqs;
PCIBus *pcibus;
PowerPCCPU *cpu;
@@ -202,7 +201,7 @@ static void bamboo_init(MachineState *machine)
irqs = g_malloc0(sizeof(qemu_irq) * PPCUIC_OUTPUT_NB);
irqs[PPCUIC_OUTPUT_INT] = ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_INT];
irqs[PPCUIC_OUTPUT_CINT] = ((qemu_irq
*)env->irq_inputs)[PPC40x_INPUT_CINT];
- pic = ppcuic_init(env, irqs, 0x0C0, 0, 1);
+ machine->irqs = ppcuic_init(env, irqs, 0x0C0, 0, 1);
/* SDRAM controller */
memset(ram_bases, 0, sizeof(ram_bases));
@@ -212,14 +211,16 @@ static void bamboo_init(MachineState *machine)
ram_bases, ram_sizes,
ppc440ep_sdram_bank_sizes);
/* XXX 440EP's ECC interrupts are on UIC1, but we've only created UIC0. */
- ppc4xx_sdram_init(env, pic[14], PPC440EP_SDRAM_NR_BANKS, ram_memories,
- ram_bases, ram_sizes, 1);
+ ppc4xx_sdram_init(env, machine->irqs[14], PPC440EP_SDRAM_NR_BANKS,
+ ram_memories, ram_bases, ram_sizes, 1);
/* PCI */
dev = sysbus_create_varargs(TYPE_PPC4xx_PCI_HOST_BRIDGE,
PPC440EP_PCI_CONFIG,
- pic[pci_irq_nrs[0]], pic[pci_irq_nrs[1]],
- pic[pci_irq_nrs[2]], pic[pci_irq_nrs[3]],
+ machine->irqs[pci_irq_nrs[0]],
+ machine->irqs[pci_irq_nrs[1]],
+ machine->irqs[pci_irq_nrs[2]],
+ machine->irqs[pci_irq_nrs[3]],
NULL);
pcibus = (PCIBus *)qdev_get_child_bus(dev, "pci.0");
if (!pcibus) {
@@ -232,12 +233,12 @@ static void bamboo_init(MachineState *machine)
memory_region_add_subregion(get_system_memory(), PPC440EP_PCI_IO, isa);
if (serial_hds[0] != NULL) {
- serial_mm_init(address_space_mem, 0xef600300, 0, pic[0],
+ serial_mm_init(address_space_mem, 0xef600300, 0, machine->irqs[0],
PPC_SERIAL_MM_BAUDBASE, serial_hds[0],
DEVICE_BIG_ENDIAN);
}
if (serial_hds[1] != NULL) {
- serial_mm_init(address_space_mem, 0xef600400, 0, pic[1],
+ serial_mm_init(address_space_mem, 0xef600400, 0, machine->irqs[1],
PPC_SERIAL_MM_BAUDBASE, serial_hds[1],
DEVICE_BIG_ENDIAN);
}
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 1f11881..18a0f93 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -160,6 +160,7 @@ struct MachineState {
char *initrd_filename;
const char *cpu_model;
AccelState *accelerator;
+ qemu_irq *irqs;
};
#endif
--
2.0.4
- [Qemu-trivial] [PATCH v2 0/7] Add a member in MachineState to store irq array, Shannon Zhao, 2015/05/30
- [Qemu-trivial] [PATCH v2 2/7] hw/mips/mips_jazz.c: Store irq array in MachineState to fix memory leak, Shannon Zhao, 2015/05/30
- [Qemu-trivial] [PATCH v2 1/7] hw/ppc/ppc440_bamboo.c: Add a member in MachineState to store irq array,
Shannon Zhao <=
- [Qemu-trivial] [PATCH v2 7/7] hw/arm/tosa.c: Store irq array in MachineState to fix memory leak, Shannon Zhao, 2015/05/30
- [Qemu-trivial] [PATCH v2 4/7] hw/sh4/r2d.c: Store irq array in MachineState to fix memory leak, Shannon Zhao, 2015/05/30
- [Qemu-trivial] [PATCH v2 5/7] hw/arm/palm.c: Store irq array in MachineState to fix memory leak, Shannon Zhao, 2015/05/30
- [Qemu-trivial] [PATCH v2 6/7] hw/arm/spitz.c: Store irq array in MachineState to fix memory leak, Shannon Zhao, 2015/05/30
- [Qemu-trivial] [PATCH v2 3/7] hw/m68k/an5206.c: Store irq array in MachineState to fix memory leak, Shannon Zhao, 2015/05/30