[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/13] mac_oldworld: Drop a variable, use get_system_memory() dire
From: |
Mark Cave-Ayland |
Subject: |
[PULL 11/13] mac_oldworld: Drop a variable, use get_system_memory() directly |
Date: |
Sun, 18 Oct 2020 16:59:17 +0100 |
From: BALATON Zoltan <balaton@eik.bme.hu>
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>
---
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 0117ae17f5..1abf26b5b4 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;
@@ -129,12 +128,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;
--
2.20.1
- [PULL 01/13] macio: don't reference serial_hd() directly within the device, (continued)
- [PULL 01/13] macio: don't reference serial_hd() directly within the device, Mark Cave-Ayland, 2020/10/18
- [PULL 02/13] grackle: use qdev gpios for PCI IRQs, Mark Cave-Ayland, 2020/10/18
- [PULL 03/13] uninorth: use qdev gpios for PCI IRQs, Mark Cave-Ayland, 2020/10/18
- [PULL 04/13] m48t59-isa: remove legacy m48t59_init_isa() function, Mark Cave-Ayland, 2020/10/18
- [PULL 05/13] sun4m: use qdev properties instead of legacy m48t59_init() function, Mark Cave-Ayland, 2020/10/18
- [PULL 06/13] sun4u: use qdev properties instead of legacy m48t59_init() function, Mark Cave-Ayland, 2020/10/18
- [PULL 07/13] ppc405_boards: use qdev properties instead of legacy m48t59_init() function, Mark Cave-Ayland, 2020/10/18
- [PULL 08/13] m48t59: remove legacy m48t59_init() function, Mark Cave-Ayland, 2020/10/18
- [PULL 09/13] mac_oldworld: Allow loading binary ROM image, Mark Cave-Ayland, 2020/10/18
- [PULL 10/13] mac_newworld: Allow loading binary ROM image, Mark Cave-Ayland, 2020/10/18
- [PULL 11/13] mac_oldworld: Drop a variable, use get_system_memory() directly,
Mark Cave-Ayland <=
- [PULL 13/13] mac_oldworld: Change PCI address of macio to match real hardware, Mark Cave-Ayland, 2020/10/18
- [PULL 12/13] mac_oldworld: Drop some variables, Mark Cave-Ayland, 2020/10/18
- Re: [PULL 00/13] qemu-macppc queue 20201018, Mark Cave-Ayland, 2020/10/19