[Xen-changelog] Remove unused macro VMX_CPU_STATE_PG_ENABLED.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID c097485037f7417b77db34da198b62a9c9481dc5
# Parent  2162e1356bee08d92802232206b6636682814b4e
Remove unused macro VMX_CPU_STATE_PG_ENABLED.
Use vmx_paging_enabled() instead.

Signed-off-by: Xin Li <xin.b.li@xxxxxxxxx>

diff -r 2162e1356bee -r c097485037f7 xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c        Wed Mar 15 11:40:42 2006
+++ b/xen/arch/x86/hvm/vmx/vmx.c        Wed Mar 15 11:41:58 2006
@@ -231,10 +231,9 @@
         if ((msr_content & EFER_LME) ^
             test_bit(VMX_CPU_STATE_LME_ENABLED,
                      &vc->arch.hvm_vmx.cpu_state)){
-            if (test_bit(VMX_CPU_STATE_PG_ENABLED,
-                         &vc->arch.hvm_vmx.cpu_state) ||
-                !test_bit(VMX_CPU_STATE_PAE_ENABLED,
-                          &vc->arch.hvm_vmx.cpu_state)){
+            if ( vmx_paging_enabled(vc) ||
+                 !test_bit(VMX_CPU_STATE_PAE_ENABLED,
+                           &vc->arch.hvm_vmx.cpu_state)) {
                 vmx_inject_exception(vc, TRAP_gp_fault, 0);
             }
         }
diff -r 2162e1356bee -r c097485037f7 xen/include/asm-x86/hvm/vmx/vmcs.h
--- a/xen/include/asm-x86/hvm/vmx/vmcs.h        Wed Mar 15 11:40:42 2006
+++ b/xen/include/asm-x86/hvm/vmx/vmcs.h        Wed Mar 15 11:41:58 2006
@@ -33,8 +33,7 @@
 void vmx_enter_scheduler(void);
 
 enum {
-    VMX_CPU_STATE_PG_ENABLED=0,
-    VMX_CPU_STATE_PAE_ENABLED,
+    VMX_CPU_STATE_PAE_ENABLED=0,
     VMX_CPU_STATE_LME_ENABLED,
     VMX_CPU_STATE_LMA_ENABLED,
     VMX_CPU_STATE_ASSIST_ENABLED,

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog