From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  5 06:29:18 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9BB37EF1;
 Thu,  5 Jun 2014 06:29:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 89A8E23AA;
 Thu,  5 Jun 2014 06:29:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s556TIUe072200;
 Thu, 5 Jun 2014 06:29:18 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s556TIDP072199;
 Thu, 5 Jun 2014 06:29:18 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201406050629.s556TIDP072199@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Thu, 5 Jun 2014 06:29:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r267096 - projects/bhyve_svm/sys/amd64/vmm/amd
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.18
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: Thu, 05 Jun 2014 06:29:18 -0000

Author: grehan
Date: Thu Jun  5 06:29:18 2014
New Revision: 267096
URL: http://svnweb.freebsd.org/changeset/base/267096

Log:
  Allow the guest's CR2 value to be read/written.
  This is required for page-fault injection.

Modified:
  projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.c

Modified: projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.c
==============================================================================
--- projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.c	Thu Jun  5 06:00:08 2014	(r267095)
+++ projects/bhyve_svm/sys/amd64/vmm/amd/vmcb.c	Thu Jun  5 06:29:18 2014	(r267096)
@@ -152,6 +152,10 @@ vmcb_read(struct vmcb *vmcb, int ident, 
 		*retval = state->cr0;
 		break;
 
+	case VM_REG_GUEST_CR2:
+		*retval = state->cr2;
+		break;
+
 	case VM_REG_GUEST_CR3:
 		*retval = state->cr3;
 		break;
@@ -230,6 +234,10 @@ vmcb_write(struct vmcb *vmcb, int ident,
 		state->cr0 = val;
 		break;
 
+	case VM_REG_GUEST_CR2:
+		state->cr2 = val;
+		break;
+
 	case VM_REG_GUEST_CR3:
 		state->cr3 = val;
 		break;