Re: [Qemu-trivial] [PATCH v2 1/3] hw/i386/pc_piix: Fix memory leak

[Marcel Apfelbaum <marcel.apfelbaum@gmail.com>]

On 05/26/2015 04:46 AM, Shannon Zhao wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
>
> valgrind complains about:
> ==16447== 8 bytes in 1 blocks are definitely lost in loss record 552 of 3,310
> ==16447==    at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> ==16447==    by 0x2E4FD7: malloc_and_trace (vl.c:2546)
> ==16447==    by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3)
> ==16447==    by 0x36FB47: qemu_extend_irqs (irq.c:55)
> ==16447==    by 0x36FBD3: qemu_allocate_irqs (irq.c:64)
> ==16447==    by 0x24E622: pc_init1 (pc_piix.c:287)
> ==16447==    by 0x24E76A: pc_init_pci (pc_piix.c:310)
> ==16447==    by 0x2E9360: main (vl.c:4226)
>
> ==16447== 128 bytes in 1 blocks are definitely lost in loss record 2,569 of 3,310
> ==16447==    at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> ==16447==    by 0x2E4FD7: malloc_and_trace (vl.c:2546)
> ==16447==    by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3)
> ==16447==    by 0x36FB47: qemu_extend_irqs (irq.c:55)
> ==16447==    by 0x36FBD3: qemu_allocate_irqs (irq.c:64)
> ==16447==    by 0x25BEB2: kvm_i8259_init (i8259.c:133)
> ==16447==    by 0x24E1F1: pc_init1 (pc_piix.c:219)
> ==16447==    by 0x24E76A: pc_init_pci (pc_piix.c:310)
> ==16447==    by 0x2E9360: main (vl.c:4226)
>
> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> ---
>   hw/i386/pc_piix.c | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 1fe7bfb..d567887 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -89,7 +89,7 @@ static void pc_init1(MachineState *machine,
>       qemu_irq *cpu_irq;
>       qemu_irq *gsi;
>       qemu_irq *i8259;
> -    qemu_irq *smi_irq;
> +    qemu_irq smi_irq;
>       GSIState *gsi_state;
>       DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
>       BusState *idebus[MAX_IDE_BUS];
> @@ -227,6 +227,7 @@ static void pc_init1(MachineState *machine,
>       for (i = 0; i < ISA_NUM_IRQS; i++) {
>           gsi_state->i8259_irq[i] = i8259[i];
>       }
> +    g_free(i8259);
>       if (pci_enabled) {
>           ioapic_init_gsi(gsi_state, "i440fx");
>       }
> @@ -284,10 +285,10 @@ static void pc_init1(MachineState *machine,
>           DeviceState *piix4_pm;
>           I2CBus *smbus;
>
> -        smi_irq = qemu_allocate_irqs(pc_acpi_smi_interrupt, first_cpu, 1);
> +        smi_irq = qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0);
>           /* TODO: Populate SPD eeprom data.  */
>           smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100,
> -                              gsi[9], *smi_irq,
> +                              gsi[9], smi_irq,
>                                 kvm_enabled(), fw_cfg, &piix4_pm);
>           smbus_eeprom_init(smbus, 8, NULL, 0);
>
>

Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>

Thanks,
Marcel