From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2P-0001Kx-Dk for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSH2M-0005cM-O6 for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:20 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35596 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2M-0005bH-HH for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:18 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 10 May 2012 02:14:22 +0200 Message-Id: <1336608892-30501-45-git-send-email-afaerber@suse.de> In-Reply-To: <1336608892-30501-1-git-send-email-afaerber@suse.de> References: <1336608892-30501-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 next v2 44/74] milkymist: 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: Michael Walle , =?UTF-8?q?Andreas=20F=C3=A4rber?= Needed for main_cpu_reset(). Signed-off-by: Andreas F=C3=A4rber Acked-by: Michael Walle --- hw/milkymist.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/hw/milkymist.c b/hw/milkymist.c index 8bb6a97..59f37b4 100644 --- a/hw/milkymist.c +++ b/hw/milkymist.c @@ -79,6 +79,7 @@ milkymist_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; int kernel_size; DriveInfo *dinfo; @@ -105,7 +106,8 @@ milkymist_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 cpu_lm32_set_phys_msb_ignore(env, 1); --=20 1.7.7