ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

m68k/q800: use memdev for RAM 

Switch to using generic main RAM allocation. To do this set
MachineClass::default_ram_id to m68k_mac.ram and use
MachineState::ram instead of manually initializing
RAM memory region.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200219160953.13771-48-imammedo@redhat.com>
This commit is contained in:
Igor Mammedov 2020-02-19 11:09:21 -05:00 committed by Patchew Importer
parent c55f97a0e1
commit 8591a179af
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/m68k/q800.c
View File

@ -160,7 +160,6 @@ static void q800_init(MachineState *machine)
ram_addr_t initrd_base; ram_addr_t initrd_base;
int32_t initrd_size; int32_t initrd_size;
MemoryRegion *rom; MemoryRegion *rom;
MemoryRegion *ram;
MemoryRegion *io; MemoryRegion *io;
const int io_slice_nb = (IO_SIZE / IO_SLICE) - 1; const int io_slice_nb = (IO_SIZE / IO_SLICE) - 1;
int i; int i;
@ -194,9 +193,7 @@ static void q800_init(MachineState *machine)
qemu_register_reset(main_cpu_reset, cpu); qemu_register_reset(main_cpu_reset, cpu);
/* RAM */ /* RAM */
ram = g_malloc(sizeof(*ram)); memory_region_add_subregion(get_system_memory(), 0, machine->ram);
memory_region_init_ram(ram, NULL, "m68k_mac.ram", ram_size, &error_abort);
memory_region_add_subregion(get_system_memory(), 0, ram);
/* /*
* Memory from IO_BASE to IO_BASE + IO_SLICE is repeated * Memory from IO_BASE to IO_BASE + IO_SLICE is repeated
@ -443,6 +440,7 @@ static void q800_machine_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 1; mc->max_cpus = 1;
mc->is_default = 0; mc->is_default = 0;
mc->block_default_type = IF_SCSI; mc->block_default_type = IF_SCSI;
mc->default_ram_id = "m68k_mac.ram";
} }
static const TypeInfo q800_machine_typeinfo = { static const TypeInfo q800_machine_typeinfo = {