a2a47c6c3d
This patch integrates HyperV detection within the framework currently used by VmWare. With this patch, we can avoid having to replicate the HyperV detection code in each of the Microsoft HyperV drivers. Reworked and tweaked by Greg K-H to build properly. Signed-off-by: K. Y. Srinivasan <ksrinivasan@novell.com> LKML-Reference: <20100506190841.GA1605@kroah.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Vadim Rozenfeld <vrozenfe@redhat.com> Cc: Avi Kivity <avi@redhat.com> Cc: Gleb Natapov <gleb@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Alexey Dobriyan <adobriyan@gmail.com> Cc: "K.Prasad" <prasad@linux.vnet.ibm.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Stephane Eranian <eranian@google.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Alan Cox <alan@linux.intel.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
61 lines
1.8 KiB
C
61 lines
1.8 KiB
C
/*
|
|
* Common hypervisor code
|
|
*
|
|
* Copyright (C) 2008, VMware, Inc.
|
|
* Author : Alok N Kataria <akataria@vmware.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
|
|
* NON INFRINGEMENT. See the GNU General Public License for more
|
|
* details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
*/
|
|
|
|
#include <asm/processor.h>
|
|
#include <asm/vmware.h>
|
|
#include <asm/mshyperv.h>
|
|
#include <asm/hypervisor.h>
|
|
|
|
static inline void __cpuinit
|
|
detect_hypervisor_vendor(struct cpuinfo_x86 *c)
|
|
{
|
|
if (vmware_platform())
|
|
c->x86_hyper_vendor = X86_HYPER_VENDOR_VMWARE;
|
|
else if (ms_hyperv_platform())
|
|
c->x86_hyper_vendor = X86_HYPER_VENDOR_MSFT;
|
|
else
|
|
c->x86_hyper_vendor = X86_HYPER_VENDOR_NONE;
|
|
}
|
|
|
|
static inline void __cpuinit
|
|
hypervisor_set_feature_bits(struct cpuinfo_x86 *c)
|
|
{
|
|
if (boot_cpu_data.x86_hyper_vendor == X86_HYPER_VENDOR_VMWARE)
|
|
vmware_set_feature_bits(c);
|
|
else if (boot_cpu_data.x86_hyper_vendor == X86_HYPER_VENDOR_MSFT)
|
|
ms_hyperv_set_feature_bits(c);
|
|
return;
|
|
}
|
|
|
|
void __cpuinit init_hypervisor(struct cpuinfo_x86 *c)
|
|
{
|
|
detect_hypervisor_vendor(c);
|
|
hypervisor_set_feature_bits(c);
|
|
}
|
|
|
|
void __init init_hypervisor_platform(void)
|
|
{
|
|
init_hypervisor(&boot_cpu_data);
|
|
if (boot_cpu_data.x86_hyper_vendor == X86_HYPER_VENDOR_VMWARE)
|
|
vmware_platform_setup();
|
|
}
|