svn commit: r273116 - projects/bhyve_svm/sys/amd64/vmm

[Neel Natu]

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