From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tk1rr-000103-85 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 1Tk1ro-0004u5-Nn for qemu-devel@nongnu.org; Sat, 15 Dec 2012 19:14:07 -0500 Received: from cantor2.suse.de ([195.135.220.15]:33036 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tk1ro-0004tx-ES for qemu-devel@nongnu.org; Sat, 15 Dec 2012 19:14:04 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 16 Dec 2012 01:13:33 +0100 Message-Id: <1355616817-1260-8-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 07/11] ppc_booke: Pass PowerPCCPU to {decr, fit, wdt} 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 booke_update_irq(). Signed-off-by: Andreas F=C3=A4rber --- hw/ppc_booke.c | 23 ++++++++++------------- 1 Datei ge=C3=A4ndert, 10 Zeilen hinzugef=C3=BCgt(+), 13 Zeilen entfernt= (-) diff --git a/hw/ppc_booke.c b/hw/ppc_booke.c index da6bc4a..5748063 100644 --- a/hw/ppc_booke.c +++ b/hw/ppc_booke.c @@ -155,8 +155,8 @@ static void booke_update_fixed_timer(CPUPPCState = *env, =20 static void booke_decr_cb(void *opaque) { - CPUPPCState *env =3D opaque; - PowerPCCPU *cpu =3D ppc_env_get_cpu(env); + PowerPCCPU *cpu =3D opaque; + CPUPPCState *env =3D &cpu->env; =20 env->spr[SPR_BOOKE_TSR] |=3D TSR_DIS; booke_update_irq(cpu); @@ -169,13 +169,11 @@ static void booke_decr_cb(void *opaque) =20 static void booke_fit_cb(void *opaque) { - PowerPCCPU *cpu; - CPUPPCState *env; + PowerPCCPU *cpu =3D opaque; + CPUPPCState *env =3D &cpu->env; ppc_tb_t *tb_env; booke_timer_t *booke_timer; =20 - env =3D opaque; - cpu =3D ppc_env_get_cpu(env); tb_env =3D env->tb_env; booke_timer =3D tb_env->opaque; env->spr[SPR_BOOKE_TSR] |=3D TSR_FIS; @@ -190,13 +188,11 @@ static void booke_fit_cb(void *opaque) =20 static void booke_wdt_cb(void *opaque) { - PowerPCCPU *cpu; - CPUPPCState *env; + PowerPCCPU *cpu =3D opaque; + CPUPPCState *env =3D &cpu->env; ppc_tb_t *tb_env; booke_timer_t *booke_timer; =20 - env =3D opaque; - cpu =3D ppc_env_get_cpu(env); tb_env =3D env->tb_env; booke_timer =3D tb_env->opaque; =20 @@ -243,6 +239,7 @@ void store_booke_tcr(CPUPPCState *env, target_ulong v= al) =20 void ppc_booke_timers_init(CPUPPCState *env, uint32_t freq, uint32_t fla= gs) { + PowerPCCPU *cpu =3D ppc_env_get_cpu(env); ppc_tb_t *tb_env; booke_timer_t *booke_timer; =20 @@ -255,10 +252,10 @@ void ppc_booke_timers_init(CPUPPCState *env, uint32= _t freq, uint32_t flags) tb_env->tb_freq =3D freq; tb_env->decr_freq =3D freq; tb_env->opaque =3D booke_timer; - tb_env->decr_timer =3D qemu_new_timer_ns(vm_clock, &booke_decr_cb, e= nv); + tb_env->decr_timer =3D qemu_new_timer_ns(vm_clock, &booke_decr_cb, c= pu); =20 booke_timer->fit_timer =3D - qemu_new_timer_ns(vm_clock, &booke_fit_cb, env); + qemu_new_timer_ns(vm_clock, &booke_fit_cb, cpu); booke_timer->wdt_timer =3D - qemu_new_timer_ns(vm_clock, &booke_wdt_cb, env); + qemu_new_timer_ns(vm_clock, &booke_wdt_cb, cpu); } --=20 1.7.10.4