qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v3 20/25] hw/riscv: Let devices own the MemoryRegion they cre


From: Alistair Francis
Subject: Re: [PATCH v3 20/25] hw/riscv: Let devices own the MemoryRegion they create
Date: Mon, 16 Mar 2020 11:50:46 -0700

On Mon, Mar 16, 2020 at 11:54 AM Philippe Mathieu-Daudé
<address@hidden> wrote:
>
> Avoid orphan memory regions being added in the /unattached QOM
> container.
>
> This commit was produced with the Coccinelle script
> scripts/coccinelle/memory-region-housekeeping.cocci.
>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>

Reviewed-by: Alistair Francis <address@hidden>

Alistair

> ---
>  hw/riscv/sifive_e.c | 6 +++---
>  hw/riscv/sifive_u.c | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
> index a1974ef7be..646553a7c3 100644
> --- a/hw/riscv/sifive_e.c
> +++ b/hw/riscv/sifive_e.c
> @@ -145,8 +145,8 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev, 
> Error **errp)
>                              &error_abort);
>
>      /* Mask ROM */
> -    memory_region_init_rom(&s->mask_rom, NULL, "riscv.sifive.e.mrom",
> -        memmap[SIFIVE_E_MROM].size, &error_fatal);
> +    memory_region_init_rom(&s->mask_rom, OBJECT(dev), "riscv.sifive.e.mrom",
> +                           memmap[SIFIVE_E_MROM].size, &error_fatal);
>      memory_region_add_subregion(sys_mem,
>          memmap[SIFIVE_E_MROM].base, &s->mask_rom);
>
> @@ -208,7 +208,7 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev, 
> Error **errp)
>          memmap[SIFIVE_E_PWM2].base, memmap[SIFIVE_E_PWM2].size);
>
>      /* Flash memory */
> -    memory_region_init_rom(&s->xip_mem, NULL, "riscv.sifive.e.xip",
> +    memory_region_init_rom(&s->xip_mem, OBJECT(dev), "riscv.sifive.e.xip",
>                             memmap[SIFIVE_E_XIP].size, &error_fatal);
>      memory_region_add_subregion(sys_mem, memmap[SIFIVE_E_XIP].base,
>          &s->xip_mem);
> diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
> index 156a003642..662d42a5a7 100644
> --- a/hw/riscv/sifive_u.c
> +++ b/hw/riscv/sifive_u.c
> @@ -497,7 +497,7 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, 
> Error **errp)
>                               &error_abort);
>
>      /* boot rom */
> -    memory_region_init_rom(mask_rom, NULL, "riscv.sifive.u.mrom",
> +    memory_region_init_rom(mask_rom, OBJECT(dev), "riscv.sifive.u.mrom",
>                             memmap[SIFIVE_U_MROM].size, &error_fatal);
>      memory_region_add_subregion(system_memory, memmap[SIFIVE_U_MROM].base,
>                                  mask_rom);
> --
> 2.21.1
>
>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]