From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2T-0001Wn-7Y for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSH2R-0005fm-3R for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:24 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35620 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2Q-0005f4-TV for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:23 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 10 May 2012 02:14:31 +0200 Message-Id: <1336608892-30501-54-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 53/74] axis_dev88: Use cpu_cris_init() to obtain CRISCPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Needed for cris_load_image(). Signed-off-by: Andreas F=C3=A4rber --- hw/axis_dev88.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c index 2304e35..636708c 100644 --- a/hw/axis_dev88.c +++ b/hw/axis_dev88.c @@ -247,6 +247,7 @@ void axisdev88_init (ram_addr_t ram_size, const char *kernel_filename, const char *kernel_cmd= line, const char *initrd_filename, const char *cpu_model) { + CRISCPU *cpu; CPUCRISState *env; DeviceState *dev; SysBusDevice *s; @@ -263,7 +264,8 @@ void axisdev88_init (ram_addr_t ram_size, if (cpu_model =3D=3D NULL) { cpu_model =3D "crisv32"; } - env =3D cpu_init(cpu_model); + cpu =3D cpu_cris_init(cpu_model); + env =3D &cpu->env; =20 /* allocate RAM */ memory_region_init_ram(phys_ram, "axisdev88.ram", ram_size); --=20 1.7.7