[PATCH v6 2/4] x86/hvm: Revert 80ecb40362365ba77e68fc609de8bd3b7208ae19

[Boris Ostrovsky <boris.ostrovsky@oracle.com>]

The Solaris bug that commit 80ecb40362365ba77e68fc609de8bd3b7208ae19
addressed has been fixed and backported to earlier releases.

Those still using those releases can specify number of hypervisor leaves
explicitly via 'cpuid' xl config option.

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
 xen/arch/x86/traps.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 65c34f3..b4fadf0 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -687,11 +687,7 @@ int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx,
     domain_cpuid(d, base, 0, &limit, &dummy, &dummy, &dummy);
     limit &= 0xff;
     if ( (limit < 2) || (limit > 3) )
-        /*
-         * Some Solaris PV drivers fail if max > base + 2. Help them out by
-         * hiding the PVRDTSCP leaf if PVRDTSCP is disabled.
-         */
-        limit = (d->arch.tsc_mode < TSC_MODE_PVRDTSCP) ? 2 : 3;
+        limit = 3;
 
     if ( idx > limit ) 
         return 0;
-- 
1.7.10.4