[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] Fix VMX guest can't boot after MCE enabled.
# HG changeset patch # User Keir Fraser <keir@xxxxxxxxxxxxx> # Date 1182971301 -3600 # Node ID 5eec9a8825d466f76ecc847e9ecbbff5d166bbf1 # Parent 16f35bea00f8f1ea01499a65f4657c0b7b769cdc Fix VMX guest can't boot after MCE enabled. Signed-off-by: Xin Li <xin.b.li@xxxxxxxxx> --- xen/arch/x86/hvm/vmx/vmx.c | 9 +++++---- xen/include/asm-x86/processor.h | 6 ++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff -r 16f35bea00f8 -r 5eec9a8825d4 xen/arch/x86/hvm/vmx/vmx.c --- a/xen/arch/x86/hvm/vmx/vmx.c Wed Jun 27 20:00:50 2007 +0100 +++ b/xen/arch/x86/hvm/vmx/vmx.c Wed Jun 27 20:08:21 2007 +0100 @@ -2387,14 +2387,15 @@ static int mov_to_cr(int gp, int cr, str case 4: /* CR4 */ old_cr = v->arch.hvm_vmx.cpu_shadow_cr4; - if ( value & ~mmu_cr4_features ) + if ( value & X86_CR4_RESERVED_BITS ) { - HVM_DBG_LOG(DBG_LEVEL_1, "Guest attempts to enable unsupported " - "CR4 features %lx (host %lx)", - value, mmu_cr4_features); + HVM_DBG_LOG(DBG_LEVEL_1, + "Guest attempts to set reserved bit in CR4: %lx", + value); vmx_inject_hw_exception(v, TRAP_gp_fault, 0); break; } + if ( (value & X86_CR4_PAE) && !(old_cr & X86_CR4_PAE) ) { if ( vmx_pgbit_test(v) ) diff -r 16f35bea00f8 -r 5eec9a8825d4 xen/include/asm-x86/processor.h --- a/xen/include/asm-x86/processor.h Wed Jun 27 20:00:50 2007 +0100 +++ b/xen/include/asm-x86/processor.h Wed Jun 27 20:08:21 2007 +0100 @@ -80,6 +80,12 @@ #define X86_CR4_OSFXSR 0x0200 /* enable fast FPU save and restore */ #define X86_CR4_OSXMMEXCPT 0x0400 /* enable unmasked SSE exceptions */ #define X86_CR4_VMXE 0x2000 /* enable VMX */ + +#define X86_CR4_RESERVED_BITS \ + ~(X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | \ + X86_CR4_DE | X86_CR4_PSE | X86_CR4_PAE | \ + X86_CR4_MCE | X86_CR4_PGE | X86_CR4_PCE | \ + X86_CR4_OSFXSR | X86_CR4_OSXMMEXCPT | X86_CR4_VMXE) /* * Trap/fault mnemonics. _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |