[Xen-changelog] [xen-unstable] x86: Remove PSE flag from PV guest CR4 and CPUID.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1253003024 -3600
# Node ID 98e80c3adeb64a3c18a044869dbab2ae512b4621
# Parent  67f1b8b3258591b979c441c6013af3c442063cc1
x86: Remove PSE flag from PV guest CR4 and CPUID.

From: Dave McCracken <dcm@xxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/traps.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff -r 67f1b8b32585 -r 98e80c3adeb6 xen/arch/x86/traps.c
--- a/xen/arch/x86/traps.c      Tue Sep 15 09:21:34 2009 +0100
+++ b/xen/arch/x86/traps.c      Tue Sep 15 09:23:44 2009 +0100
@@ -752,8 +752,7 @@ static void pv_cpuid(struct cpu_user_reg
         __clear_bit(X86_FEATURE_VME, &d);
         if ( !cpu_has_apic )
             __clear_bit(X86_FEATURE_APIC, &d);
-        if ( !opt_allow_hugepage )
-            __clear_bit(X86_FEATURE_PSE, &d);
+        __clear_bit(X86_FEATURE_PSE, &d);
         __clear_bit(X86_FEATURE_PGE, &d);
         __clear_bit(X86_FEATURE_PSE36, &d);
     }
@@ -2064,12 +2063,10 @@ static int emulate_privileged_op(struct 
         case 4: /* Read CR4 */
             /*
              * Guests can read CR4 to see what features Xen has enabled. We
-             * therefore lie about PGE as it is unavailable to guests.
-             * Also disallow PSE if hugepages are not enabled.
+             * therefore lie about PGE and PSE as they are unavailable to
+             * guests.
              */
-            *reg = read_cr4() & ~X86_CR4_PGE;
-            if ( !opt_allow_hugepage )
-                *reg &= ~X86_CR4_PSE;
+            *reg = read_cr4() & ~(X86_CR4_PGE|X86_CR4_PSE);
             break;
 
         default:

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