From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38304) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVOnY-0005Rj-30 for qemu-devel@nongnu.org; Tue, 10 Mar 2015 14:22:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YVOnP-0002fB-I1 for qemu-devel@nongnu.org; Tue, 10 Mar 2015 14:22:31 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55110 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVOnP-0002f3-CA for qemu-devel@nongnu.org; Tue, 10 Mar 2015 14:22:23 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 10 Mar 2015 19:22:18 +0100 Message-Id: <1426011740-17688-5-git-send-email-afaerber@suse.de> In-Reply-To: <1426011740-17688-1-git-send-email-afaerber@suse.de> References: <1426011740-17688-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 4/6] m68k: Use cpu_m68k_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Eduardo Habkost Instead of using the legacy cpu_init() function, use cpu_m68k_init() directly to create a M68kCPU object. Signed-off-by: Eduardo Habkost Signed-off-by: Andreas F=C3=A4rber --- hw/m68k/dummy_m68k.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/m68k/dummy_m68k.c b/hw/m68k/dummy_m68k.c index facd561..278f4c0 100644 --- a/hw/m68k/dummy_m68k.c +++ b/hw/m68k/dummy_m68k.c @@ -21,6 +21,7 @@ static void dummy_m68k_init(MachineState *machine) ram_addr_t ram_size =3D machine->ram_size; const char *cpu_model =3D machine->cpu_model; const char *kernel_filename =3D machine->kernel_filename; + M68kCPU *cpu; CPUM68KState *env; MemoryRegion *address_space_mem =3D get_system_memory(); MemoryRegion *ram =3D g_new(MemoryRegion, 1); @@ -30,11 +31,12 @@ static void dummy_m68k_init(MachineState *machine) =20 if (!cpu_model) cpu_model =3D "cfv4e"; - env =3D cpu_init(cpu_model); - if (!env) { + cpu =3D cpu_m68k_init(cpu_model); + if (!cpu) { fprintf(stderr, "Unable to find m68k CPU definition\n"); exit(1); } + env =3D &cpu->env; =20 /* Initialize CPU registers. */ env->vbr =3D 0; --=20 2.1.4