From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFTsI-0005dT-Ms for qemu-devel@nongnu.org; Wed, 04 Apr 2012 13:20:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SFTs7-00009e-E5 for qemu-devel@nongnu.org; Wed, 04 Apr 2012 13:20:00 -0400 Received: from cantor2.suse.de ([195.135.220.15]:57433 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFTs7-0008WA-5G for qemu-devel@nongnu.org; Wed, 04 Apr 2012 13:19:51 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 4 Apr 2012 19:19:39 +0200 Message-Id: <1333559979-3984-5-git-send-email-afaerber@suse.de> In-Reply-To: <1333559979-3984-1-git-send-email-afaerber@suse.de> References: <1333559979-3984-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 4/4] target-s390x: Update s390x_{tod, cpu}_timer() to use S390CPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, Christian Borntraeger , Alexander Graf , anthony@codemonkey.ws, =?UTF-8?q?Andreas=20F=C3=A4rber?= In place of CPUS390XState pass S390CPU as opaque from the new initfn. cpu_interrupt() is anticipated to take a CPUState in the future. Signed-off-by: Andreas F=C3=A4rber Tested-by: Christian Borntraeger --- target-s390x/cpu.c | 4 ++-- target-s390x/helper.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 72ec349..f183213 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -60,8 +60,8 @@ static void s390_cpu_initfn(Object *obj) env->tod_offset =3D TOD_UNIX_EPOCH + (time2tod(mktimegm(&tm)) * 1000000000ULL); env->tod_basetime =3D 0; - env->tod_timer =3D qemu_new_timer_ns(vm_clock, s390x_tod_timer, env)= ; - env->cpu_timer =3D qemu_new_timer_ns(vm_clock, s390x_cpu_timer, env)= ; + env->tod_timer =3D qemu_new_timer_ns(vm_clock, s390x_tod_timer, cpu)= ; + env->cpu_timer =3D qemu_new_timer_ns(vm_clock, s390x_cpu_timer, cpu)= ; #endif env->cpu_num =3D cpu_num++; env->ext_index =3D -1; diff --git a/target-s390x/helper.c b/target-s390x/helper.c index 6233f9a..209a696 100644 --- a/target-s390x/helper.c +++ b/target-s390x/helper.c @@ -53,7 +53,8 @@ #ifndef CONFIG_USER_ONLY void s390x_tod_timer(void *opaque) { - CPUS390XState *env =3D opaque; + S390CPU *cpu =3D opaque; + CPUS390XState *env =3D &cpu->env; =20 env->pending_int |=3D INTERRUPT_TOD; cpu_interrupt(env, CPU_INTERRUPT_HARD); @@ -61,7 +62,8 @@ void s390x_tod_timer(void *opaque) =20 void s390x_cpu_timer(void *opaque) { - CPUS390XState *env =3D opaque; + S390CPU *cpu =3D opaque; + CPUS390XState *env =3D &cpu->env; =20 env->pending_int |=3D INTERRUPT_CPUTIMER; cpu_interrupt(env, CPU_INTERRUPT_HARD); --=20 1.7.7