svn commit: r226521 - projects/bhyve/usr.sbin/bhyve

[Peter Grehan]

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