From owner-svn-src-projects@FreeBSD.ORG  Sun Dec 16 01:20:09 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 5353D832;
 Sun, 16 Dec 2012 01:20:09 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 36E638FC0A;
 Sun, 16 Dec 2012 01:20:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBG1K9LH073849;
 Sun, 16 Dec 2012 01:20:09 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBG1K9W4073848;
 Sun, 16 Dec 2012 01:20:09 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201212160120.qBG1K9W4073848@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Sun, 16 Dec 2012 01:20:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244283 - projects/bhyve/sys/amd64/vmm/io
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: Sun, 16 Dec 2012 01:20:09 -0000

Author: neel
Date: Sun Dec 16 01:20:08 2012
New Revision: 244283
URL: http://svnweb.freebsd.org/changeset/base/244283

Log:
  Modify the default behavior of bhyve such that it no longer forces the use of
  x2apic mode on the guest.
  
  The guest can decide whether or not it wants to use legacy mmio or x2apic
  access to the APIC by writing to the MSR_APICBASE register.
  
  Obtained from:	NetApp

Modified:
  projects/bhyve/sys/amd64/vmm/io/vlapic.c

Modified: projects/bhyve/sys/amd64/vmm/io/vlapic.c
==============================================================================
--- projects/bhyve/sys/amd64/vmm/io/vlapic.c	Sun Dec 16 00:57:14 2012	(r244282)
+++ projects/bhyve/sys/amd64/vmm/io/vlapic.c	Sun Dec 16 01:20:08 2012	(r244283)
@@ -896,8 +896,6 @@ vlapic_set_x2apic_state(struct vm *vm, i
 
 	vlapic = vm_lapic(vm, vcpuid);
 
-	if (state == X2APIC_ENABLED)
-		vlapic->msr_apicbase |= APICBASE_X2APIC;
-	else
+	if (state == X2APIC_DISABLED)
 		vlapic->msr_apicbase &= ~APICBASE_X2APIC;
 }