Message ID | 20200510210128.18343-4-f4bug@amsat.org |
---|---|
State | New |
Headers | show |
Series | hw/mips/fuloong2e: PoC to fix hang after reboot | expand |
Reviewed-by: Huacai Chen <chenhc@lemote.com> On Mon, May 11, 2020 at 5:03 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > > Move the RAM-related call closer to the RAM creation block, > rename the ROM comment. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/mips/mips_fulong2e.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c > index f067fa9720..4e1a3646af 100644 > --- a/hw/mips/mips_fulong2e.c > +++ b/hw/mips/mips_fulong2e.c > @@ -316,12 +316,11 @@ static void mips_fulong2e_init(MachineState *machine) > error_report("Invalid RAM size, should be 256MB"); > exit(EXIT_FAILURE); > } > + memory_region_add_subregion(address_space_mem, 0, machine->ram); > > - /* allocate RAM */ > + /* Boot ROM */ > memory_region_init_rom(bios, NULL, "fulong2e.bios", BIOS_SIZE, > &error_fatal); > - > - memory_region_add_subregion(address_space_mem, 0, machine->ram); > memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios); > > /* > -- > 2.21.3 > >
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index f067fa9720..4e1a3646af 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -316,12 +316,11 @@ static void mips_fulong2e_init(MachineState *machine) error_report("Invalid RAM size, should be 256MB"); exit(EXIT_FAILURE); } + memory_region_add_subregion(address_space_mem, 0, machine->ram); - /* allocate RAM */ + /* Boot ROM */ memory_region_init_rom(bios, NULL, "fulong2e.bios", BIOS_SIZE, &error_fatal); - - memory_region_add_subregion(address_space_mem, 0, machine->ram); memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios); /*
Move the RAM-related call closer to the RAM creation block, rename the ROM comment. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/mips/mips_fulong2e.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)