[Xen-changelog] [xen-unstable] [IA64] vmx_vcpu_tak: Fix bugs

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

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1190400571 21600
# Node ID 09b45357e492d5e447ea11d1ab2627339cb5902a
# Parent  f3173d151e1d330a387b72426f393d105525dae8
[IA64] vmx_vcpu_tak: Fix bugs

Signed-off-by: Tristan Gingold <tgingold@xxxxxxx>
---
 xen/arch/ia64/vmx/vmmu.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff -r f3173d151e1d -r 09b45357e492 xen/arch/ia64/vmx/vmmu.c
--- a/xen/arch/ia64/vmx/vmmu.c  Fri Sep 21 11:03:54 2007 -0600
+++ b/xen/arch/ia64/vmx/vmmu.c  Fri Sep 21 12:49:31 2007 -0600
@@ -671,18 +671,19 @@ u64 vmx_vcpu_tak(VCPU *vcpu, u64 vadr)
 u64 vmx_vcpu_tak(VCPU *vcpu, u64 vadr)
 {
     thash_data_t *data;
-    PTA vpta;
     u64 key;
-    vpta.val = vmx_vcpu_get_pta(vcpu);
-    if(vpta.vf==0 || unimplemented_gva(vcpu, vadr)){
-        key=1;
+
+    if (unimplemented_gva(vcpu, vadr)) {
+        key = 1;
         return key;
     }
+
+    /* FIXME: if psr.dt is set, look in the guest VHPT.  */
     data = vtlb_lookup(vcpu, vadr, DSIDE_TLB);
-    if(!data||!data->p){
+    if (!data || !data->p)
         key = 1;
-    }else{
-        key = data->key;
-    }
+    else
+        key = data->key << 8;
+
     return key;
 }

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