From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50445) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2M-0001C7-Gp for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSH2K-0005ad-Oc for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:18 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35586 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2K-0005Zx-HV for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:16 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 10 May 2012 02:14:18 +0200 Message-Id: <1336608892-30501-41-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 40/74] r2d: Store SuperHCPU in ResetData 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() in main_cpu_reset(). Signed-off-by: Andreas F=C3=A4rber --- hw/r2d.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/r2d.c b/hw/r2d.c index 1bd8df6..0f16e81 100644 --- a/hw/r2d.c +++ b/hw/r2d.c @@ -192,16 +192,16 @@ static qemu_irq *r2d_fpga_init(MemoryRegion *sysmem= , } =20 typedef struct ResetData { - CPUSH4State *env; + SuperHCPU *cpu; uint32_t vector; } ResetData; =20 static void main_cpu_reset(void *opaque) { ResetData *s =3D (ResetData *)opaque; - CPUSH4State *env =3D s->env; + CPUSH4State *env =3D &s->cpu->env; =20 - cpu_state_reset(env); + cpu_reset(CPU(s->cpu)); env->pc =3D s->vector; } =20 @@ -248,7 +248,7 @@ static void r2d_init(ram_addr_t ram_size, env =3D &cpu->env; =20 reset_info =3D g_malloc0(sizeof(ResetData)); - reset_info->env =3D env; + reset_info->cpu =3D cpu; reset_info->vector =3D env->pc; qemu_register_reset(main_cpu_reset, reset_info); =20 --=20 1.7.7