From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YR5CN-0007hC-8I for qemu-devel@nongnu.org; Thu, 26 Feb 2015 15:38:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YR5CF-00087f-Fr for qemu-devel@nongnu.org; Thu, 26 Feb 2015 15:38:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60458) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YR5CF-00087b-7K for qemu-devel@nongnu.org; Thu, 26 Feb 2015 15:38:11 -0500 From: Eduardo Habkost Date: Thu, 26 Feb 2015 17:37:47 -0300 Message-Id: <1424983069-14080-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1424983069-14080-1-git-send-email-ehabkost@redhat.com> References: <1424983069-14080-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 2/4] m68k: Use cpu_m68k_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?q?Andreas=20F=C3=A4rber?= Cc: Blue Swirl , Riku Voipio , qemu-devel@nongnu.org Instead of using the legacy cpu_init() function, use cpu_m68k_init() directly to create a M68kCPU object. Signed-off-by: Eduardo Habkost --- 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 = machine->ram_size; const char *cpu_model = machine->cpu_model; const char *kernel_filename = machine->kernel_filename; + M68kCPU *cpu; CPUM68KState *env; MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *ram = g_new(MemoryRegion, 1); @@ -30,11 +31,12 @@ static void dummy_m68k_init(MachineState *machine) if (!cpu_model) cpu_model = "cfv4e"; - env = cpu_init(cpu_model); - if (!env) { + cpu = cpu_m68k_init(cpu_model); + if (!cpu) { fprintf(stderr, "Unable to find m68k CPU definition\n"); exit(1); } + env = &cpu->env; /* Initialize CPU registers. */ env->vbr = 0; -- 2.1.0