falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jazz: do not explode QEMUMachineInitArgs structure 

Also remove address_space and address_space_io parameters, which
where always get_system_memory() and get_system_io().

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
This commit is contained in:
Hervé Poussineau 2015-02-01 09:12:51 +01:00 committed by Leon Alrae
parent bb2ed009e7
commit f33772c851
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/mips/mips_jazz.c
View File

@ -120,12 +120,12 @@ static void mips_jazz_do_unassigned_access(CPUState *cpu, hwaddr addr,
(*real_do_unassigned_access)(cpu, addr, is_write, is_exec, opaque, size); (*real_do_unassigned_access)(cpu, addr, is_write, is_exec, opaque, size);
} }
static void mips_jazz_init(MemoryRegion *address_space, static void mips_jazz_init(MachineState *machine,
MemoryRegion *address_space_io,
ram_addr_t ram_size,
const char *cpu_model,
enum jazz_model_e jazz_model) enum jazz_model_e jazz_model)
{ {
MemoryRegion *address_space = get_system_memory();
MemoryRegion *address_space_io = get_system_io();
const char *cpu_model = machine->cpu_model;
char *filename; char *filename;
int bios_size, n; int bios_size, n;
MIPSCPU *cpu; MIPSCPU *cpu;
@ -179,7 +179,8 @@ static void mips_jazz_init(MemoryRegion *address_space,
cc->do_unassigned_access = mips_jazz_do_unassigned_access; cc->do_unassigned_access = mips_jazz_do_unassigned_access;
/* allocate RAM */ /* allocate RAM */
memory_region_init_ram(ram, NULL, "mips_jazz.ram", ram_size, &error_abort); memory_region_init_ram(ram, NULL, "mips_jazz.ram", machine->ram_size,
&error_abort);
vmstate_register_ram_global(ram); vmstate_register_ram_global(ram);
memory_region_add_subregion(address_space, 0, ram); memory_region_add_subregion(address_space, 0, ram);
@ -333,19 +334,13 @@ static void mips_jazz_init(MemoryRegion *address_space,
static static
void mips_magnum_init(MachineState *machine) void mips_magnum_init(MachineState *machine)
{ {
ram_addr_t ram_size = machine->ram_size; mips_jazz_init(machine, JAZZ_MAGNUM);
const char *cpu_model = machine->cpu_model;
mips_jazz_init(get_system_memory(), get_system_io(),
ram_size, cpu_model, JAZZ_MAGNUM);
} }
static static
void mips_pica61_init(MachineState *machine) void mips_pica61_init(MachineState *machine)
{ {
ram_addr_t ram_size = machine->ram_size; mips_jazz_init(machine, JAZZ_PICA61);
const char *cpu_model = machine->cpu_model;
mips_jazz_init(get_system_memory(), get_system_io(),
ram_size, cpu_model, JAZZ_PICA61);
} }
static QEMUMachine mips_magnum_machine = { static QEMUMachine mips_magnum_machine = {