From owner-svn-src-all@FreeBSD.ORG  Tue Sep 17 17:56:54 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 2A3D5E95;
 Tue, 17 Sep 2013 17:56:54 +0000 (UTC)
 (envelope-from grehan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 17B8B270A;
 Tue, 17 Sep 2013 17:56:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8HHurVe091521;
 Tue, 17 Sep 2013 17:56:53 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8HHurVA091520;
 Tue, 17 Sep 2013 17:56:53 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201309171756.r8HHurVA091520@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Tue, 17 Sep 2013 17:56:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255645 - head/sys/amd64/vmm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Sep 2013 17:56:54 -0000

Author: grehan
Date: Tue Sep 17 17:56:53 2013
New Revision: 255645
URL: http://svnweb.freebsd.org/changeset/base/255645

Log:
  Hide TSC-deadline APIC timer support from guests. This mode
  isn't yet implemented in bhyve's APIC emulation.
  
  Reviewed by:	neel
  Approved by:	re@ (blanket)

Modified:
  head/sys/amd64/vmm/x86.c

Modified: head/sys/amd64/vmm/x86.c
==============================================================================
--- head/sys/amd64/vmm/x86.c	Tue Sep 17 17:39:40 2013	(r255644)
+++ head/sys/amd64/vmm/x86.c	Tue Sep 17 17:56:53 2013	(r255645)
@@ -163,7 +163,12 @@ x86_emulate_cpuid(struct vm *vm, int vcp
 			 * Hide the performance and debug features.
 			 */
 			regs[2] &= ~CPUID2_PDCM;
-			
+
+			/*
+			 * No TSC deadline support in the APIC yet
+			 */
+			regs[2] &= ~CPUID2_TSCDLT;
+
 			/*
 			 * Hide thermal monitoring
 			 */