From owner-svn-src-projects@FreeBSD.ORG  Fri Oct 12 23:12:20 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 A8373C8;
 Fri, 12 Oct 2012 23:12:20 +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 9162C8FC1A;
 Fri, 12 Oct 2012 23:12:20 +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 q9CNCKHT093327;
 Fri, 12 Oct 2012 23:12:20 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9CNCK6A093324;
 Fri, 12 Oct 2012 23:12:20 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201210122312.q9CNCK6A093324@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Fri, 12 Oct 2012 23:12:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r241497 - in projects/bhyve/sys/amd64: include 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: Fri, 12 Oct 2012 23:12:20 -0000

Author: grehan
Date: Fri Oct 12 23:12:19 2012
New Revision: 241497
URL: http://svn.freebsd.org/changeset/base/241497

Log:
  Add the guest physical address and r/w/x bits to
  the paging exit in preparation for a rework of
  bhyve MMIO handling.
  
  Reviewed by:	neel
  Obtained from:	NetApp

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

Modified: projects/bhyve/sys/amd64/include/vmm.h
==============================================================================
--- projects/bhyve/sys/amd64/include/vmm.h	Fri Oct 12 22:48:33 2012	(r241496)
+++ projects/bhyve/sys/amd64/include/vmm.h	Fri Oct 12 23:12:19 2012	(r241497)
@@ -266,6 +266,8 @@ struct vm_exit {
 		} inout;
 		struct {
 			uint64_t	cr3;
+			uint64_t	gpa;
+			int		rwx;
 		} paging;
 		/*
 		 * VMX specific payload. Used when there is no "better"

Modified: projects/bhyve/sys/amd64/vmm/intel/vmx.c
==============================================================================
--- projects/bhyve/sys/amd64/vmm/intel/vmx.c	Fri Oct 12 22:48:33 2012	(r241496)
+++ projects/bhyve/sys/amd64/vmm/intel/vmx.c	Fri Oct 12 23:12:19 2012	(r241497)
@@ -1289,6 +1289,8 @@ vmx_exit_process(struct vmx *vmx, int vc
 		if (!handled) {
 			vmexit->exitcode = VM_EXITCODE_PAGING;
 			vmexit->u.paging.cr3 = cr3;
+			vmexit->u.paging.gpa = gpa;
+			vmexit->u.paging.rwx = qual & 0x7;
 		}
 		break;
 	default: