From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2T-0001YR-OO for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSH2R-0005gb-W7 for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:25 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35624 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2R-0005fh-PM for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:23 -0400 Received: from relay2.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 B2124975D0 for ; Thu, 10 May 2012 02:15:22 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 10 May 2012 02:14:33 +0200 Message-Id: <1336608892-30501-56-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 55/74] cris-boot: Pass CRISCPU to main_cpu_reset(). 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?= Allows us to use cpu_reset() in place of cpu_state_reset(). Signed-off-by: Andreas F=C3=A4rber --- hw/cris-boot.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/cris-boot.c b/hw/cris-boot.c index 331b2d1..b21326f 100644 --- a/hw/cris-boot.c +++ b/hw/cris-boot.c @@ -29,12 +29,13 @@ =20 static void main_cpu_reset(void *opaque) { - CPUCRISState *env =3D opaque; + CRISCPU *cpu =3D opaque; + CPUCRISState *env =3D &cpu->env; struct cris_load_info *li; =20 li =3D env->load_info; =20 - cpu_state_reset(env); + cpu_reset(CPU(cpu)); =20 if (!li) { /* nothing more to do. */ @@ -93,5 +94,5 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_inf= o *li) } pstrcpy_targphys("cmdline", 0x40000000, 256, li->cmdline); } - qemu_register_reset(main_cpu_reset, env); + qemu_register_reset(main_cpu_reset, cpu); } --=20 1.7.7