From: kfraser@localhost.localdomain Date: Thu, 17 Aug 2006 18:24:20 +0000 (+0100) Subject: [SVM] Fix 64-bit VMRUN. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15710^2~46 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ab0d21225127df3ba70baca0cb3d686cad52bfc4;p=xen.git [SVM] Fix 64-bit VMRUN. Signed-off-by: Keir Fraser --- diff --git a/xen/arch/x86/hvm/svm/x86_64/exits.S b/xen/arch/x86/hvm/svm/x86_64/exits.S index 184c10cc1e..248a58f131 100644 --- a/xen/arch/x86/hvm/svm/x86_64/exits.S +++ b/xen/arch/x86/hvm/svm/x86_64/exits.S @@ -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) - movl VCPU_processor(%rbx), %ecx leaq root_vmcb_pa(%rip), %rax - shll $3, %ecx - addq %rcx, %rax + movl VCPU_processor(%rbx), %ecx + movq (%rax,%rcx,8), %rax VMLOAD STGI