From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VK-0000ub-V4 for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3VI-0000n9-8l for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:10 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55356 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VI-0000mN-2N for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:08 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 6 May 2012 17:34:42 +0200 Message-Id: <1336318514-30906-43-git-send-email-afaerber@suse.de> In-Reply-To: <1336318514-30906-1-git-send-email-afaerber@suse.de> References: <1336318514-30906-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] [PATCH for-next 42/74] lm32_boards: Use cpu_lm32_init() to obtain LM32CPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Michael Walle , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori Needed for main_cpu_reset(). Signed-off-by: Andreas F=C3=A4rber --- hw/lm32_boards.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c index 4dd4f0a..ffb273c 100644 --- a/hw/lm32_boards.c +++ b/hw/lm32_boards.c @@ -75,6 +75,7 @@ static void lm32_evr_init(ram_addr_t ram_size_not_used, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_m= odel) { + LM32CPU *cpu; CPULM32State *env; DriveInfo *dinfo; MemoryRegion *address_space_mem =3D get_system_memory(); @@ -101,7 +102,8 @@ static void lm32_evr_init(ram_addr_t ram_size_not_use= d, if (cpu_model =3D=3D NULL) { cpu_model =3D "lm32-full"; } - env =3D cpu_init(cpu_model); + cpu =3D cpu_lm32_init(cpu_model); + env =3D &cpu->env; reset_info->env =3D env; =20 reset_info->flash_base =3D flash_base; @@ -163,6 +165,7 @@ static void lm32_uclinux_init(ram_addr_t ram_size_not= _used, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_m= odel) { + LM32CPU *cpu; CPULM32State *env; DriveInfo *dinfo; MemoryRegion *address_space_mem =3D get_system_memory(); @@ -196,7 +199,8 @@ static void lm32_uclinux_init(ram_addr_t ram_size_not= _used, if (cpu_model =3D=3D NULL) { cpu_model =3D "lm32-full"; } - env =3D cpu_init(cpu_model); + cpu =3D cpu_lm32_init(cpu_model); + env =3D &cpu->env; reset_info->env =3D env; =20 reset_info->flash_base =3D flash_base; --=20 1.7.7