From owner-svn-src-user@FreeBSD.ORG  Fri Nov 21 19:42:56 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@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 EF03E16F;
 Fri, 21 Nov 2014 19:42:56 +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 DC0D828;
 Fri, 21 Nov 2014 19:42:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALJgupP070478;
 Fri, 21 Nov 2014 19:42:56 GMT (envelope-from marcel@FreeBSD.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALJgud9070477;
 Fri, 21 Nov 2014 19:42:56 GMT (envelope-from marcel@FreeBSD.org)
Message-Id: <201411211942.sALJgud9070477@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marcel set sender to
 marcel@FreeBSD.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Fri, 21 Nov 2014 19:42:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r274813 - user/marcel/libvdsk/bhyve
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Nov 2014 19:42:57 -0000

Author: marcel
Date: Fri Nov 21 19:42:56 2014
New Revision: 274813
URL: https://svnweb.freebsd.org/changeset/base/274813

Log:
  Commit the kluge to make bhyve work in VMware Fusion on Mac OS X.
  I don't want to keep it as a modified file in my sandbox.

Modified:
  user/marcel/libvdsk/bhyve/xmsr.c

Modified: user/marcel/libvdsk/bhyve/xmsr.c
==============================================================================
--- user/marcel/libvdsk/bhyve/xmsr.c	Fri Nov 21 19:41:13 2014	(r274812)
+++ user/marcel/libvdsk/bhyve/xmsr.c	Fri Nov 21 19:42:56 2014	(r274813)
@@ -49,6 +49,9 @@ int
 emulate_wrmsr(struct vmctx *ctx, int vcpu, uint32_t num, uint64_t val)
 {
 
+	if (num == MSR_PAT)
+		return 0;
+
 	if (cpu_vendor_intel) {
 		switch (num) {
 		case 0xd04:		/* Sandy Bridge uncore PMCs */