From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44091) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDJvD-0002ns-Bu for qemu-devel@nongnu.org; Mon, 19 Jan 2015 16:31:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDJv8-0007md-MC for qemu-devel@nongnu.org; Mon, 19 Jan 2015 16:31:43 -0500 Received: from smtp2-g21.free.fr ([212.27.42.2]:58399) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDJv8-0007mZ-HG for qemu-devel@nongnu.org; Mon, 19 Jan 2015 16:31:38 -0500 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 19 Jan 2015 22:28:32 +0100 Message-Id: <1421702918-27143-3-git-send-email-hpoussin@reactos.org> In-Reply-To: <1421702918-27143-1-git-send-email-hpoussin@reactos.org> References: <1421702918-27143-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 2/7] jazz: do not explode QEMUMachineInitArgs structure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Leon Alrae , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno Also remove address_space and address_space_io parameters, which where always get_system_memory() and get_system_io(). Signed-off-by: Herv=C3=A9 Poussineau --- 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, s= ize); } =20 -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 =3D get_system_memory(); + MemoryRegion *address_space_io =3D get_system_io(); + const char *cpu_model =3D machine->cpu_model; char *filename; int bios_size, n; MIPSCPU *cpu; @@ -179,7 +179,8 @@ static void mips_jazz_init(MemoryRegion *address_spac= e, cc->do_unassigned_access =3D mips_jazz_do_unassigned_access; =20 /* 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); =20 @@ -333,19 +334,13 @@ static void mips_jazz_init(MemoryRegion *address_sp= ace, static void mips_magnum_init(MachineState *machine) { - ram_addr_t ram_size =3D machine->ram_size; - const char *cpu_model =3D machine->cpu_model; - mips_jazz_init(get_system_memory(), get_system_io(), - ram_size, cpu_model, JAZZ_MAGNUM); + mips_jazz_init(machine, JAZZ_MAGNUM); } =20 static void mips_pica61_init(MachineState *machine) { - ram_addr_t ram_size =3D machine->ram_size; - const char *cpu_model =3D machine->cpu_model; - mips_jazz_init(get_system_memory(), get_system_io(), - ram_size, cpu_model, JAZZ_PICA61); + mips_jazz_init(machine, JAZZ_PICA61); } =20 static QEMUMachine mips_magnum_machine =3D { --=20 1.7.10.4