[Xen-changelog] [qemu-xen master] cpu_ldst.h: use correct guest address parameter

[patchbot@xxxxxxx]

commit c2a85316902e67530da9d6548139fcce73c0cac6
Author:     Bobby Bingham <koorogi@xxxxxxxxxxxx>
AuthorDate: Sat Nov 12 23:05:23 2016 -0600
Commit:     Paolo Bonzini <pbonzini@xxxxxxxxxx>
CommitDate: Tue Nov 22 23:26:51 2016 +0100

    cpu_ldst.h: use correct guest address parameter
    
    In the user emulation code path, tlb_vaddr_to_host erronesously passed
    vaddr as the guest address to be translated, instead of addr, the parameter
    which actually contained the guest address.
    
    This resulted in incorrect addresses being used when emulating block copy
    (mvc/mvpg) and block clear (xc) instructions for the s390x target.
    
    Signed-off-by: Bobby Bingham <koorogi@xxxxxxxxxxxx>
    Message-Id: <20161113050523.23909-1-koorogi@xxxxxxxxxxxx>
    Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
---
 include/exec/cpu_ldst.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index b573df5..6eb5fe8 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -401,7 +401,7 @@ static inline void *tlb_vaddr_to_host(CPUArchState *env, 
target_ulong addr,
                                       int access_type, int mmu_idx)
 {
 #if defined(CONFIG_USER_ONLY)
-    return g2h(vaddr);
+    return g2h(addr);
 #else
     int index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
     CPUTLBEntry *tlbentry = &env->tlb_table[mmu_idx][index];
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog