From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7nQ9-0001de-8R for qemu-devel@nongnu.org; Fri, 09 Aug 2013 10:12:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V7nQ4-0007EE-5G for qemu-devel@nongnu.org; Fri, 09 Aug 2013 10:12:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11780) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7nQ3-0007Do-UH for qemu-devel@nongnu.org; Fri, 09 Aug 2013 10:11:56 -0400 From: Eduardo Habkost Date: Fri, 9 Aug 2013 11:11:36 -0300 Message-Id: <1376057496-26967-1-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [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: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno , Richard Henderson 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 fixes it by adding the missing compat code. Signed-off-by: Eduardo Habkost --- Bug detected by the virt-test CPUID-dump comparison test case, available 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 = 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_PCLMULQDQ); pc_init_pci_1_5(args); } 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 = 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_PCLMULQDQ); pc_q35_init_1_5(args); } -- 1.8.3.1