From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55738)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1WNtxM-0005E8-QO
	for qemu-devel@nongnu.org; Wed, 12 Mar 2014 20:57:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1WNtxG-0001Sb-Pn
	for qemu-devel@nongnu.org; Wed, 12 Mar 2014 20:57:08 -0400
Message-ID: <5321025A.9010203@suse.de>
Date: Thu, 13 Mar 2014 01:56:58 +0100
From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <afaerber@suse.de>
MIME-Version: 1.0
References: <1394410549-13751-1-git-send-email-afaerber@suse.de>	<1394410549-13751-17-git-send-email-afaerber@suse.de>
	<531F8E51.1010507@suse.de>
In-Reply-To: <531F8E51.1010507@suse.de>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH qom-cpu v2 16/40] cpu: Move exception_index
 field from CPU_COMMON to CPUState
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: qemu-devel@nongnu.org, Alexander Graf <agraf@suse.de>
Cc: Peter Maydell <peter.maydell@linaro.org>, Jia Liu <proljc@gmail.com>, Anthony Green <green@moxielogic.com>, Riku Voipio <riku.voipio@iki.fi>, Blue Swirl <blauwirbel@gmail.com>, Max Filippov <jcmvbkbc@gmail.com>, Michael Walle <michael@walle.cc>, ppce500 <qemu-ppc@nongnu.org>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Scott Wood <scottwood@freescale.com>, pbonzini@redhat.com, Guan Xuetao <gxt@mprc.pku.edu.cn>, Aurelien Jarno <aurelien@aurel32.net>, Richard Henderson <rth@twiddle.net>

Am 11.03.2014 23:29, schrieb Andreas F=C3=A4rber:
> Am 10.03.2014 01:15, schrieb Andreas F=C3=A4rber:
>> Signed-off-by: Andreas F=C3=A4rber <afaerber@suse.de>
>=20
> Needs:
>=20
> diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
> index 8434f6e..931536e 100644
> --- a/target-arm/op_helper.c
> +++ b/target-arm/op_helper.c
> @@ -232,10 +232,12 @@ void HELPER(wfi)(CPUARMState *env)
>=20
>  void HELPER(wfe)(CPUARMState *env)
>  {
> +    CPUState *cs =3D CPU(arm_env_get_cpu(env));
> +
>      /* Don't actually halt the CPU, just yield back to top
>       * level loop
>       */
> -    env->exception_index =3D EXCP_YIELD;
> +    cs->exception_index =3D EXCP_YIELD;
>      cpu_loop_exit(env);
>  }
>=20

Further needs:

diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 32e7a8c..81ec959 100644
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -1178,7 +1178,7 @@ static int kvmppc_handle_halt(PowerPCCPU *cpu)

     if (!(cs->interrupt_request & CPU_INTERRUPT_HARD) && (msr_ee)) {
         cs->halted =3D 1;
-        env->exception_index =3D EXCP_HLT;
+        cs->exception_index =3D EXCP_HLT;
     }

     return 0;

Andreas

--=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