[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-3.4-testing] x86: Remove PSE flag from PV guest CR4 and CPUID.
# HG changeset patch # User Keir Fraser <keir.fraser@xxxxxxxxxx> # Date 1254409880 -3600 # Node ID 601886e960f7f0ddcfb4f4ee707b85991db6da50 # Parent 9833101024c24f431ffc2466ed7d7effc8582c24 x86: Remove PSE flag from PV guest CR4 and CPUID. From: Dave McCracken <dcm@xxxxxxxx> Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx> xen-unstable changeset: 20202:98e80c3adeb6 xen-unstable date: Tue Sep 15 09:23:44 2009 +0100 --- xen/arch/x86/traps.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff -r 9833101024c2 -r 601886e960f7 xen/arch/x86/traps.c --- a/xen/arch/x86/traps.c Thu Oct 01 16:10:43 2009 +0100 +++ b/xen/arch/x86/traps.c Thu Oct 01 16:11:20 2009 +0100 @@ -725,8 +725,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); } @@ -2032,12 +2031,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
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |