From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tk1rp-0000tV-5b for qemu-devel@nongnu.org; Sat, 15 Dec 2012 19:14:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tk1rn-0004tk-Hx for qemu-devel@nongnu.org; Sat, 15 Dec 2012 19:14:05 -0500 Received: from cantor2.suse.de ([195.135.220.15]:33033 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tk1rn-0004tZ-7i for qemu-devel@nongnu.org; Sat, 15 Dec 2012 19:14:03 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 16 Dec 2012 01:13:32 +0100 Message-Id: <1355616817-1260-7-git-send-email-afaerber@suse.de> In-Reply-To: <1355616817-1260-1-git-send-email-afaerber@suse.de> References: <1355616817-1260-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 v2 06/11] ppc: Pass PowerPCCPU to [h]decr timer callbacks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcelo Tosatti , =?UTF-8?q?Andreas=20F=C3=A4rber?= , kvm@vger.kernel.org Cleans up after passing PowerPCCPU to [h]decr exception callbacks. Signed-off-by: Andreas F=C3=A4rber --- hw/ppc.c | 18 ++++++++++-------- 1 Datei ge=C3=A4ndert, 10 Zeilen hinzugef=C3=BCgt(+), 8 Zeilen entfernt(= -) diff --git a/hw/ppc.c b/hw/ppc.c index b1b93a1..8c05eb3 100644 --- a/hw/ppc.c +++ b/hw/ppc.c @@ -714,11 +714,11 @@ void cpu_ppc_store_decr (CPUPPCState *env, uint32_t= value) _cpu_ppc_store_decr(cpu, cpu_ppc_load_decr(env), value, 0); } =20 -static void cpu_ppc_decr_cb (void *opaque) +static void cpu_ppc_decr_cb(void *opaque) { - CPUPPCState *env =3D opaque; + PowerPCCPU *cpu =3D opaque; =20 - _cpu_ppc_store_decr(ppc_env_get_cpu(env), 0x00000000, 0xFFFFFFFF, 1)= ; + _cpu_ppc_store_decr(cpu, 0x00000000, 0xFFFFFFFF, 1); } =20 static inline void _cpu_ppc_store_hdecr(PowerPCCPU *cpu, uint32_t hdecr, @@ -739,11 +739,11 @@ void cpu_ppc_store_hdecr (CPUPPCState *env, uint32_= t value) _cpu_ppc_store_hdecr(cpu, cpu_ppc_load_hdecr(env), value, 0); } =20 -static void cpu_ppc_hdecr_cb (void *opaque) +static void cpu_ppc_hdecr_cb(void *opaque) { - CPUPPCState *env =3D opaque; + PowerPCCPU *cpu =3D opaque; =20 - _cpu_ppc_store_hdecr(ppc_env_get_cpu(env), 0x00000000, 0xFFFFFFFF, 1= ); + _cpu_ppc_store_hdecr(cpu, 0x00000000, 0xFFFFFFFF, 1); } =20 static void cpu_ppc_store_purr(PowerPCCPU *cpu, uint64_t value) @@ -774,17 +774,19 @@ static void cpu_ppc_set_tb_clk (void *opaque, uint3= 2_t freq) /* Set up (once) timebase frequency (in Hz) */ clk_setup_cb cpu_ppc_tb_init (CPUPPCState *env, uint32_t freq) { + PowerPCCPU *cpu =3D ppc_env_get_cpu(env); ppc_tb_t *tb_env; =20 tb_env =3D g_malloc0(sizeof(ppc_tb_t)); env->tb_env =3D tb_env; tb_env->flags =3D PPC_DECR_UNDERFLOW_TRIGGERED; /* Create new timer */ - tb_env->decr_timer =3D qemu_new_timer_ns(vm_clock, &cpu_ppc_decr_cb,= env); + tb_env->decr_timer =3D qemu_new_timer_ns(vm_clock, &cpu_ppc_decr_cb,= cpu); if (0) { /* XXX: find a suitable condition to enable the hypervisor decre= menter */ - tb_env->hdecr_timer =3D qemu_new_timer_ns(vm_clock, &cpu_ppc_hde= cr_cb, env); + tb_env->hdecr_timer =3D qemu_new_timer_ns(vm_clock, &cpu_ppc_hde= cr_cb, + cpu); } else { tb_env->hdecr_timer =3D NULL; } --=20 1.7.10.4