Messages in this thread | | | Date | Sat, 8 May 2010 10:16:34 +0200 | From | Ingo Molnar <> | Subject | Re: [tip:x86/cpu] x86: Clean up the hypervisor layer |
| |
* tip-bot for H. Peter Anvin <hpa@zytor.com> wrote:
> Commit-ID: e08cae4181af9483b04ecfac48f01c8e5a5f27bf > Gitweb: http://git.kernel.org/tip/e08cae4181af9483b04ecfac48f01c8e5a5f27bf > Author: H. Peter Anvin <hpa@zytor.com> > AuthorDate: Fri, 7 May 2010 16:57:28 -0700 > Committer: H. Peter Anvin <hpa@zytor.com> > CommitDate: Fri, 7 May 2010 17:13:04 -0700 > > x86: Clean up the hypervisor layer > > Clean up the hypervisor layer and the hypervisor drivers, using an ops > structure instead of an enumeration with if statements. > > The identity of the hypervisor, if needed, can be tested by testing > the pointer value in x86_hyper. > > The MS-HyperV private state is moved into a normal global variable > (it's per-system state, not per-CPU state). Being a normal bss > variable, it will be left at all zero on non-HyperV platforms, and so > can generally be tested for HyperV-specific features without > additional qualification. > > Signed-off-by: H. Peter Anvin <hpa@zytor.com> > Acked-by: Greg KH <greg@kroah.com> > Cc: Hank Janssen <hjanssen@microsoft.com> > Cc: Alok Kataria <akataria@vmware.com> > Cc: Ky Srinivasan <ksrinivasan@novell.com> > LKML-Reference: <4BE49778.6060800@zytor.com> > --- > arch/x86/include/asm/hyperv.h | 5 ++- > arch/x86/include/asm/hypervisor.h | 27 ++++++++++++++++- > arch/x86/include/asm/mshyperv.h | 15 +++++++-- > arch/x86/include/asm/processor.h | 7 ---- > arch/x86/include/asm/vmware.h | 27 ------------------ > arch/x86/kernel/cpu/hypervisor.c | 56 ++++++++++++++++++++++-------------- > arch/x86/kernel/cpu/mshyperv.c | 51 ++++++++++++++++------------------ > arch/x86/kernel/cpu/vmware.c | 36 +++++++++++++---------- > 8 files changed, 117 insertions(+), 107 deletions(-)
Note, this patch breaks the build of the new vmware baloon driver:
drivers/misc/vmware_balloon.c:44:24: error: asm/vmware.h: No such file or directory
CONFIG_VMWARE_BALLOON=y
Thanks,
Ingo
| |