[Xen-changelog] [xen-unstable] [SVM] Fix 64-bit VMRUN.

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID b3bfff8b1c100016bd658d52fde459f4cf887129
# Parent  043a4aa247815157ed0c048585fb36b13a4cef6a
[SVM] Fix 64-bit VMRUN.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 xen/arch/x86/hvm/svm/x86_64/exits.S |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff -r 043a4aa24781 -r b3bfff8b1c10 xen/arch/x86/hvm/svm/x86_64/exits.S
--- a/xen/arch/x86/hvm/svm/x86_64/exits.S       Thu Aug 17 19:17:50 2006 +0100
+++ b/xen/arch/x86/hvm/svm/x86_64/exits.S       Thu Aug 17 19:24:20 2006 +0100
@@ -107,8 +107,7 @@ ENTRY(svm_asm_do_launch)
         movq %rax, VMCB_rax(%rcx)
         leaq root_vmcb_pa(%rip), %rax
         movl VCPU_processor(%rbx), %ecx
-        shll $3, %ecx
-        addq %rcx, %rax
+        movq (%rax,%rcx,8), %rax
         VMSAVE
 
         movq VCPU_svm_vmcb_pa(%rbx), %rax
@@ -139,10 +138,9 @@ ENTRY(svm_asm_do_launch)
         HVM_SAVE_ALL_NOSEGREGS
 
         GET_CURRENT(%rbx)
+        leaq root_vmcb_pa(%rip), %rax
         movl VCPU_processor(%rbx), %ecx
-        leaq root_vmcb_pa(%rip), %rax
-        shll $3, %ecx
-        addq %rcx, %rax
+        movq (%rax,%rcx,8), %rax
         VMLOAD
 
         STGI

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