mirror of https://github.com/xemu-project/xemu.git
mac_oldworld: Drop a variable, use get_system_memory() directly
Half of the occurances already use get_system_memory() directly instead of sysmem variable, convert the two other uses to get_system_memory() too which seems to be more common and drop the variable. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <b4c714e03690deb6f94f80f7a5b2af47d90550ae.1602805637.git.balaton@eik.bme.hu> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
parent
31a6f3534a
commit
c3481ab096
|
@ -87,7 +87,6 @@ static void ppc_heathrow_init(MachineState *machine)
|
||||||
const char *kernel_cmdline = machine->kernel_cmdline;
|
const char *kernel_cmdline = machine->kernel_cmdline;
|
||||||
const char *initrd_filename = machine->initrd_filename;
|
const char *initrd_filename = machine->initrd_filename;
|
||||||
const char *boot_device = machine->boot_order;
|
const char *boot_device = machine->boot_order;
|
||||||
MemoryRegion *sysmem = get_system_memory();
|
|
||||||
PowerPCCPU *cpu = NULL;
|
PowerPCCPU *cpu = NULL;
|
||||||
CPUPPCState *env = NULL;
|
CPUPPCState *env = NULL;
|
||||||
char *filename;
|
char *filename;
|
||||||
|
@ -129,12 +128,12 @@ static void ppc_heathrow_init(MachineState *machine)
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
memory_region_add_subregion(sysmem, 0, machine->ram);
|
memory_region_add_subregion(get_system_memory(), 0, machine->ram);
|
||||||
|
|
||||||
/* allocate and load firmware ROM */
|
/* allocate and load firmware ROM */
|
||||||
memory_region_init_rom(bios, NULL, "ppc_heathrow.bios", PROM_SIZE,
|
memory_region_init_rom(bios, NULL, "ppc_heathrow.bios", PROM_SIZE,
|
||||||
&error_fatal);
|
&error_fatal);
|
||||||
memory_region_add_subregion(sysmem, PROM_BASE, bios);
|
memory_region_add_subregion(get_system_memory(), PROM_BASE, bios);
|
||||||
|
|
||||||
if (!bios_name) {
|
if (!bios_name) {
|
||||||
bios_name = PROM_FILENAME;
|
bios_name = PROM_FILENAME;
|
||||||
|
|
Loading…
Reference in New Issue