From owner-svn-src-all@FreeBSD.ORG  Wed Feb 13 23:22:18 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id ABB63A4D;
 Wed, 13 Feb 2013 23:22:18 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9524974A;
 Wed, 13 Feb 2013 23:22:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1DNMId2063084;
 Wed, 13 Feb 2013 23:22:18 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1DNMI9L063079;
 Wed, 13 Feb 2013 23:22:18 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201302132322.r1DNMI9L063079@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Wed, 13 Feb 2013 23:22:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246774 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Feb 2013 23:22:18 -0000

Author: neel
Date: Wed Feb 13 23:22:17 2013
New Revision: 246774
URL: http://svnweb.freebsd.org/changeset/base/246774

Log:
  Requests for invalid CPUID leaves should map to the highest known leaf instead.
  
  Reviewed by:	grehan
  Obtained from:	NetApp

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

Modified: head/sys/amd64/vmm/x86.c
==============================================================================
--- head/sys/amd64/vmm/x86.c	Wed Feb 13 23:11:25 2013	(r246773)
+++ head/sys/amd64/vmm/x86.c	Wed Feb 13 23:22:17 2013	(r246774)
@@ -54,8 +54,6 @@ x86_emulate_cpuid(struct vm *vm, int vcp
 	unsigned int 	func, regs[4];
 	enum x2apic_state x2apic_state;
 
-	func = *eax;
-
 	/*
 	 * Requests for invalid CPUID levels should map to the highest
 	 * available level instead.
@@ -70,6 +68,8 @@ x86_emulate_cpuid(struct vm *vm, int vcp
 		*eax = cpu_high;
 	}
 
+	func = *eax;
+
 	/*
 	 * In general the approach used for CPU topology is to
 	 * advertise a flat topology where all CPUs are packages with