[Xen-changelog] Fixes for correct itir handling in vcpu_translate (broke simulator)

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID 333f722ed6d05d80e341a72f19bad4143c94cd87
# Parent  bb8120b53a96d0dd2d07a7831e2adce33c774cc4
Fixes for correct itir handling in vcpu_translate (broke simulator)

diff -r bb8120b53a96 -r 333f722ed6d0 xen/arch/ia64/xen/vcpu.c
--- a/xen/arch/ia64/xen/vcpu.c  Sun Oct  9 15:04:49 2005
+++ b/xen/arch/ia64/xen/vcpu.c  Tue Oct 11 21:50:21 2005
@@ -1403,9 +1403,11 @@
                return (is_data ? IA64_DATA_TLB_VECTOR : IA64_INST_TLB_VECTOR);
 
        vcpu_thash(vcpu, address, iha);
-       if (__copy_from_user(&pte, (void *)(*iha), sizeof(pte)) != 0)
+       if (__copy_from_user(&pte, (void *)(*iha), sizeof(pte)) != 0) {
 // FIXME?: does itir get set for vhpt faults?
+               *itir = vcpu_get_itir_on_fault(vcpu,*iha);
                return IA64_VHPT_FAULT;
+       }
 
        /*
         * Optimisation: this VHPT walker aborts on not-present pages
@@ -1418,6 +1420,7 @@
                vhpt_translate_count++;
                return IA64_NO_FAULT;
        }
+       *itir = vcpu_get_itir_on_fault(vcpu,address);
        return (is_data ? IA64_DATA_TLB_VECTOR : IA64_INST_TLB_VECTOR);
 }
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog