From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50621) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2R-0001Qn-7s for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSH2P-0005eg-JK for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:22 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35611 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2P-0005do-Cg for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:21 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 10 May 2012 02:14:28 +0200 Message-Id: <1336608892-30501-51-git-send-email-afaerber@suse.de> In-Reply-To: <1336608892-30501-1-git-send-email-afaerber@suse.de> References: <1336608892-30501-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 next v2 50/74] xtensa_lx60: Pass XtensaCPU to lx60_reset() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Max Filippov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Allows us to use cpu_reset() in place of cpu_state_reset(). Signed-off-by: Andreas F=C3=A4rber --- hw/xtensa_lx60.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c index 31f8adc..b153bfd 100644 --- a/hw/xtensa_lx60.c +++ b/hw/xtensa_lx60.c @@ -148,9 +148,9 @@ static uint64_t translate_phys_addr(void *env, uint64= _t addr) =20 static void lx60_reset(void *opaque) { - CPUXtensaState *env =3D opaque; + XtensaCPU *cpu =3D opaque; =20 - cpu_state_reset(env); + cpu_reset(CPU(cpu)); } =20 static void lx_init(const LxBoardDesc *board, @@ -184,7 +184,7 @@ static void lx_init(const LxBoardDesc *board, env =3D &cpu->env; =20 env->sregs[PRID] =3D n; - qemu_register_reset(lx60_reset, env); + qemu_register_reset(lx60_reset, cpu); /* Need MMU initialized prior to ELF loading, * so that ELF gets loaded into virtual addresses */ --=20 1.7.7