From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9IQz-0006mZ-C8 for qemu-devel@nongnu.org; Tue, 13 Aug 2013 13:31:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V9IQr-0000Pi-OK for qemu-devel@nongnu.org; Tue, 13 Aug 2013 13:31:05 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 13 Aug 2013 19:30:49 +0200 Message-Id: <1376415049-19434-2-git-send-email-afaerber@suse.de> In-Reply-To: <1376415049-19434-1-git-send-email-afaerber@suse.de> References: <1376415049-19434-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL stable-1.5 1/1] pc: Remove PCLMULQDQ from Westmere on pc-*-1.4 and older List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= , mdroth@linux.vnet.ibm.com, Eduardo Habkost , qemu-stable@nongnu.org From: Eduardo Habkost Commit 41cb383f42d0cb51d8e3e25e3ecebc954dd4196f made a guest-visible change by adding the PCLMULQDQ bit to Westmere without adding compatibility code to keep the ABI for older machine-types. Fix it by adding the missing compat code. Signed-off-by: Eduardo Habkost Signed-off-by: Andreas F=C3=A4rber (cherry picked from commit 56383703c060777fd01aaf8d63d5f46d660e9fb9) Signed-off-by: Andreas F=C3=A4rber --- 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 06416ce..aa03436 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -250,6 +250,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_MOVBE); + x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCL= MULQDQ); pc_init_pci(args); } =20 diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 7888dfe..1cceeb0 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -212,6 +212,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_MOVBE); + x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCL= MULQDQ); pc_q35_init(args); } =20 --=20 1.8.1.4