Message ID | 321dd439b98051d7537e9a04fa02785ef132749a.1592315226.git.balaton@eik.bme.hu (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Mac Old World ROM experiment | expand |
On 16/06/2020 14:47, BALATON Zoltan wrote: > Half of the occurances already use get_system_memory() directly > instead of sysmem variable, convert the two other uses to > get_system_memory() tii which seems to be more common and drop the > variable. > > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> > --- > hw/ppc/mac_oldworld.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c > index baf3da6f90..d1c4244b1e 100644 > --- a/hw/ppc/mac_oldworld.c > +++ b/hw/ppc/mac_oldworld.c > @@ -87,7 +87,6 @@ static void ppc_heathrow_init(MachineState *machine) > const char *kernel_cmdline = machine->kernel_cmdline; > const char *initrd_filename = machine->initrd_filename; > const char *boot_device = machine->boot_order; > - MemoryRegion *sysmem = get_system_memory(); > PowerPCCPU *cpu = NULL; > CPUPPCState *env = NULL; > char *filename; > @@ -128,12 +127,12 @@ static void ppc_heathrow_init(MachineState *machine) > 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 */ > memory_region_init_rom(bios, NULL, "ppc_heathrow.bios", PROM_SIZE, > &error_fatal); > - memory_region_add_subregion(sysmem, PROM_BASE, bios); > + memory_region_add_subregion(get_system_memory(), PROM_BASE, bios); > > if (!bios_name) { > bios_name = PROM_FILENAME; Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> ATB, Mark.
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index baf3da6f90..d1c4244b1e 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -87,7 +87,6 @@ static void ppc_heathrow_init(MachineState *machine) const char *kernel_cmdline = machine->kernel_cmdline; const char *initrd_filename = machine->initrd_filename; const char *boot_device = machine->boot_order; - MemoryRegion *sysmem = get_system_memory(); PowerPCCPU *cpu = NULL; CPUPPCState *env = NULL; char *filename; @@ -128,12 +127,12 @@ static void ppc_heathrow_init(MachineState *machine) 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 */ memory_region_init_rom(bios, NULL, "ppc_heathrow.bios", PROM_SIZE, &error_fatal); - memory_region_add_subregion(sysmem, PROM_BASE, bios); + memory_region_add_subregion(get_system_memory(), PROM_BASE, bios); if (!bios_name) { bios_name = PROM_FILENAME;
Half of the occurances already use get_system_memory() directly instead of sysmem variable, convert the two other uses to get_system_memory() tii which seems to be more common and drop the variable. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> --- hw/ppc/mac_oldworld.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)