From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tk1rv-0001Dd-Mj for qemu-devel@nongnu.org; Sat, 15 Dec 2012 19:14:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tk1rt-0004vD-1V for qemu-devel@nongnu.org; Sat, 15 Dec 2012 19:14:11 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 16 Dec 2012 01:13:35 +0100 Message-Id: <1355616817-1260-10-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 09/11] ppc_booke: Pass PowerPCCPU to ppc_booke_timers_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, Marcelo Tosatti , Alexander Graf , "open list:e500" , Scott Wood , "Edgar E. Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Cleans up after passing PowerPCCPU to timer callbacks. Signed-off-by: Andreas F=C3=A4rber --- hw/ppc.h | 2 +- hw/ppc/e500.c | 2 +- hw/ppc405_uc.c | 2 +- hw/ppc440_bamboo.c | 2 +- hw/ppc_booke.c | 5 ++--- hw/virtex_ml507.c | 2 +- 6 Dateien ge=C3=A4ndert, 7 Zeilen hinzugef=C3=BCgt(+), 8 Zeilen entfernt= (-) diff --git a/hw/ppc.h b/hw/ppc.h index 64463ad..ec33f9c 100644 --- a/hw/ppc.h +++ b/hw/ppc.h @@ -89,4 +89,4 @@ enum { #define PPC_SERIAL_MM_BAUDBASE 399193 =20 /* ppc_booke.c */ -void ppc_booke_timers_init(CPUPPCState *env, uint32_t freq, uint32_t fla= gs); +void ppc_booke_timers_init(PowerPCCPU *cpu, uint32_t freq, uint32_t flag= s); diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index af6b671..5592359 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -495,7 +495,7 @@ void ppce500_init(PPCE500Params *params) env->mpic_cpu_base =3D MPC8544_CCSRBAR_BASE + MPC8544_MPIC_REGS_OFFSET + 0x20000; =20 - ppc_booke_timers_init(env, 400000000, PPC_TIMER_E500); + ppc_booke_timers_init(cpu, 400000000, PPC_TIMER_E500); =20 /* Register reset handler */ if (!i) { diff --git a/hw/ppc405_uc.c b/hw/ppc405_uc.c index 373b8f3..fe71784 100644 --- a/hw/ppc405_uc.c +++ b/hw/ppc405_uc.c @@ -2482,7 +2482,7 @@ CPUPPCState *ppc405ep_init(MemoryRegion *address_sp= ace_mem, /* OBP arbitrer */ ppc4xx_opba_init(0xef600600); /* Initialize timers */ - ppc_booke_timers_init(env, sysclk, 0); + ppc_booke_timers_init(cpu, sysclk, 0); /* Universal interrupt controller */ irqs =3D g_malloc0(sizeof(qemu_irq) * PPCUIC_OUTPUT_NB); irqs[PPCUIC_OUTPUT_INT] =3D diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index cc85607..d9f0f81 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc440_bamboo.c @@ -195,7 +195,7 @@ static void bamboo_init(QEMUMachineInitArgs *args) env =3D &cpu->env; =20 qemu_register_reset(main_cpu_reset, cpu); - ppc_booke_timers_init(env, 400000000, 0); + ppc_booke_timers_init(cpu, 400000000, 0); ppc_dcr_init(env, NULL, NULL); =20 /* interrupt controller */ diff --git a/hw/ppc_booke.c b/hw/ppc_booke.c index 5748063..f2c0409 100644 --- a/hw/ppc_booke.c +++ b/hw/ppc_booke.c @@ -237,16 +237,15 @@ void store_booke_tcr(CPUPPCState *env, target_ulong= val) =20 } =20 -void ppc_booke_timers_init(CPUPPCState *env, uint32_t freq, uint32_t fla= gs) +void ppc_booke_timers_init(PowerPCCPU *cpu, uint32_t freq, uint32_t flag= s) { - PowerPCCPU *cpu =3D ppc_env_get_cpu(env); ppc_tb_t *tb_env; booke_timer_t *booke_timer; =20 tb_env =3D g_malloc0(sizeof(ppc_tb_t)); booke_timer =3D g_malloc0(sizeof(booke_timer_t)); =20 - env->tb_env =3D tb_env; + cpu->env.tb_env =3D tb_env; tb_env->flags =3D flags | PPC_TIMER_BOOKE | PPC_DECR_ZERO_TRIGGERED; =20 tb_env->tb_freq =3D freq; diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c index 6ab8fee..1a19cd2 100644 --- a/hw/virtex_ml507.c +++ b/hw/virtex_ml507.c @@ -94,7 +94,7 @@ static PowerPCCPU *ppc440_init_xilinx(ram_addr_t *ram_s= ize, } env =3D &cpu->env; =20 - ppc_booke_timers_init(env, sysclk, 0/* no flags */); + ppc_booke_timers_init(cpu, sysclk, 0/* no flags */); =20 ppc_dcr_init(env, NULL, NULL); =20 --=20 1.7.10.4