From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbiVk-0003uv-Cb for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:24:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbiVi-00004y-Mm for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:24:39 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52796 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbiVi-0008WO-GI for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:24:38 -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 68EC09141C for ; Tue, 5 Jun 2012 03:24:37 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 5 Jun 2012 03:22:43 +0200 Message-Id: <1338859366-20689-72-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 71/74] leon3: Store SPARCCPU 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 Acked-by: Blue Swirl --- hw/leon3.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/leon3.c b/hw/leon3.c index 8ffef83..878d3aa 100644 --- a/hw/leon3.c +++ b/hw/leon3.c @@ -42,16 +42,16 @@ #define MAX_PILS 16 =20 typedef struct ResetData { - CPUSPARCState *env; + SPARCCPU *cpu; uint32_t entry; /* save kernel entry in case of reset */ } ResetData; =20 static void main_cpu_reset(void *opaque) { ResetData *s =3D (ResetData *)opaque; - CPUSPARCState *env =3D s->env; + CPUSPARCState *env =3D &s->cpu->env; =20 - cpu_state_reset(env); + cpu_reset(CPU(s->cpu)); =20 env->halted =3D 0; env->pc =3D s->entry; @@ -129,7 +129,7 @@ static void leon3_generic_hw_init(ram_addr_t ram_siz= e, =20 /* Reset data */ reset_info =3D g_malloc0(sizeof(ResetData)); - reset_info->env =3D env; + reset_info->cpu =3D cpu; qemu_register_reset(main_cpu_reset, reset_info); =20 /* Allocate IRQ manager */ --=20 1.7.7