From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbiVZ-0003by-8h for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:24:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbiVX-0008TG-I2 for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:24:28 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52775 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbiVX-0008Sj-Cg for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:24:27 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 4D1E29141C for ; Tue, 5 Jun 2012 03:24:26 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 5 Jun 2012 03:22:32 +0200 Message-Id: <1338859366-20689-61-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 60/74] virtex_ml507: Use cpu_ppc_init() to obtain PowerPCCPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Needed to change ppc440_init_xilinx() return type. Signed-off-by: Andreas F=C3=A4rber Acked-by: Alexander Graf --- hw/virtex_ml507.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c index 4a133b5..3013016 100644 --- a/hw/virtex_ml507.c +++ b/hw/virtex_ml507.c @@ -83,14 +83,16 @@ static CPUPPCState *ppc440_init_xilinx(ram_addr_t *ra= m_size, const char *cpu_model, uint32_t sysclk) { + PowerPCCPU *cpu; CPUPPCState *env; qemu_irq *irqs; =20 - env =3D cpu_init(cpu_model); - if (!env) { + cpu =3D cpu_ppc_init(cpu_model); + if (cpu =3D=3D NULL) { fprintf(stderr, "Unable to initialize CPU!\n"); exit(1); } + env =3D &cpu->env; =20 ppc_booke_timers_init(env, sysclk, 0/* no flags */); =20 --=20 1.7.7