From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:52119)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1RBRRA-0004wj-Fr
	for qemu-devel@nongnu.org; Wed, 05 Oct 2011 09:23:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1RBRR6-0002Aq-G6
	for qemu-devel@nongnu.org; Wed, 05 Oct 2011 09:23:04 -0400
Received: from mail-wy0-f173.google.com ([74.125.82.173]:46593)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1RBRR6-0002AV-4e
	for qemu-devel@nongnu.org; Wed, 05 Oct 2011 09:23:00 -0400
Received: by wyh22 with SMTP id 22so1859263wyh.4
	for <qemu-devel@nongnu.org>; Wed, 05 Oct 2011 06:22:58 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <CAAu8pHvmKJh-OHZP+K6PtLJ3hrqDcK16b54u5bCrbWicggH4wQ@mail.gmail.com>
References: <4E88732C.3080101@redhat.com>
	<CAAu8pHvmKJh-OHZP+K6PtLJ3hrqDcK16b54u5bCrbWicggH4wQ@mail.gmail.com>
Date: Wed, 5 Oct 2011 14:22:58 +0100
Message-ID: <CAFEAcA-rA4BCfTAV8FWAf+x380hKj2JVZ25UtY2EHAksBqYvLQ@mail.gmail.com>
From: Peter Maydell <peter.maydell@linaro.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] segfault on current HEAD, qemu-system-arm
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: Blue Swirl <blauwirbel@gmail.com>
Cc: Avi Kivity <avi@redhat.com>, qemu-devel <qemu-devel@nongnu.org>

On 2 October 2011 19:44, Blue Swirl <blauwirbel@gmail.com> wrote:
> Bah, bug in bccd9ec5f098668576342c83d90d6d6833d61d33,
> target-arm/op_helper.c missed this change unlike all other targets:
> diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
> index ab9c923..1892b35 100644
> --- a/target-arm/op_helper.c
> +++ b/target-arm/op_helper.c
> @@ -84,6 +84,7 @@ void tlb_fill(CPUState *env1, target_ulong addr, int
> is_write, int mmu_idx,
> =C2=A0 =C2=A0 int ret;
>
> =C2=A0 =C2=A0 saved_env =3D env;
> + =C2=A0 =C2=A0env =3D env1;
> =C2=A0 =C2=A0 ret =3D cpu_arm_handle_mmu_fault(env, addr, is_write, mmu_i=
dx);
> =C2=A0 =C2=A0 if (unlikely(ret)) {
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (retaddr) {
>

This fixes the segfault for me.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

-- PMM