From owner-svn-src-projects@FreeBSD.ORG  Mon Oct 29 23:58:15 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 C86ECCB9;
 Mon, 29 Oct 2012 23:58:15 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id AEAEB8FC12;
 Mon, 29 Oct 2012 23:58:15 +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 q9TNwFwR070816;
 Mon, 29 Oct 2012 23:58:15 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9TNwFCt070814;
 Mon, 29 Oct 2012 23:58:15 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201210292358.q9TNwFCt070814@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Mon, 29 Oct 2012 23:58:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r242331 - projects/bhyve/sys/amd64/vmm/intel
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: Mon, 29 Oct 2012 23:58:16 -0000

Author: neel
Date: Mon Oct 29 23:58:15 2012
New Revision: 242331
URL: http://svn.freebsd.org/changeset/base/242331

Log:
  Convert VMCS_ENTRY_INTR_INFO field into a vmcs identifier before passing it
  to vmcs_getreg(). Without this conversion vmcs_getreg() will return EINVAL.
  
  In particular this prevented injection of the breakpoint exception into the
  guest via the "-B" option to /usr/sbin/bhyve which is hugely useful when
  debugging guest hangs.
  
  This was broken in r241921.
  
  Pointy hat: me
  Obtained from:	NetApp

Modified:
  projects/bhyve/sys/amd64/vmm/intel/vmx.c

Modified: projects/bhyve/sys/amd64/vmm/intel/vmx.c
==============================================================================
--- projects/bhyve/sys/amd64/vmm/intel/vmx.c	Mon Oct 29 21:48:24 2012	(r242330)
+++ projects/bhyve/sys/amd64/vmm/intel/vmx.c	Mon Oct 29 23:58:15 2012	(r242331)
@@ -1685,7 +1685,7 @@ vmx_inject(void *arg, int vcpu, int type
 	 * If there is already an exception pending to be delivered to the
 	 * vcpu then just return.
 	 */
-	error = vmcs_getreg(vmcs, VMCS_ENTRY_INTR_INFO, &info);
+	error = vmcs_getreg(vmcs, VMCS_IDENT(VMCS_ENTRY_INTR_INFO), &info);
 	if (error)
 		return (error);