From owner-svn-src-head@FreeBSD.ORG  Fri Sep  6 05:16:11 2013
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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B8149DC1;
 Fri,  6 Sep 2013 05:16:11 +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 A5AC8265E;
 Fri,  6 Sep 2013 05:16:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r865GB44001243;
 Fri, 6 Sep 2013 05:16:11 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r865GBEw001241;
 Fri, 6 Sep 2013 05:16:11 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201309060516.r865GBEw001241@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Fri, 6 Sep 2013 05:16:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255287 - 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, 06 Sep 2013 05:16:11 -0000

Author: grehan
Date: Fri Sep  6 05:16:10 2013
New Revision: 255287
URL: http://svnweb.freebsd.org/changeset/base/255287

Log:
  Allow CPUID leaf 0xD to be read as zeroes.
  Linux reads this even though extended features
  aren't exposed.
  
  Support for 0xD will be expanded once AVX[2]
  is exposed to the guest in upcoming work.

Modified:
  head/sys/amd64/vmm/x86.c
  head/sys/amd64/vmm/x86.h

Modified: head/sys/amd64/vmm/x86.c
==============================================================================
--- head/sys/amd64/vmm/x86.c	Fri Sep  6 02:57:15 2013	(r255286)
+++ head/sys/amd64/vmm/x86.c	Fri Sep  6 05:16:10 2013	(r255287)
@@ -200,6 +200,7 @@ x86_emulate_cpuid(struct vm *vm, int vcp
 		case CPUID_0000_0006:
 		case CPUID_0000_0007:
 		case CPUID_0000_000A:
+		case CPUID_0000_000D:
 			/*
 			 * Handle the access, but report 0 for
 			 * all options

Modified: head/sys/amd64/vmm/x86.h
==============================================================================
--- head/sys/amd64/vmm/x86.h	Fri Sep  6 02:57:15 2013	(r255286)
+++ head/sys/amd64/vmm/x86.h	Fri Sep  6 05:16:10 2013	(r255287)
@@ -38,6 +38,7 @@
 #define CPUID_0000_0007 (0x7)
 #define	CPUID_0000_000A	(0xA)
 #define	CPUID_0000_000B	(0xB)
+#define	CPUID_0000_000D	(0xD)
 #define CPUID_8000_0000	(0x80000000)
 #define CPUID_8000_0001	(0x80000001)
 #define CPUID_8000_0002	(0x80000002)