From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3V8-0000It-NB for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3V6-0000fO-Ho for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:58 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55271 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3V6-0000ew-Af for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:56 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 6 May 2012 17:34:21 +0200 Message-Id: <1336318514-30906-22-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 21/74] ppc4xx_devs: 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: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori Needed for ppc4xx_reset(). Signed-off-by: Andreas F=C3=A4rber --- hw/ppc4xx_devs.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c index 00e36f4..4cefd75 100644 --- a/hw/ppc4xx_devs.c +++ b/hw/ppc4xx_devs.c @@ -51,15 +51,18 @@ CPUPPCState *ppc4xx_init (const char *cpu_model, clk_setup_t *cpu_clk, clk_setup_t *tb_clk, uint32_t sysclk) { + PowerPCCPU *cpu; CPUPPCState *env; =20 /* init CPUs */ - env =3D cpu_init(cpu_model); - if (!env) { + cpu =3D cpu_ppc_init(cpu_model); + if (cpu =3D=3D NULL) { fprintf(stderr, "Unable to find PowerPC %s CPU definition\n", cpu_model); exit(1); } + env =3D &cpu->env; + cpu_clk->cb =3D NULL; /* We don't care about CPU clock frequency cha= nges */ cpu_clk->opaque =3D env; /* Set time-base frequency to sysclk */ --=20 1.7.7