On Mon, Feb 24, 2020 at 09:55:12PM +0100, Philippe Mathieu-Daudé wrote:
> This commit was produced with the Coccinelle script
> scripts/coccinelle/memory-region-housekeeping.cocci.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> hw/ppc/mac_newworld.c | 3 +--
> hw/ppc/mac_oldworld.c | 3 +--
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index 464d012103..566413e479 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -156,13 +156,12 @@ static void ppc_core99_init(MachineState *machine)
> memory_region_add_subregion(get_system_memory(), 0, ram);
>
> /* allocate and load BIOS */
> - memory_region_init_ram(bios, NULL, "ppc_core99.bios", BIOS_SIZE,
> + memory_region_init_rom(bios, NULL, "ppc_core99.bios", BIOS_SIZE,
> &error_fatal);
>
> if (bios_name == NULL)
> bios_name = PROM_FILENAME;
> filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
> - memory_region_set_readonly(bios, true);
> memory_region_add_subregion(get_system_memory(), PROM_ADDR, bios);
>
> /* Load OpenBIOS (ELF) */
> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
> index 7318d7e9b4..8b22ff60b8 100644
> --- a/hw/ppc/mac_oldworld.c
> +++ b/hw/ppc/mac_oldworld.c
> @@ -132,13 +132,12 @@ static void ppc_heathrow_init(MachineState *machine)
> memory_region_add_subregion(sysmem, 0, ram);
>
> /* allocate and load BIOS */
> - memory_region_init_ram(bios, NULL, "ppc_heathrow.bios", BIOS_SIZE,
> + memory_region_init_rom(bios, NULL, "ppc_heathrow.bios", BIOS_SIZE,
> &error_fatal);
>
> if (bios_name == NULL)
> bios_name = PROM_FILENAME;
> filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
> - memory_region_set_readonly(bios, true);
> memory_region_add_subregion(sysmem, PROM_ADDR, bios);
>
> /* Load OpenBIOS (ELF) */
--
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