[qemu-xen staging-4.16] target-i386: mmu: use pg_mode instead of HF_LMA_MASK

[patchbot@xxxxxxx]

commit cddfaf96ab2a6772dd87998af699f91ca15facfd
Author:     Paolo Bonzini <pbonzini@xxxxxxxxxx>
AuthorDate: Thu Nov 4 14:45:20 2021 +0100
Commit:     Michael Roth <michael.roth@xxxxxxx>
CommitDate: Tue Dec 14 14:18:25 2021 -0600

    target-i386: mmu: use pg_mode instead of HF_LMA_MASK
    
    Correctly look up the paging mode of the hypervisor when it is using 64-bit
    mode but the guest is not.
    
    Fixes: 68746930ae ("target/i386: use mmu_translate for NPT walk", 
2021-05-11)
    Cc: qemu-stable@xxxxxxxxxx
    Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
    (cherry picked from commit 93eae3583256896dd91a4c2ca38dcbb8d4051cff)
    Signed-off-by: Michael Roth <michael.roth@xxxxxxx>
---
 target/i386/tcg/sysemu/excp_helper.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/i386/tcg/sysemu/excp_helper.c 
b/target/i386/tcg/sysemu/excp_helper.c
index b6d940e04e..2dea4a248e 100644
--- a/target/i386/tcg/sysemu/excp_helper.c
+++ b/target/i386/tcg/sysemu/excp_helper.c
@@ -90,7 +90,7 @@ static int mmu_translate(CPUState *cs, hwaddr addr, 
MMUTranslateFunc get_hphys_f
         target_ulong pdpe_addr;
 
 #ifdef TARGET_X86_64
-        if (env->hflags & HF_LMA_MASK) {
+        if (pg_mode & PG_MODE_LMA) {
             bool la57 = pg_mode & PG_MODE_LA57;
             uint64_t pml5e_addr, pml5e;
             uint64_t pml4e_addr, pml4e;
@@ -287,7 +287,7 @@ do_check_protect_pse36:
         *prot |= PAGE_EXEC;
     }
 
-    if (!(env->hflags & HF_LMA_MASK)) {
+    if (!(pg_mode & PG_MODE_LMA)) {
         pkr = 0;
     } else if (ptep & PG_USER_MASK) {
         pkr = pg_mode & PG_MODE_PKE ? env->pkru : 0;
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging-4.16