ia64/xen-unstable

changeset 9290:c097485037f7

Remove unused macro VMX_CPU_STATE_PG_ENABLED.
Use vmx_paging_enabled() instead.

Signed-off-by: Xin Li <xin.b.li@intel.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Mar 15 12:41:58 2006 +0100 (2006-03-15)
parents 2162e1356bee
children a5ee1cb525bb 51b0d4c2d4d9
files xen/arch/x86/hvm/vmx/vmx.c xen/include/asm-x86/hvm/vmx/vmcs.h
line diff
     1.1 --- a/xen/arch/x86/hvm/vmx/vmx.c	Wed Mar 15 12:40:42 2006 +0100
     1.2 +++ b/xen/arch/x86/hvm/vmx/vmx.c	Wed Mar 15 12:41:58 2006 +0100
     1.3 @@ -231,10 +231,9 @@ static inline int long_mode_do_msr_write
     1.4          if ((msr_content & EFER_LME) ^
     1.5              test_bit(VMX_CPU_STATE_LME_ENABLED,
     1.6                       &vc->arch.hvm_vmx.cpu_state)){
     1.7 -            if (test_bit(VMX_CPU_STATE_PG_ENABLED,
     1.8 -                         &vc->arch.hvm_vmx.cpu_state) ||
     1.9 -                !test_bit(VMX_CPU_STATE_PAE_ENABLED,
    1.10 -                          &vc->arch.hvm_vmx.cpu_state)){
    1.11 +            if ( vmx_paging_enabled(vc) ||
    1.12 +                 !test_bit(VMX_CPU_STATE_PAE_ENABLED,
    1.13 +                           &vc->arch.hvm_vmx.cpu_state)) {
    1.14                  vmx_inject_exception(vc, TRAP_gp_fault, 0);
    1.15              }
    1.16          }
     2.1 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h	Wed Mar 15 12:40:42 2006 +0100
     2.2 +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h	Wed Mar 15 12:41:58 2006 +0100
     2.3 @@ -33,8 +33,7 @@ void vmx_relinquish_resources(struct vcp
     2.4  void vmx_enter_scheduler(void);
     2.5  
     2.6  enum {
     2.7 -    VMX_CPU_STATE_PG_ENABLED=0,
     2.8 -    VMX_CPU_STATE_PAE_ENABLED,
     2.9 +    VMX_CPU_STATE_PAE_ENABLED=0,
    2.10      VMX_CPU_STATE_LME_ENABLED,
    2.11      VMX_CPU_STATE_LMA_ENABLED,
    2.12      VMX_CPU_STATE_ASSIST_ENABLED,