From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VG-0000ia-RT for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3VF-0000kr-1N for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:06 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55334 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VE-0000k2-SD for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:04 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 6 May 2012 17:34:36 +0200 Message-Id: <1336318514-30906-37-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 36/74] armv7m: Pass ARMCPU to armv7m_reset() 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 Allows us to use cpu_reset() in place of cpu_state_reset(). Signed-off-by: Andreas F=C3=A4rber --- hw/armv7m.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/armv7m.c b/hw/armv7m.c index 4e5971c..418139a 100644 --- a/hw/armv7m.c +++ b/hw/armv7m.c @@ -149,7 +149,9 @@ static void armv7m_bitband_init(void) =20 static void armv7m_reset(void *opaque) { - cpu_state_reset((CPUARMState *)opaque); + ARMCPU *cpu =3D opaque; + + cpu_reset(CPU(cpu)); } =20 /* Init CPU and memory for a v7-M based board. @@ -244,7 +246,7 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem= , vmstate_register_ram_global(hack); memory_region_add_subregion(address_space_mem, 0xfffff000, hack); =20 - qemu_register_reset(armv7m_reset, env); + qemu_register_reset(armv7m_reset, cpu); return pic; } =20 --=20 1.7.7