From owner-svn-src-head@FreeBSD.ORG  Fri Sep 27 14:55:59 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id E32D0F3B;
 Fri, 27 Sep 2013 14:55:59 +0000 (UTC)
 (envelope-from grehan@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CF5992731;
 Fri, 27 Sep 2013 14:55:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8REtxet046387;
 Fri, 27 Sep 2013 14:55:59 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8REtxvk046386;
 Fri, 27 Sep 2013 14:55:59 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201309271455.r8REtxvk046386@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Fri, 27 Sep 2013 14:55:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255911 - head/sys/amd64/vmm
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.14
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: Fri, 27 Sep 2013 14:56:00 -0000

Author: grehan
Date: Fri Sep 27 14:55:59 2013
New Revision: 255911
URL: http://svnweb.freebsd.org/changeset/base/255911

Log:
  Return 0 for a rdmsr of MSR_IA32_PLATFORM_ID. This
  is enough to get Ubuntu 12.0.4/13.0.4 to boot.
  
  Approved by:	re@ (blanket)

Modified:
  head/sys/amd64/vmm/vmm_msr.c

Modified: head/sys/amd64/vmm/vmm_msr.c
==============================================================================
--- head/sys/amd64/vmm/vmm_msr.c	Fri Sep 27 13:12:47 2013	(r255910)
+++ head/sys/amd64/vmm/vmm_msr.c	Fri Sep 27 14:55:59 2013	(r255911)
@@ -57,6 +57,7 @@ static struct vmm_msr vmm_msr[] = {
 	{ MSR_PAT,      VMM_MSR_F_EMULATE | VMM_MSR_F_INVALID },
 	{ MSR_BIOS_SIGN,VMM_MSR_F_EMULATE },
 	{ MSR_MCG_CAP,	VMM_MSR_F_EMULATE | VMM_MSR_F_READONLY },
+	{ MSR_IA32_PLATFORM_ID, VMM_MSR_F_EMULATE | VMM_MSR_F_READONLY },
 	{ MSR_IA32_MISC_ENABLE, VMM_MSR_F_EMULATE | VMM_MSR_F_READONLY },
 };
 
@@ -129,7 +130,10 @@ guest_msrs_init(struct vm *vm, int cpu)
 			misc |= (1 << 12) | (1 << 11);
 			misc &= ~((1 << 18) | (1 << 16));
 			guest_msrs[i] = misc;
-                        break;
+			break;
+		case MSR_IA32_PLATFORM_ID:
+			guest_msrs[i] = 0;
+			break;
 		default:
 			panic("guest_msrs_init: missing initialization for msr "
 			      "0x%0x", vmm_msr[i].num);