From owner-svn-src-head@FreeBSD.ORG  Tue Feb 24 05:15:41 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DC034404;
 Tue, 24 Feb 2015 05:15:41 +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 C7BA2B3A;
 Tue, 24 Feb 2015 05:15:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1O5Ff6X078635;
 Tue, 24 Feb 2015 05:15:41 GMT (envelope-from neel@FreeBSD.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1O5Ffd9078634;
 Tue, 24 Feb 2015 05:15:41 GMT (envelope-from neel@FreeBSD.org)
Message-Id: <201502240515.t1O5Ffd9078634@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: neel set sender to neel@FreeBSD.org
 using -f
From: Neel Natu <neel@FreeBSD.org>
Date: Tue, 24 Feb 2015 05:15:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279227 - head/usr.sbin/bhyve
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Feb 2015 05:15:42 -0000

Author: neel
Date: Tue Feb 24 05:15:40 2015
New Revision: 279227
URL: https://svnweb.freebsd.org/changeset/base/279227

Log:
  Emulate MSR 0xC0011024 when running on AMD processors.
  
  OpenBSD guests test bit 0 of this MSR to detect whether the workaround for
  erratum 721 has been applied.
  
  Reported by:	Jason Tubnor (jason@tubnor.net)
  MFC after:	1 week

Modified:
  head/usr.sbin/bhyve/xmsr.c

Modified: head/usr.sbin/bhyve/xmsr.c
==============================================================================
--- head/usr.sbin/bhyve/xmsr.c	Tue Feb 24 04:05:32 2015	(r279226)
+++ head/usr.sbin/bhyve/xmsr.c	Tue Feb 24 05:15:40 2015	(r279227)
@@ -185,6 +185,15 @@ emulate_rdmsr(struct vmctx *ctx, int vcp
 			*val = 0;
 			break;
 
+		/*
+		 * OpenBSD guests test bit 0 of this MSR to detect if the
+		 * workaround for erratum 721 is already applied.
+		 * http://support.amd.com/TechDocs/41322_10h_Rev_Gd.pdf
+		 */
+		case 0xC0011029:
+			*val = 1;
+			break;
+
 		default:
 			error = -1;
 			break;