ia64/xen-unstable

changeset 11205:b3bfff8b1c10

[SVM] Fix 64-bit VMRUN.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Thu Aug 17 19:24:20 2006 +0100 (2006-08-17)
parents 043a4aa24781
children 28e3132b9f93
files xen/arch/x86/hvm/svm/x86_64/exits.S
line diff
     1.1 --- a/xen/arch/x86/hvm/svm/x86_64/exits.S	Thu Aug 17 19:17:50 2006 +0100
     1.2 +++ b/xen/arch/x86/hvm/svm/x86_64/exits.S	Thu Aug 17 19:24:20 2006 +0100
     1.3 @@ -107,8 +107,7 @@ ENTRY(svm_asm_do_launch)
     1.4          movq %rax, VMCB_rax(%rcx)
     1.5          leaq root_vmcb_pa(%rip), %rax
     1.6          movl VCPU_processor(%rbx), %ecx
     1.7 -        shll $3, %ecx
     1.8 -        addq %rcx, %rax
     1.9 +        movq (%rax,%rcx,8), %rax
    1.10          VMSAVE
    1.11  
    1.12          movq VCPU_svm_vmcb_pa(%rbx), %rax
    1.13 @@ -139,10 +138,9 @@ ENTRY(svm_asm_do_launch)
    1.14          HVM_SAVE_ALL_NOSEGREGS
    1.15  
    1.16          GET_CURRENT(%rbx)
    1.17 +        leaq root_vmcb_pa(%rip), %rax
    1.18          movl VCPU_processor(%rbx), %ecx
    1.19 -        leaq root_vmcb_pa(%rip), %rax
    1.20 -        shll $3, %ecx
    1.21 -        addq %rcx, %rax
    1.22 +        movq (%rax,%rcx,8), %rax
    1.23          VMLOAD
    1.24  
    1.25          STGI