From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3V3-0008TG-Em for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3V1-0000dA-Ot for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:53 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55235 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3V1-0000cl-Ir for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:51 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 6 May 2012 17:34:11 +0200 Message-Id: <1336318514-30906-12-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 11/74] sun4u: Let cpu_devinit() return SPARCCPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori Needed for main_cpu_reset(). Signed-off-by: Andreas F=C3=A4rber --- hw/sun4u.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/sun4u.c b/hw/sun4u.c index 8bb8557..df1aada 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -744,7 +744,7 @@ static TypeInfo ram_info =3D { .class_init =3D ram_class_init, }; =20 -static CPUSPARCState *cpu_devinit(const char *cpu_model, const struct hw= def *hwdef) +static SPARCCPU *cpu_devinit(const char *cpu_model, const struct hwdef *= hwdef) { SPARCCPU *cpu; CPUSPARCState *env; @@ -778,7 +778,7 @@ static CPUSPARCState *cpu_devinit(const char *cpu_mod= el, const struct hwdef *hwd reset_info->prom_addr =3D hwdef->prom_addr; qemu_register_reset(main_cpu_reset, reset_info); =20 - return env; + return cpu; } =20 static void sun4uv_init(MemoryRegion *address_space_mem, @@ -788,6 +788,7 @@ static void sun4uv_init(MemoryRegion *address_space_m= em, const char *initrd_filename, const char *cpu_mod= el, const struct hwdef *hwdef) { + SPARCCPU *cpu; CPUSPARCState *env; M48t59State *nvram; unsigned int i; @@ -800,7 +801,8 @@ static void sun4uv_init(MemoryRegion *address_space_m= em, void *fw_cfg; =20 /* init CPUs */ - env =3D cpu_devinit(cpu_model, hwdef); + cpu =3D cpu_devinit(cpu_model, hwdef); + env =3D &cpu->env; =20 /* set up devices */ ram_init(0, RAM_size); --=20 1.7.7