From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbiVG-0003Jk-Ar for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:24:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbiVE-0008Lk-J8 for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:24:09 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52740 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbiVE-0008LN-D3 for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:24:08 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 5 Jun 2012 03:22:11 +0200 Message-Id: <1338859366-20689-40-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 39/74] mips_jazz: 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?Herv=C3=A9=20Poussineau?= , =?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 Acked-by: Herv=C3=A9 Poussineau --- hw/mips_jazz.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index 24959e0..bf1b799 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -50,8 +50,9 @@ enum jazz_model_e =20 static void main_cpu_reset(void *opaque) { - CPUMIPSState *env =3D opaque; - cpu_state_reset(env); + MIPSCPU *cpu =3D opaque; + + cpu_reset(CPU(cpu)); } =20 static uint64_t rtc_read(void *opaque, target_phys_addr_t addr, unsigned= size) @@ -147,7 +148,7 @@ static void mips_jazz_init(MemoryRegion *address_spac= e, exit(1); } env =3D &cpu->env; - qemu_register_reset(main_cpu_reset, env); + qemu_register_reset(main_cpu_reset, cpu); =20 /* allocate RAM */ memory_region_init_ram(ram, "mips_jazz.ram", ram_size); --=20 1.7.7