ia64/xen-unstable

changeset 16087:960a05895a4a

hvm: Fix migration of 64-bit guests by permitting EFER_LMA to be set
in restored VCPU context.
Signed-off-by: David Lively <dlively@virtualiron.com>
Signed-off-by: Robert Phillips <rphillips@virtualiron.com>
author Keir Fraser <keir@xensource.com>
date Thu Oct 11 08:14:11 2007 +0100 (2007-10-11)
parents e7ae19321560
children 51f521303df7
files xen/arch/x86/hvm/hvm.c
line diff
     1.1 --- a/xen/arch/x86/hvm/hvm.c	Wed Oct 10 13:17:42 2007 +0100
     1.2 +++ b/xen/arch/x86/hvm/hvm.c	Thu Oct 11 08:14:11 2007 +0100
     1.3 @@ -358,7 +358,7 @@ static int hvm_load_cpu_ctxt(struct doma
     1.4          return -EINVAL;
     1.5      }
     1.6  
     1.7 -    if ( (ctxt.msr_efer & ~(EFER_LME | EFER_NX | EFER_SCE)) ||
     1.8 +    if ( (ctxt.msr_efer & ~(EFER_LME | EFER_LMA | EFER_NX | EFER_SCE)) ||
     1.9           ((sizeof(long) != 8) && (ctxt.msr_efer & EFER_LME)) ||
    1.10           (!cpu_has_nx && (ctxt.msr_efer & EFER_NX)) ||
    1.11           (!cpu_has_syscall && (ctxt.msr_efer & EFER_SCE)) ||