svn commit: r242060 - projects/bhyve/sys/amd64/vmm

[Neel Natu]

Author: neel
Date: Thu Oct 25 04:08:26 2012
New Revision: 242060
URL: http://svn.freebsd.org/changeset/base/242060

Log:
  Hide the monitor/mwait instruction capability from the guest until we know how
  to properly intercept it.
  
  Obtained from:	NetApp

Modified:
  projects/bhyve/sys/amd64/vmm/x86.c

Modified: projects/bhyve/sys/amd64/vmm/x86.c
==============================================================================
--- projects/bhyve/sys/amd64/vmm/x86.c	Thu Oct 25 03:39:36 2012	(r242059)
+++ projects/bhyve/sys/amd64/vmm/x86.c	Thu Oct 25 04:08:26 2012	(r242060)
@@ -128,6 +128,12 @@ x86_emulate_cpuid(struct vm *vm, int vcp
 				     CPUID2_AVX);
 
 			/*
+			 * Hide monitor/mwait until we know how to deal with
+			 * these instructions.
+			 */
+			regs[2] &= ~CPUID2_MON;
+
+			/*
 			 * Hide thermal monitoring
 			 */
 			regs[3] &= ~(CPUID_ACPI | CPUID_TM);