From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:57929)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1TLy0z-0000aU-S3
	for qemu-devel@nongnu.org; Wed, 10 Oct 2012 11:16:13 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1TLy0u-0006IU-VP
	for qemu-devel@nongnu.org; Wed, 10 Oct 2012 11:16:05 -0400
Received: from cantor2.suse.de ([195.135.220.15]:43664 helo=mx2.suse.de)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1TLy0u-0006I5-MF
	for qemu-devel@nongnu.org; Wed, 10 Oct 2012 11:16:00 -0400
Message-ID: <5075912D.1090401@suse.de>
Date: Wed, 10 Oct 2012 17:15:57 +0200
From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <afaerber@suse.de>
MIME-Version: 1.0
References: <1337742502-28565-1-git-send-email-afaerber@suse.de>
	<1337742502-28565-43-git-send-email-afaerber@suse.de>
In-Reply-To: <1337742502-28565-43-git-send-email-afaerber@suse.de>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH qom-next 42/59] xtensa_pic: Pass XtensaCPU
 to xtensa_ccompare_cb()
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Max Filippov <jcmvbkbc@gmail.com>
Cc: qemu-devel@nongnu.org

Am 23.05.2012 05:08, schrieb Andreas F=C3=A4rber:
> Needed for cpu_has_work().
>=20
> Signed-off-by: Andreas F=C3=A4rber <afaerber@suse.de>

Max, could you ack this trivial patch please? It still applies.

I notice that you were originally not cc'ed: Probably this file was/is
not yet documented in MAINTAINERS.

Thanks,
Andreas

> ---
>  hw/xtensa_pic.c |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)
>=20
> 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 *en=
v)
> =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_INTERRU=
PT) &&
>              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
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC=
rnberg