svn commit: r267428 - stable/10/sys/amd64/vmm/intel

[John Baldwin]

Author: jhb
Date: Thu Jun 12 21:36:17 2014
New Revision: 267428
URL: http://svnweb.freebsd.org/changeset/base/267428

Log:
  MFC 262615,262624:
  Workaround an apparent bug in VMWare Fusion's nested VT support where it
  triggers a VM exit with the exit reason of an external interrupt but
  without a valid interrupt set in the exit interrupt information.

Modified:
  stable/10/sys/amd64/vmm/intel/vmx.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/amd64/vmm/intel/vmx.c
==============================================================================
--- stable/10/sys/amd64/vmm/intel/vmx.c	Thu Jun 12 19:58:12 2014	(r267427)
+++ stable/10/sys/amd64/vmm/intel/vmx.c	Thu Jun 12 21:36:17 2014	(r267428)
@@ -1761,6 +1761,13 @@ vmx_exit_process(struct vmx *vmx, int vc
 		 * this virtual interrupt during the subsequent VM enter.
 		 */
 		intr_info = vmcs_read(VMCS_EXIT_INTR_INFO);
+
+		/*
+		 * XXX: Ignore this exit if VMCS_INTR_VALID is not set.
+		 * This appears to be a bug in VMware Fusion?
+		 */
+		if (!(intr_info & VMCS_INTR_VALID))
+			return (1);
 		KASSERT((intr_info & VMCS_INTR_VALID) != 0 &&
 		    (intr_info & VMCS_INTR_T_MASK) == VMCS_INTR_T_HWINTR,
 		    ("VM exit interruption info invalid: %#x", intr_info));