From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57377) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiCKD-0007k2-2U for qemu-devel@nongnu.org; Mon, 10 Dec 2012 17:59:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TiCKA-0000Vx-RQ for qemu-devel@nongnu.org; Mon, 10 Dec 2012 17:59:49 -0500 Received: from cantor2.suse.de ([195.135.220.15]:48343 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiCKA-0000Vk-Ht for qemu-devel@nongnu.org; Mon, 10 Dec 2012 17:59:46 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 10 Dec 2012 23:59:32 +0100 Message-Id: <1355180372-6525-3-git-send-email-afaerber@suse.de> In-Reply-To: <1355180372-6525-1-git-send-email-afaerber@suse.de> References: <1355180372-6525-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] [RFC qom-cpu v2 2/2] target-i386: Turn Haswell into subclass of SandyBridge List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, imammedo@redhat.com, ehabkost@redhat.com, anthony@codemonkey.ws, =?UTF-8?q?Andreas=20F=C3=A4rber?= ehabkost: "When adding the Haswell CPU model, I intended to make it a superset of the features present on the SandyBridge model" Inherit from SandyBridge to keep only the delta for Haswell. Signed-off-by: Andreas F=C3=A4rber Cc: Eduardo Habkost --- target-i386/cpu.c | 24 ++---------------------- 1 Datei ge=C3=A4ndert, 2 Zeilen hinzugef=C3=BCgt(+), 22 Zeilen entfernt(= -) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index c59c6a5..ffd160a 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -814,39 +814,19 @@ static void haswell_cpu_class_init(ObjectClass *oc,= void *data) { X86CPUClass *xcc =3D X86_CPU_CLASS(oc); =20 - xcc->level =3D 0xd; - xcc->vendor1 =3D CPUID_VENDOR_INTEL_1; - xcc->vendor2 =3D CPUID_VENDOR_INTEL_2; - xcc->vendor3 =3D CPUID_VENDOR_INTEL_3; - xcc->family =3D 6; xcc->model =3D 60; - xcc->stepping =3D 1; - xcc->features =3D CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | - CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUI= D_MCA | - CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8= | - CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE | - CPUID_DE | CPUID_FP87; - xcc->ext_features =3D CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AE= S | - CPUID_EXT_POPCNT | CPUID_EXT_X2APIC | CPUID_EXT_SSE42 | - CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 | - CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3 | - CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_FMA | CPUID_EXT_MO= VBE | - CPUID_EXT_PCID; - xcc->ext2_features =3D CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT= 2_NX | - CPUID_EXT2_SYSCALL; - xcc->ext3_features =3D CPUID_EXT3_LAHF_LM; + xcc->ext_features |=3D CPUID_EXT_FMA | CPUID_EXT_MOVBE | CPUID_EXT_P= CID; xcc->cpuid_7_0_ebx_features =3D CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_E= BX_BMI1 | CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP = | CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVP= CID | CPUID_7_0_EBX_RTM; - xcc->xlevel =3D 0x8000000A; pstrcpy(xcc->model_id, sizeof(xcc->model_id), "Intel Core Processor (Haswell)"); } =20 static const TypeInfo haswell_cpu_type_info =3D { .name =3D TYPE("Haswell"), - .parent =3D TYPE_X86_CPU, + .parent =3D TYPE("SandyBridge"), .class_init =3D haswell_cpu_class_init, }; =20 --=20 1.7.10.4