From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V8tD3-0007gI-N6 for qemu-devel@nongnu.org; Mon, 12 Aug 2013 10:35:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V8tCy-0001MG-E7 for qemu-devel@nongnu.org; Mon, 12 Aug 2013 10:35:01 -0400 Message-ID: <5208F28C.90009@suse.de> Date: Mon, 12 Aug 2013 16:34:52 +0200 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1376057496-26967-1-git-send-email-ehabkost@redhat.com> <52050119.9080304@suse.de> <20130809172446.GB403@otherpad.lan.raisama.net> In-Reply-To: <20130809172446.GB403@otherpad.lan.raisama.net> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] pc: compat: remove PCLMULQDQ from Westmere on pc-*-1.4 and older List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: qemu-stable , qemu-devel@nongnu.org, "Edgar E. Iglesias" , Paolo Bonzini , Aurelien Jarno , Richard Henderson Am 09.08.2013 19:24, schrieb Eduardo Habkost: > On Fri, Aug 09, 2013 at 04:47:53PM +0200, Andreas F=E4rber wrote: >> 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 fi= xes >>> it by adding the missing compat code. >>> >>> Signed-off-by: Eduardo Habkost >>> --- >>> Bug detected by the virt-test CPUID-dump comparison test case, availa= ble 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(+) >>> >>> 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 *= args) >>> { >>> has_pvpanic =3D false; >>> x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOV= BE); >>> + x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT= _PCLMULQDQ); >>> 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 *= args) >>> { >>> has_pvpanic =3D false; >>> x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOV= BE); >>> + x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT= _PCLMULQDQ); >>> 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. >=20 > The patch doesn't apply cleanly on stable-1.5, but I will send a versio= n > for qemu-stable as well. It's not required to apply cleanly to a specific stable- branch. :) We need a commit id to reference in the backported version. Thanks, applied to qom-cpu, pull coming later today. https://github.com/afaerber/qemu-cpu/commits/qom-cpu Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg