From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VQ-0001EJ-FC for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3VO-0000rk-6y for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:15 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55404 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VO-0000qx-0r for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:14 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 6 May 2012 17:34:53 +0200 Message-Id: <1336318514-30906-54-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 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: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori , "Edgar E. Iglesias" 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