From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5VFi-0007qj-Sy for qemu-devel@nongnu.org; Mon, 09 Apr 2018 07:46:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5VFf-0002Rc-Ri for qemu-devel@nongnu.org; Mon, 09 Apr 2018 07:46:26 -0400 References: <20180409113019.14568-1-david@redhat.com> <20180409113019.14568-2-david@redhat.com> From: Thomas Huth Message-ID: Date: Mon, 9 Apr 2018 13:44:45 +0200 MIME-Version: 1.0 In-Reply-To: <20180409113019.14568-2-david@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v1 for-2.12 1/2] s390x/mmu: don't overwrite pending exception in mmu translate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Hildenbrand , qemu-s390x@nongnu.org Cc: qemu-devel@nongnu.org, Richard Henderson , Alexander Graf , Cornelia Huck , Christian Borntraeger On 09.04.2018 13:30, David Hildenbrand wrote: > If we already triggered another exception, don't overwrite it with a > protection exception. > > Signed-off-by: David Hildenbrand > --- > target/s390x/mmu_helper.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c > index 1deeb6e6e4..a25deef5dd 100644 > --- a/target/s390x/mmu_helper.c > +++ b/target/s390x/mmu_helper.c > @@ -325,7 +325,7 @@ static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, > > r = mmu_translate_region(env, vaddr, asc, asce, level, raddr, flags, rw, > exc); > - if (rw == MMU_DATA_STORE && !(*flags & PAGE_WRITE)) { > + if (!r && rw == MMU_DATA_STORE && !(*flags & PAGE_WRITE)) { > trigger_prot_fault(env, vaddr, asc, rw, exc); > return -1; > } Looks right. Reviewed-by: Thomas Huth