From: Keir Fraser Date: Thu, 11 Oct 2007 07:14:11 +0000 (+0100) Subject: hvm: Fix migration of 64-bit guests by permitting EFER_LMA to be set X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14894 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=09fa4973a1fe64316715d2c7c876eda503af0a3f;p=xen.git hvm: Fix migration of 64-bit guests by permitting EFER_LMA to be set in restored VCPU context. Signed-off-by: David Lively Signed-off-by: Robert Phillips --- diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index a43ca392b2..0b8477eb65 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -358,7 +358,7 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) return -EINVAL; } - if ( (ctxt.msr_efer & ~(EFER_LME | EFER_NX | EFER_SCE)) || + if ( (ctxt.msr_efer & ~(EFER_LME | EFER_LMA | EFER_NX | EFER_SCE)) || ((sizeof(long) != 8) && (ctxt.msr_efer & EFER_LME)) || (!cpu_has_nx && (ctxt.msr_efer & EFER_NX)) || (!cpu_has_syscall && (ctxt.msr_efer & EFER_SCE)) ||