From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VH-0000jw-Bm for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3VF-0000l9-HR for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:06 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55337 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VF-0000kV-BO for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:05 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 6 May 2012 17:34:37 +0200 Message-Id: <1336318514-30906-38-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 37/74] arm_boot: Pass ARMCPU to do_cpu_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/arm_boot.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/arm_boot.c b/hw/arm_boot.c index 7447f5c..eb2d176 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -274,10 +274,11 @@ static int load_dtb(target_phys_addr_t addr, const = struct arm_boot_info *binfo) =20 static void do_cpu_reset(void *opaque) { - CPUARMState *env =3D opaque; + ARMCPU *cpu =3D opaque; + CPUARMState *env =3D &cpu->env; const struct arm_boot_info *info =3D env->boot_info; =20 - cpu_state_reset(env); + cpu_reset(CPU(cpu)); if (info) { if (!info->is_linux) { /* Jump to the entry point. */ @@ -302,6 +303,7 @@ static void do_cpu_reset(void *opaque) =20 void arm_load_kernel(CPUARMState *env, struct arm_boot_info *info) { + ARMCPU *cpu; int kernel_size; int initrd_size; int n; @@ -406,7 +408,8 @@ void arm_load_kernel(CPUARMState *env, struct arm_boo= t_info *info) info->is_linux =3D is_linux; =20 for (; env; env =3D env->next_cpu) { + cpu =3D arm_env_get_cpu(env); env->boot_info =3D info; - qemu_register_reset(do_cpu_reset, env); + qemu_register_reset(do_cpu_reset, cpu); } } --=20 1.7.7