Re: [PATCH RESEND v2 07/32] hw/mips: Use memory_region_init_rom() with read-only regions

[Aleksandar Markovic]

On Monday, February 24, 2020, Philippe Mathieu-Daudé <address@hidden> wrote:
> This commit was produced with the Coccinelle script
> scripts/coccinelle/memory-region-housekeeping.cocci.
>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
> ---

Reviewed-by: Aleksandar Markovic <address@hidden>

Will be applied to the next MIPS queue, planned to be sent in next few days.

 

>  hw/mips/mips_fulong2e.c | 3 +--
>  hw/mips/mips_jazz.c     | 6 ++----
>  hw/mips/mips_mipssim.c  | 3 +--
>  hw/mips/mips_r4k.c      | 3 +--
>  4 files changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
> index 2e043cbb98..547a7d3a45 100644
> --- a/hw/mips/mips_fulong2e.c
> +++ b/hw/mips/mips_fulong2e.c
> @@ -319,9 +319,8 @@ static void mips_fulong2e_init(MachineState *machine)
>
>      /* allocate RAM */
>      memory_region_allocate_system_memory(ram, NULL, "fulong2e.ram", ram_size);
> -    memory_region_init_ram(bios, NULL, "fulong2e.bios", BIOS_SIZE,
> +    memory_region_init_rom(bios, NULL, "fulong2e.bios", BIOS_SIZE,
>                             &error_fatal);
> -    memory_region_set_readonly(bios, true);
>
>      memory_region_add_subregion(address_space_mem, 0, ram);
>      memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios);
> diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
> index 66fd4d867d..cf47335ea5 100644
> --- a/hw/mips/mips_jazz.c
> +++ b/hw/mips/mips_jazz.c
> @@ -195,9 +195,8 @@ static void mips_jazz_init(MachineState *machine,
>                                           machine->ram_size);
>      memory_region_add_subregion(address_space, 0, ram);
>
> -    memory_region_init_ram(bios, NULL, "mips_jazz.bios", MAGNUM_BIOS_SIZE,
> +    memory_region_init_rom(bios, NULL, "mips_jazz.bios", MAGNUM_BIOS_SIZE,
>                             &error_fatal);
> -    memory_region_set_readonly(bios, true);
>      memory_region_init_alias(bios2, NULL, "mips_jazz.bios", bios,
>                               0, MAGNUM_BIOS_SIZE);
>      memory_region_add_subregion(address_space, 0x1fc00000LL, bios);
> @@ -263,9 +262,8 @@ static void mips_jazz_init(MachineState *machine,
>          {
>              /* Simple ROM, so user doesn't have to provide one */
>              MemoryRegion *rom_mr = g_new(MemoryRegion, 1);
> -            memory_region_init_ram(rom_mr, NULL, "g364fb.rom", 0x80000,
> +            memory_region_init_rom(rom_mr, NULL, "g364fb.rom", 0x80000,
>                                     &error_fatal);
> -            memory_region_set_readonly(rom_mr, true);
>              uint8_t *rom = memory_region_get_ram_ptr(rom_mr);
>              memory_region_add_subregion(address_space, 0x60000000, rom_mr);
>              rom[0] = 0x10; /* Mips G364 */
> diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
> index b934ca9d51..3fdbb21680 100644
> --- a/hw/mips/mips_mipssim.c
> +++ b/hw/mips/mips_mipssim.c
> @@ -169,9 +169,8 @@ mips_mipssim_init(MachineState *machine)
>      /* Allocate RAM. */
>      memory_region_allocate_system_memory(ram, NULL, "mips_mipssim.ram",
>                                           ram_size);
> -    memory_region_init_ram(bios, NULL, "mips_mipssim.bios", BIOS_SIZE,
> +    memory_region_init_rom(bios, NULL, "mips_mipssim.bios", BIOS_SIZE,
>                             &error_fatal);
> -    memory_region_set_readonly(bios, true);
>
>      memory_region_add_subregion(address_space_mem, 0, ram);
>
> diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
> index b2aec434c3..54b286ceee 100644
> --- a/hw/mips/mips_r4k.c
> +++ b/hw/mips/mips_r4k.c
> @@ -241,9 +241,8 @@ void mips_r4k_init(MachineState *machine)
>      dinfo = drive_get(IF_PFLASH, 0, 0);
>      if ((bios_size > 0) && (bios_size <= BIOS_SIZE)) {
>          bios = g_new(MemoryRegion, 1);
> -        memory_region_init_ram(bios, NULL, "mips_r4k.bios", BIOS_SIZE,
> +        memory_region_init_rom(bios, NULL, "mips_r4k.bios", BIOS_SIZE,
>                                 &error_fatal);
> -        memory_region_set_readonly(bios, true);
>          memory_region_add_subregion(get_system_memory(), 0x1fc00000, bios);
>
>          load_image_targphys(filename, 0x1fc00000, BIOS_SIZE);
> -- 
> 2.21.1