From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42468)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1VobXL-0000lY-LO
	for qemu-devel@nongnu.org; Thu, 05 Dec 2013 11:12:29 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1VobXF-0005eV-S8
	for qemu-devel@nongnu.org; Thu, 05 Dec 2013 11:12:23 -0500
Received: from mail-qe0-x231.google.com ([2607:f8b0:400d:c02::231]:36426)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1VobXF-0005eP-Mg
	for qemu-devel@nongnu.org; Thu, 05 Dec 2013 11:12:17 -0500
Received: by mail-qe0-f49.google.com with SMTP id w7so17146099qeb.8
	for <qemu-devel@nongnu.org>; Thu, 05 Dec 2013 08:12:17 -0800 (PST)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <52A0A5DC.8060308@redhat.com>
Date: Thu, 05 Dec 2013 17:12:12 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <DE8DF0795D48FD4CA783C40EC829233501400040@SHSMSX101.ccr.corp.intel.com>
In-Reply-To: <DE8DF0795D48FD4CA783C40EC829233501400040@SHSMSX101.ccr.corp.intel.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v2 1/2] target-i386: fix cpuid leaf 0x0d
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: "Liu, Jinsong" <jinsong.liu@intel.com>
Cc: "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>, Gleb Natapov <gleb@redhat.com>, kvm <kvm@vger.kernel.org>

Il 04/12/2013 08:55, Liu, Jinsong ha scritto:
> From cb3b12dd9873929b3a03214e3aa0ee5297e75119 Mon Sep 17 00:00:00 2001
> From: Liu Jinsong <jinsong.liu@intel.com>
> Date: Tue, 3 Dec 2013 04:17:50 +0800
> Subject: [PATCH v2 1/2] target-i386: fix cpuid leaf 0x0d
> 
> Fix cpuid leaf 0x0d which incorrectly parsed eax and ebx.
> 
> However, before this patch the CPUID worked fine -- the .offset
> field contained the size _and_ was stored in the register that
> is supposed to hold the size (eax), and likewise the .size field
> contained the offset _and_ was stored in the register trhat is
> supposed to hold the offset (ebx).
> 
> Signed-off-by: Liu Jinsong <jinsong.liu@intel.com>
> ---
>  target-i386/cpu.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 864c80e..544b57f 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -335,7 +335,7 @@ typedef struct ExtSaveArea {
>  
>  static const ExtSaveArea ext_save_areas[] = {
>      [2] = { .feature = FEAT_1_ECX, .bits = CPUID_EXT_AVX,
> -            .offset = 0x100, .size = 0x240 },
> +            .offset = 0x240, .size = 0x100 },
>  };
>  
>  const char *get_register_name_32(unsigned int reg)
> @@ -2225,8 +2225,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
>              const ExtSaveArea *esa = &ext_save_areas[count];
>              if ((env->features[esa->feature] & esa->bits) == esa->bits &&
>                  (kvm_mask & (1 << count)) != 0) {
> -                *eax = esa->offset;
> -                *ebx = esa->size;
> +                *eax = esa->size;
> +                *ebx = esa->offset;
>              }
>          }
>          break;
> 

Applied to uq/master, thanks.

Paolo