From: Roger Pau Monné Date: Mon, 4 Aug 2014 11:46:54 +0000 (+0200) Subject: x86: fix cpuid reporting on PVH Dom0 X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4559 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=41220bb7d5946d3a693863d364a089e69b968ec7;p=xen.git x86: fix cpuid reporting on PVH Dom0 dab11417d also caused some problems regarding HVM guest creation on PVH Dom0, mainly the CR4 mask returned by hvm_cr4_guest_reserved_bits changed from 0xfffffffffffff800 to 0xfffffffffffff893, which means HVM guests created from a PVH Dom0 are unable to set VME, PVI, PSE or PGE CR4 flags. This is because cpuid on PVH guests mask PSE, PGE, PSE36 and VME flags, so the white listing done in xc_cpuid_hvm_policy doesn't enable those features, and the guest ends up with a very restrictive cpuid policy. Signed-off-by: Roger Pau Monné --- diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 677074b4e6..71be2aebd7 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -803,12 +803,16 @@ void pv_cpuid(struct cpu_user_regs *regs) if ( (regs->eax & 0x7fffffff) == 0x00000001 ) { /* Modify Feature Information. */ - __clear_bit(X86_FEATURE_VME, &d); if ( !cpu_has_apic ) __clear_bit(X86_FEATURE_APIC, &d); - __clear_bit(X86_FEATURE_PSE, &d); - __clear_bit(X86_FEATURE_PGE, &d); - __clear_bit(X86_FEATURE_PSE36, &d); + + if ( !is_pvh_vcpu(curr) ) + { + __clear_bit(X86_FEATURE_PSE, &d); + __clear_bit(X86_FEATURE_PGE, &d); + __clear_bit(X86_FEATURE_PSE36, &d); + __clear_bit(X86_FEATURE_VME, &d); + } } switch ( (uint32_t)regs->eax )