svn commit: r255911 - head/sys/amd64/vmm

[Peter Grehan]

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);