From: David Hildenbrand <david@redhat.com>
Date: Wed, 25 Sep 2019 11:56:33 +0000 (+0200)
Subject: s390x/mmu: Use TARGET_PAGE_MASK in mmu_translate_pte()
X-Git-Tag: pull-nvme-20200902~643^2~26
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ae6d48d43ff66d6d0f39db210af273a73348ea98;p=qemu-nvme.git

s390x/mmu: Use TARGET_PAGE_MASK in mmu_translate_pte()

While ASCE_ORIGIN is not wrong, it is certainly confusing. We want a
page frame address.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
---

diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
index 71dee0a5d9..aaf5b23513 100644
--- a/target/s390x/mmu_helper.c
+++ b/target/s390x/mmu_helper.c
@@ -129,7 +129,7 @@ static int mmu_translate_pte(CPUS390XState *env, target_ulong vaddr,
         *flags &= ~PAGE_WRITE;
     }
 
-    *raddr = pt_entry & ASCE_ORIGIN;
+    *raddr = pt_entry & TARGET_PAGE_MASK;
     return 0;
 }