From owner-svn-src-projects@FreeBSD.ORG  Tue Oct 18 18:52:22 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE4591065676;
	Tue, 18 Oct 2011 18:52:22 +0000 (UTC)
	(envelope-from grehan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DE7308FC08;
	Tue, 18 Oct 2011 18:52:22 +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 p9IIqMpl086325;
	Tue, 18 Oct 2011 18:52:22 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9IIqMQJ086323;
	Tue, 18 Oct 2011 18:52:22 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201110181852.p9IIqMQJ086323@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Tue, 18 Oct 2011 18:52:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226521 - projects/bhyve/usr.sbin/bhyve
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 18 Oct 2011 18:52:23 -0000

Author: grehan
Date: Tue Oct 18 18:52:22 2011
New Revision: 226521
URL: http://svn.freebsd.org/changeset/base/226521

Log:
  Ignore legacy INIT de-asserts in x2apic mode before verifying
  the contents of the IPI.
  Uncovered by jhb's x2apic patch.
  
  Obtained from:	NetApp

Modified:
  projects/bhyve/usr.sbin/bhyve/xmsr.c

Modified: projects/bhyve/usr.sbin/bhyve/xmsr.c
==============================================================================
--- projects/bhyve/usr.sbin/bhyve/xmsr.c	Tue Oct 18 18:42:26 2011	(r226520)
+++ projects/bhyve/usr.sbin/bhyve/xmsr.c	Tue Oct 18 18:52:22 2011	(r226521)
@@ -110,15 +110,15 @@ emulate_wrmsr(struct vmctx *ctx, int vcp
 
 	switch (mode) {
 	case APIC_DELMODE_INIT:		
-		assert(dest != 0);
-		assert(dest < guest_ncpus);
-
 		/*
 		 * Ignore legacy de-assert INITs in x2apic mode
 		 */
 		if ((val & APIC_LEVEL_MASK) == APIC_LEVEL_DEASSERT) {
 			break;
 		}
+
+		assert(dest != 0);
+		assert(dest < guest_ncpus);
 		assert(cpu_b[dest] == CPU_S_INIT);
 
 		/*