[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 105/136] hw/mips: Use memory_region_init_rom() with read-only regi
From: |
Paolo Bonzini |
Subject: |
[PULL 105/136] hw/mips: Use memory_region_init_rom() with read-only regions |
Date: |
Tue, 25 Feb 2020 13:07:03 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
This commit was produced with the Coccinelle script
scripts/coccinelle/memory-region-housekeeping.cocci.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Supersedes: <address@hidden>
---
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 2e043cb..547a7d3 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 66fd4d8..cf47335 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 b934ca9..3fdbb21 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 b2aec43..54b286c 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);
--
1.8.3.1
- [PULL 099/136] memory: Correctly return alias region type, (continued)
- [PULL 099/136] memory: Correctly return alias region type, Paolo Bonzini, 2020/02/25
- [PULL 097/136] Let cpu_[physical]_memory() calls pass a boolean 'is_write' argument, Paolo Bonzini, 2020/02/25
- [PULL 098/136] Avoid cpu_physical_memory_rw() with a constant is_write argument, Paolo Bonzini, 2020/02/25
- [PULL 095/136] Avoid address_space_rw() with a constant is_write argument, Paolo Bonzini, 2020/02/25
- [PULL 102/136] scripts/cocci: Patch to replace memory_region_init_{ram, readonly -> rom}, Paolo Bonzini, 2020/02/25
- [PULL 100/136] memory: Simplify memory_region_init_rom_nomigrate() to ease review, Paolo Bonzini, 2020/02/25
- [PULL 101/136] scripts/cocci: Rename memory-region-{init-ram -> housekeeping}, Paolo Bonzini, 2020/02/25
- [PULL 103/136] hw/arm: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/02/25
- [PULL 104/136] hw/display: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/02/25
- [PULL 103/136] hw/arm: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/02/25
- [PULL 105/136] hw/mips: Use memory_region_init_rom() with read-only regions,
Paolo Bonzini <=
- [PULL 106/136] hw/m68k: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/02/25
- [PULL 107/136] hw/net: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/02/25
- [PULL 108/136] hw/pci-host: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/02/25
- [PULL 110/136] hw/riscv: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/02/25
- [PULL 113/136] scripts/cocci: Patch to detect potential use of memory_region_init_rom, Paolo Bonzini, 2020/02/25
- [PULL 112/136] hw/sparc: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/02/25
- [PULL 111/136] hw/sh4: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/02/25
- [PULL 109/136] hw/ppc: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/02/25
- [PULL 114/136] hw/arm/stm32: Use memory_region_init_rom() with read-only regions, Paolo Bonzini, 2020/02/25
- [PULL 116/136] hw/i386/pc_sysfw: Simplify using memory_region_init_alias(), Paolo Bonzini, 2020/02/25