From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:32972)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1WNsZO-0000Nb-AD
	for qemu-devel@nongnu.org; Wed, 12 Mar 2014 19:28:24 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1WNsZI-0002iZ-Bf
	for qemu-devel@nongnu.org; Wed, 12 Mar 2014 19:28:18 -0400
Message-ID: <5320ED88.6070409@suse.de>
Date: Thu, 13 Mar 2014 00:28:08 +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-35-git-send-email-afaerber@suse.de>
In-Reply-To: <1394410549-13751-35-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 34/40] exec: Change cpu_abort()
 argument 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>, Riku Voipio <riku.voipio@iki.fi>, Alexander Graf <agraf@suse.de>, Blue Swirl <blauwirbel@gmail.com>, Michael Walle <michael@walle.cc>, qemu-ppc <qemu-ppc@nongnu.org>, pbonzini@redhat.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>

The m68k assert patch requires the following on top:

diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index dff1e58..cd66289 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -2084,12 +2084,14 @@ DISAS_INSN(wddata)

 DISAS_INSN(wdebug)
 {
+    M68kCPU *cpu =3D m68k_env_get_cpu(env);
+
     if (IS_USER(s)) {
         gen_exception(s, s->pc - 2, EXCP_PRIVILEGE);
         return;
     }
     /* TODO: Implement wdebug.  */
-    cpu_abort(env, "WDEBUG not implemented");
+    cpu_abort(CPU(cpu), "WDEBUG not implemented");
 }

 DISAS_INSN(trap)
@@ -2463,14 +2465,18 @@ DISAS_INSN(fbcc)

 DISAS_INSN(frestore)
 {
+    M68kCPU *cpu =3D m68k_env_get_cpu(env);
+
     /* TODO: Implement frestore.  */
-    cpu_abort(env, "FRESTORE not implemented");
+    cpu_abort(CPU(cpu), "FRESTORE not implemented");
 }

 DISAS_INSN(fsave)
 {
+    M68kCPU *cpu =3D m68k_env_get_cpu(env);
+
     /* TODO: Implement fsave.  */
-    cpu_abort(env, "FSAVE not implemented");
+    cpu_abort(CPU(cpu), "FSAVE not implemented");
 }

 static inline TCGv gen_mac_extract_word(DisasContext *s, TCGv val, int
upper)

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