From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:52597)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <imammedo@redhat.com>) id 1TB2x1-0004wn-C0
	for qemu-devel@nongnu.org; Mon, 10 Sep 2012 08:18:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <imammedo@redhat.com>) id 1TB2wv-0005Ii-9h
	for qemu-devel@nongnu.org; Mon, 10 Sep 2012 08:18:51 -0400
Received: from mx1.redhat.com ([209.132.183.28]:64823)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <imammedo@redhat.com>) id 1TB2wv-0005IE-1D
	for qemu-devel@nongnu.org; Mon, 10 Sep 2012 08:18:45 -0400
Date: Mon, 10 Sep 2012 14:18:38 +0200
From: Igor Mammedov <imammedo@redhat.com>
Message-ID: <20120910141838.19636d67@nial.usersys.redhat.com>
In-Reply-To: <1346877673-9136-5-git-send-email-ehabkost@redhat.com>
References: <1346877673-9136-1-git-send-email-ehabkost@redhat.com>
	<1346877673-9136-5-git-send-email-ehabkost@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 4/7] move CPU models from cpus-x86_64.conf
	to C
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Eduardo Habkost <ehabkost@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org, Anthony Liguori <anthony@codemonkey.ws>, Andreas =?ISO-8859-1?B?RuRyYmVy?= <afaerber@suse.de>

On Wed,  5 Sep 2012 17:41:10 -0300
Eduardo Habkost <ehabkost@redhat.com> wrote:

> Those models are maintained by QEMU and may require compatibility code
> to be added when making some changes. Keeping the data in the C source
> code should make it simpler to handle those details.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>  sysconfigs/target/cpus-x86_64.conf | 129 +---------------------
>  target-i386/cpu.c                  | 219
> +++++++++++++++++++++++++++++++++++++ 2 files changed, 220 insertions(+),
> 128 deletions(-)
> 
> diff --git a/sysconfigs/target/cpus-x86_64.conf
> b/sysconfigs/target/cpus-x86_64.conf index cee0ea9..3902189 100644
> --- a/sysconfigs/target/cpus-x86_64.conf
> +++ b/sysconfigs/target/cpus-x86_64.conf
> @@ -1,128 +1 @@
> -# x86 CPU MODELS
> -
> -[cpudef]
> -   name = "Conroe"
> -   level = "2"
> -   vendor = "GenuineIntel"
> -   family = "6"
> -   model = "2"
> -   stepping = "3"
> -   feature_edx = "sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr
> sep apic cx8 mce pae msr tsc pse de fpu"
> -   feature_ecx = "ssse3 sse3"
> -   extfeature_edx = "i64 xd syscall"
...
> +        .ext2_features = CPUID_EXT2_LM | CPUID_EXT2_NX |
> CPUID_EXT2_SYSCALL,
Silent fix, replacing i64 with CPUID_EXT2_LM
looks like "i64" is mistake and never worked. In Intel & AMD cpuid guides
01.EDX[30] is reserved and what was probably meant/intended here is to use
80000001h.EDX[29] /* CPUID_EXT2_LM */
Perhaps patch that fixes it ought to go before this one.