From owner-svn-src-projects@FreeBSD.ORG  Wed Oct 15 04:29:03 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@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 DF21CB73;
 Wed, 15 Oct 2014 04:29:03 +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 CB6BB8BA;
 Wed, 15 Oct 2014 04:29:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9F4T3XG077492;
 Wed, 15 Oct 2014 04:29:03 GMT (envelope-from neel@FreeBSD.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9F4T3bY077491;
 Wed, 15 Oct 2014 04:29:03 GMT (envelope-from neel@FreeBSD.org)
Message-Id: <201410150429.s9F4T3bY077491@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: Wed, 15 Oct 2014 04:29:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r273116 - projects/bhyve_svm/sys/amd64/vmm
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Oct 2014 04:29:04 -0000

Author: neel
Date: Wed Oct 15 04:29:03 2014
New Revision: 273116
URL: https://svnweb.freebsd.org/changeset/base/273116

Log:
  Actually hide the SVM capability by clearing CPUID.80000001H:ECX[bit 3]
  after it has been initialized by cpuid_count().
  
  Submitted by:	Anish Gupta (akgupt3@gmail.com)

Modified:
  projects/bhyve_svm/sys/amd64/vmm/x86.c

Modified: projects/bhyve_svm/sys/amd64/vmm/x86.c
==============================================================================
--- projects/bhyve_svm/sys/amd64/vmm/x86.c	Wed Oct 15 03:15:46 2014	(r273115)
+++ projects/bhyve_svm/sys/amd64/vmm/x86.c	Wed Oct 15 04:29:03 2014	(r273116)
@@ -129,13 +129,17 @@ x86_emulate_cpuid(struct vm *vm, int vcp
 			break;
 
 		case CPUID_8000_0001:
-			/* Hide SVM capability from guest. */
+			cpuid_count(*eax, *ecx, regs);
+
+			/*
+			 * Hide SVM capability from guest.
+			 */
 			regs[2] &= ~AMDID2_SVM;
+
 			/*
 			 * Hide rdtscp/ia32_tsc_aux until we know how
 			 * to deal with them.
 			 */
-			cpuid_count(*eax, *ecx, regs);
 			regs[3] &= ~AMDID_RDTSCP;
 			break;