From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbiVE-0003IT-Dg for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:24:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbiVC-0008LA-Mh for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:24:07 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52736 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbiVC-0008Km-Fi for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:24:06 -0400 Received: from relay1.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 62407915A2 for ; Tue, 5 Jun 2012 03:24:05 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 5 Jun 2012 03:22:09 +0200 Message-Id: <1338859366-20689-38-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 37/74] mips_fulong2e: Pass MIPSCPU 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/mips_fulong2e.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c index 08d3aa0..38e4b86 100644 --- a/hw/mips_fulong2e.c +++ b/hw/mips_fulong2e.c @@ -198,9 +198,10 @@ static void write_bootloader (CPUMIPSState *env, uin= t8_t *base, int64_t kernel_a =20 static void main_cpu_reset(void *opaque) { - CPUMIPSState *env =3D opaque; + MIPSCPU *cpu =3D opaque; + CPUMIPSState *env =3D &cpu->env; =20 - cpu_state_reset(env); + cpu_reset(CPU(cpu)); /* TODO: 2E reset stuff */ if (loaderparams.kernel_filename) { env->CP0_Status &=3D ~((1 << CP0St_BEV) | (1 << CP0St_ERL)); @@ -286,7 +287,7 @@ static void mips_fulong2e_init(ram_addr_t ram_size, c= onst char *boot_device, } env =3D &cpu->env; =20 - qemu_register_reset(main_cpu_reset, env); + qemu_register_reset(main_cpu_reset, cpu); =20 /* fulong 2e has 256M ram. */ ram_size =3D 256 * 1024 * 1024; --=20 1.7.7