From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49877)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1V7nz2-0002WO-IH
	for qemu-devel@nongnu.org; Fri, 09 Aug 2013 10:48:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1V7nyx-0004z9-7g
	for qemu-devel@nongnu.org; Fri, 09 Aug 2013 10:48:04 -0400
Message-ID: <52050119.9080304@suse.de>
Date: Fri, 09 Aug 2013 16:47:53 +0200
From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <afaerber@suse.de>
MIME-Version: 1.0
References: <1376057496-26967-1-git-send-email-ehabkost@redhat.com>
In-Reply-To: <1376057496-26967-1-git-send-email-ehabkost@redhat.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH] pc: compat: remove PCLMULQDQ from Westmere
 on pc-*-1.4 and older
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: qemu-stable <qemu-stable@nongnu.org>, qemu-devel@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Aurelien Jarno <aurelien@aurel32.net>, Richard Henderson <rth@twiddle.net>

Am 09.08.2013 16:11, schrieb Eduardo Habkost:
> commit 41cb383f42d0cb51d8e3e25e3ecebc954dd4196f made a guest-visible
> change by adding the PCLMULQDQ bit to Westmere without adding
> compatibility code to keep the ABI older machine-types. This patch fixe=
s
> it by adding the missing compat code.
>=20
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> Bug detected by the virt-test CPUID-dump comparison test case, availabl=
e at:
>   https://github.com/autotest/virt-test/pull/714
> ---
>  hw/i386/pc_piix.c | 1 +
>  hw/i386/pc_q35.c  | 1 +
>  2 files changed, 2 insertions(+)
>=20
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index ab25458..2817092 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -259,6 +259,7 @@ static void pc_init_pci_1_4(QEMUMachineInitArgs *ar=
gs)
>  {
>      has_pvpanic =3D false;
>      x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE=
);
> +    x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_P=
CLMULQDQ);
>      pc_init_pci_1_5(args);
>  }
> =20
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 2f35d12..25c6b33 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -227,6 +227,7 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *ar=
gs)
>  {
>      has_pvpanic =3D false;
>      x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE=
);
> +    x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_P=
CLMULQDQ);
>      pc_q35_init_1_5(args);
>  }
> =20

Looks good to me, still need to test, and I should probably add

Cc: qemu-stable@nongnu.org

for 1.5.3 then.

Andreas

--=20
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC=
rnberg