From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45903)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1WNVBE-0001O8-Da
	for qemu-devel@nongnu.org; Tue, 11 Mar 2014 18:29:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1WNVB8-0004qY-8B
	for qemu-devel@nongnu.org; Tue, 11 Mar 2014 18:29:48 -0400
Message-ID: <531F8E51.1010507@suse.de>
Date: Tue, 11 Mar 2014 23:29:37 +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>
In-Reply-To: <1394410549-13751-17-git-send-email-afaerber@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, Peter Maydell <peter.maydell@linaro.org>
Cc: Jia Liu <proljc@gmail.com>, Anthony Green <green@moxielogic.com>, Riku Voipio <riku.voipio@iki.fi>, Alexander Graf <agraf@suse.de>, Blue Swirl <blauwirbel@gmail.com>, Max Filippov <jcmvbkbc@gmail.com>, Michael Walle <michael@walle.cc>, ppce500 <qemu-ppc@nongnu.org>, pbonzini@redhat.com, Scott Wood <scottwood@freescale.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Guan Xuetao <gxt@mprc.pku.edu.cn>, Aurelien Jarno <aurelien@aurel32.net>, Richard Henderson <rth@twiddle.net>

Am 10.03.2014 01:15, schrieb Andreas F=C3=A4rber:
> Signed-off-by: Andreas F=C3=A4rber <afaerber@suse.de>

Needs:

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)

 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);
 }


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