Re: [Qemu-devel] [PATCH 57/88] ppc: use g_new() family of functions

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 3749 bytes --]

On Fri, Oct 06, 2017 at 08:49:52PM -0300, Philippe Mathieu-Daudé wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> [PMD: replaced g_new0() -> g_new() in mac_newworld.c, added
> virtex_ml507]

Acked-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  hw/intc/heathrow_pic.c | 2 +-
>  hw/ppc/mac_newworld.c  | 5 ++---
>  hw/ppc/mac_oldworld.c  | 2 +-
>  hw/ppc/virtex_ml507.c  | 2 +-
>  4 files changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c
> index 171f5ed814..90c1e6a4b1 100644
> --- a/hw/intc/heathrow_pic.c
> +++ b/hw/intc/heathrow_pic.c
> @@ -201,7 +201,7 @@ qemu_irq *heathrow_pic_init(MemoryRegion **pmem,
>  {
>      HeathrowPICS *s;
>  
> -    s = g_malloc0(sizeof(HeathrowPICS));
> +    s = g_new0(HeathrowPICS, 1);
>      /* only 1 CPU */
>      s->irqs = irqs[0];
>      memory_region_init_io(&s->mem, NULL, &heathrow_pic_ops, s,
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index 6d0ace20ca..59cded95b8 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -295,7 +295,7 @@ static void ppc_core99_init(MachineState *machine)
>      memory_region_init_io(unin2_memory, NULL, &unin_ops, token, "unin", 0x1000);
>      memory_region_add_subregion(get_system_memory(), 0xf3000000, unin2_memory);
>  
> -    openpic_irqs = g_malloc0(smp_cpus * sizeof(qemu_irq *));
> +    openpic_irqs = g_new0(qemu_irq *, smp_cpus);
>      openpic_irqs[0] =
>          g_malloc0(smp_cpus * sizeof(qemu_irq) * OPENPIC_OUTPUT_NB);
>      for (i = 0; i < smp_cpus; i++) {
> @@ -339,8 +339,6 @@ static void ppc_core99_init(MachineState *machine)
>          }
>      }
>  
> -    pic = g_new0(qemu_irq, 64);
> -
>      dev = qdev_create(NULL, TYPE_OPENPIC);
>      qdev_prop_set_uint32(dev, "model", OPENPIC_MODEL_KEYLARGO);
>      qdev_init_nofail(dev);
> @@ -353,6 +351,7 @@ static void ppc_core99_init(MachineState *machine)
>          }
>      }
>  
> +    pic = g_new(qemu_irq, 64);
>      for (i = 0; i < 64; i++) {
>          pic[i] = qdev_get_gpio_in(dev, i);
>      }
> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
> index bc7c8b7bd7..50ad9c56cb 100644
> --- a/hw/ppc/mac_oldworld.c
> +++ b/hw/ppc/mac_oldworld.c
> @@ -232,7 +232,7 @@ static void ppc_heathrow_init(MachineState *machine)
>      memory_region_add_subregion(sysmem, 0xfe000000, isa);
>  
>      /* XXX: we register only 1 output pin for heathrow PIC */
> -    heathrow_irqs = g_malloc0(smp_cpus * sizeof(qemu_irq *));
> +    heathrow_irqs = g_new0(qemu_irq *, smp_cpus);
>      heathrow_irqs[0] =
>          g_malloc0(smp_cpus * sizeof(qemu_irq) * 1);
>      /* Connect the heathrow PIC outputs to the 6xx bus */
> diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
> index ed9b406fd3..ed6e054611 100644
> --- a/hw/ppc/virtex_ml507.c
> +++ b/hw/ppc/virtex_ml507.c
> @@ -104,7 +104,7 @@ static PowerPCCPU *ppc440_init_xilinx(ram_addr_t *ram_size,
>      ppc_dcr_init(env, NULL, NULL);
>  
>      /* interrupt controller */
> -    irqs = g_malloc0(sizeof(qemu_irq) * PPCUIC_OUTPUT_NB);
> +    irqs = g_new0(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];
>      ppcuic_init(env, irqs, 0x0C0, 0, 1);

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]