9df56f19a5
We try to handle the hypervisor compatibility mode by detecting hypervisor through a specific order. This is not robust, since hypervisors may implement each others features. This patch tries to handle this situation by always choosing the last one in the CPUID leaves. This is done by letting .detect() return a priority instead of true/false and just re-using the CPUID leaf where the signature were found as the priority (or 1 if it was found by DMI). Then we can just pick hypervisor who has the highest priority. Other sophisticated detection method could also be implemented on top. Suggested by H. Peter Anvin and Paolo Bonzini. Acked-by: K. Y. Srinivasan <kys@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Jeremy Fitzhardinge <jeremy@goop.org> Cc: Doug Covelli <dcovelli@vmware.com> Cc: Borislav Petkov <bp@suse.de> Cc: Dan Hecht <dhecht@vmware.com> Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: Marcelo Tosatti <mtosatti@redhat.com> Cc: Gleb Natapov <gleb@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Jason Wang <jasowang@redhat.com> Link: http://lkml.kernel.org/r/1374742475-2485-4-git-send-email-jasowang@redhat.com Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
65 lines
2 KiB
C
65 lines
2 KiB
C
/*
|
|
* Copyright (C) 2008, VMware, Inc.
|
|
*
|
|
* 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.
|
|
*
|
|
*/
|
|
#ifndef _ASM_X86_HYPERVISOR_H
|
|
#define _ASM_X86_HYPERVISOR_H
|
|
|
|
#ifdef CONFIG_HYPERVISOR_GUEST
|
|
|
|
#include <asm/kvm_para.h>
|
|
#include <asm/xen/hypervisor.h>
|
|
|
|
/*
|
|
* x86 hypervisor information
|
|
*/
|
|
struct hypervisor_x86 {
|
|
/* Hypervisor name */
|
|
const char *name;
|
|
|
|
/* Detection routine */
|
|
uint32_t (*detect)(void);
|
|
|
|
/* Adjust CPU feature bits (run once per CPU) */
|
|
void (*set_cpu_features)(struct cpuinfo_x86 *);
|
|
|
|
/* Platform setup (run once per boot) */
|
|
void (*init_platform)(void);
|
|
|
|
/* X2APIC detection (run once per boot) */
|
|
bool (*x2apic_available)(void);
|
|
};
|
|
|
|
extern const struct hypervisor_x86 *x86_hyper;
|
|
|
|
/* Recognized hypervisors */
|
|
extern const struct hypervisor_x86 x86_hyper_vmware;
|
|
extern const struct hypervisor_x86 x86_hyper_ms_hyperv;
|
|
extern const struct hypervisor_x86 x86_hyper_xen_hvm;
|
|
extern const struct hypervisor_x86 x86_hyper_kvm;
|
|
|
|
extern void init_hypervisor(struct cpuinfo_x86 *c);
|
|
extern void init_hypervisor_platform(void);
|
|
extern bool hypervisor_x2apic_available(void);
|
|
#else
|
|
static inline void init_hypervisor(struct cpuinfo_x86 *c) { }
|
|
static inline void init_hypervisor_platform(void) { }
|
|
static inline bool hypervisor_x2apic_available(void) { return false; }
|
|
#endif /* CONFIG_HYPERVISOR_GUEST */
|
|
#endif /* _ASM_X86_HYPERVISOR_H */
|