From: Alex Williamson <alex.williamson@hp.com>
Date: Fri, 12 Oct 2007 20:11:57 +0000 (-0600)
Subject: [IA64] Fix vmx_emul_mov_from_dbr/ibr()
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14876
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4dd17f739b8daeeaa6d4e8fecee98943db87d504;p=xen.git

[IA64] Fix vmx_emul_mov_from_dbr/ibr()

dbr[] and ibr[] are confused.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---

diff --git a/xen/arch/ia64/vmx/vmx_virt.c b/xen/arch/ia64/vmx/vmx_virt.c
index 626bd23744..ce28f53ec9 100644
--- a/xen/arch/ia64/vmx/vmx_virt.c
+++ b/xen/arch/ia64/vmx/vmx_virt.c
@@ -1141,7 +1141,7 @@ static IA64FAULT vmx_emul_mov_from_dbr(VCPU *vcpu, INST64 inst)
         return IA64_FAULT;
     }
 #endif  //CHECK_FAULT
-    res = vmx_vcpu_get_ibr(vcpu, r3, &r1);
+    res = vmx_vcpu_get_dbr(vcpu, r3, &r1);
     if (res != IA64_NO_FAULT)
         return res;
     return vcpu_set_gr(vcpu, inst.M43.r1, r1,0);
@@ -1181,7 +1181,7 @@ static IA64FAULT vmx_emul_mov_from_ibr(VCPU *vcpu, INST64 inst)
         return IA64_FAULT;
     }
 #endif  //CHECK_FAULT
-    res = vmx_vcpu_get_dbr(vcpu, r3, &r1);
+    res = vmx_vcpu_get_ibr(vcpu, r3, &r1);
     if (res != IA64_NO_FAULT)
         return res;
     return vcpu_set_gr(vcpu, inst.M43.r1, r1,0);