From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTMfv-000097-IO for qemu-devel@nongnu.org; Tue, 30 Oct 2012 21:01:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTMfp-0005Oq-DD for qemu-devel@nongnu.org; Tue, 30 Oct 2012 21:00:55 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52415 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTMfo-0005OE-S4 for qemu-devel@nongnu.org; Tue, 30 Oct 2012 21:00:49 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 31 Oct 2012 01:59:55 +0100 Message-Id: <1351645206-3041-25-git-send-email-afaerber@suse.de> In-Reply-To: <1351645206-3041-1-git-send-email-afaerber@suse.de> References: <1351645206-3041-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 24/35] xtensa_pic: Pass XtensaCPU to xtensa_ccompare_cb() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws Needed for changing cpu_has_work() argument type to CPUState. Signed-off-by: Andreas F=C3=A4rber Acked-by: Max Filippov --- hw/xtensa_pic.c | 7 +++++-- 1 Datei ge=C3=A4ndert, 5 Zeilen hinzugef=C3=BCgt(+), 2 Zeilen entfernt(-= ) diff --git a/hw/xtensa_pic.c b/hw/xtensa_pic.c index 653ded6..8b9c051 100644 --- a/hw/xtensa_pic.c +++ b/hw/xtensa_pic.c @@ -125,7 +125,8 @@ void xtensa_rearm_ccompare_timer(CPUXtensaState *env) =20 static void xtensa_ccompare_cb(void *opaque) { - CPUXtensaState *env =3D opaque; + XtensaCPU *cpu =3D opaque; + CPUXtensaState *env =3D &cpu->env; =20 if (env->halted) { env->halt_clock =3D qemu_get_clock_ns(vm_clock); @@ -139,12 +140,14 @@ static void xtensa_ccompare_cb(void *opaque) =20 void xtensa_irq_init(CPUXtensaState *env) { + XtensaCPU *cpu =3D xtensa_env_get_cpu(env); + env->irq_inputs =3D (void **)qemu_allocate_irqs( xtensa_set_irq, env, env->config->ninterrupt); if (xtensa_option_enabled(env->config, XTENSA_OPTION_TIMER_INTERRUPT= ) && env->config->nccompare > 0) { env->ccompare_timer =3D - qemu_new_timer_ns(vm_clock, &xtensa_ccompare_cb, env); + qemu_new_timer_ns(vm_clock, &xtensa_ccompare_cb, cpu); } } =20 --=20 1.7.10.4