On Fri, Oct 06, 2017 at 08:49:20PM -0300, Philippe Mathieu-Daudé wrote:
> From: Marc-André Lureau <marcandre.lur...@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Acked-by: Stafford Horne <sho...@gmail.com>
> [PMD: squashed openrisc_sim.c]
> ---
> hw/openrisc/openrisc_sim.c | 2 +-
> target/openrisc/mmu.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
> index 86bf2849c4..1eb381549c 100644
> --- a/hw/openrisc/openrisc_sim.c
> +++ b/hw/openrisc/openrisc_sim.c
> @@ -114,7 +114,7 @@ static void openrisc_sim_init(MachineState *machine)
> main_cpu_reset(cpu);
> }
>
> - ram = g_malloc(sizeof(*ram));
> + ram = g_new(MemoryRegion, 1);
> memory_region_init_ram(ram, NULL, "openrisc.ram", ram_size,
> &error_fatal);
> memory_region_add_subregion(get_system_memory(), 0, ram);
>
> diff --git a/target/openrisc/mmu.c b/target/openrisc/mmu.c
> index ce2a29dd1a..4789a35b67 100644
> --- a/target/openrisc/mmu.c
> +++ b/target/openrisc/mmu.c
> @@ -247,7 +247,7 @@ hwaddr openrisc_cpu_get_phys_page_debug(CPUState *cs,
> vaddr addr)
>
> void cpu_openrisc_mmu_init(OpenRISCCPU *cpu)
> {
> - cpu->env.tlb = g_malloc0(sizeof(CPUOpenRISCTLBContext));
> + cpu->env.tlb = g_new0(CPUOpenRISCTLBContext, 1);
>
> cpu->env.tlb->cpu_openrisc_map_address_code =
> &cpu_openrisc_get_phys_nommu;
> cpu->env.tlb->cpu_openrisc_map_address_data =
> &cpu_openrisc_get_phys_nommu;
> --
> 2.14.2
>
