From owner-svn-src-projects@FreeBSD.ORG  Thu Oct 25 04:08:27 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 39824F0B;
 Thu, 25 Oct 2012 04:08:27 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 22C2A8FC0C;
 Thu, 25 Oct 2012 04:08:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9P48Q9F068793;
 Thu, 25 Oct 2012 04:08:26 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9P48QLj068791;
 Thu, 25 Oct 2012 04:08:26 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201210250408.q9P48QLj068791@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Thu, 25 Oct 2012 04:08:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r242060 - projects/bhyve/sys/amd64/vmm
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Oct 2012 04:08:27 -0000

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);