[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/7] jazz: do not explode QEMUMachineInitArgs struct
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH 2/7] jazz: do not explode QEMUMachineInitArgs structure |
Date: |
Mon, 19 Jan 2015 22:28:32 +0100 |
Also remove address_space and address_space_io parameters, which
where always get_system_memory() and get_system_io().
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/mips/mips_jazz.c | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index de35299..738e9c7 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -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);
}
-static void mips_jazz_init(MemoryRegion *address_space,
- MemoryRegion *address_space_io,
- ram_addr_t ram_size,
- const char *cpu_model,
+static void mips_jazz_init(MachineState *machine,
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;
int bios_size, n;
MIPSCPU *cpu;
@@ -179,7 +179,8 @@ static void mips_jazz_init(MemoryRegion *address_space,
cc->do_unassigned_access = mips_jazz_do_unassigned_access;
/* 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);
memory_region_add_subregion(address_space, 0, ram);
@@ -333,19 +334,13 @@ static void mips_jazz_init(MemoryRegion *address_space,
static
void mips_magnum_init(MachineState *machine)
{
- ram_addr_t ram_size = machine->ram_size;
- const char *cpu_model = machine->cpu_model;
- mips_jazz_init(get_system_memory(), get_system_io(),
- ram_size, cpu_model, JAZZ_MAGNUM);
+ mips_jazz_init(machine, JAZZ_MAGNUM);
}
static
void mips_pica61_init(MachineState *machine)
{
- ram_addr_t ram_size = machine->ram_size;
- const char *cpu_model = machine->cpu_model;
- mips_jazz_init(get_system_memory(), get_system_io(),
- ram_size, cpu_model, JAZZ_PICA61);
+ mips_jazz_init(machine, JAZZ_PICA61);
}
static QEMUMachine mips_magnum_machine = {
--
1.7.10.4
- [Qemu-devel] [PATCH 0/7] isa: remove isa_mem_base variable, Hervé Poussineau, 2015/01/19
- [Qemu-devel] [PATCH 5/7] piix4: use PCI address space instead of system memory, Hervé Poussineau, 2015/01/19
- [Qemu-devel] [PATCH 6/7] gt64xxx: remove isa_mem_base usage, Hervé Poussineau, 2015/01/19
- [Qemu-devel] [PATCH 3/7] jazz: remove usage of isa_mem_base, Hervé Poussineau, 2015/01/19
- [Qemu-devel] [PATCH 1/7] isa: add memory space parameter to isa_bus_new, Hervé Poussineau, 2015/01/19
- [Qemu-devel] [PATCH 7/7] isa: remove isa_mem_base variable, Hervé Poussineau, 2015/01/19
- [Qemu-devel] [PATCH 2/7] jazz: do not explode QEMUMachineInitArgs structure,
Hervé Poussineau <=
- [Qemu-devel] [PATCH 4/7] mips: remove isa_mem_base usage, Hervé Poussineau, 2015/01/19