From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbiVe-0003ox-TH for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:24:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbiVd-0008VH-6q for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:24:34 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52782 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbiVd-0008Uv-0R for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:24:33 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 5 Jun 2012 03:22:37 +0200 Message-Id: <1338859366-20689-66-git-send-email-afaerber@suse.de> In-Reply-To: <1338859366-20689-1-git-send-email-afaerber@suse.de> References: <1338859366-20689-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 65/74] sun4m: Use cpu_sparc_init() to obtain SPARCCPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , =?UTF-8?q?Andreas=20F=C3=A4rber?= Needed for {main,secondary}_cpu_reset(). Signed-off-by: Andreas F=C3=A4rber Acked-by: Blue Swirl --- hw/sun4m.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/sun4m.c b/hw/sun4m.c index 34088ad..c5d2e40 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -809,13 +809,15 @@ static TypeInfo ram_info =3D { static void cpu_devinit(const char *cpu_model, unsigned int id, uint64_t prom_addr, qemu_irq **cpu_irqs) { + SPARCCPU *cpu; CPUSPARCState *env; =20 - env =3D cpu_init(cpu_model); - if (!env) { + cpu =3D cpu_sparc_init(cpu_model); + if (cpu =3D=3D NULL) { fprintf(stderr, "qemu: Unable to find Sparc CPU definition\n"); exit(1); } + env =3D &cpu->env; =20 cpu_sparc_set_id(env, id); if (id =3D=3D 0) { --=20 1.7.7