From 5d96fdb151c3ef3d8439afd87c414a7b23fd0721 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Wed, 14 Feb 2018 16:39:34 -0500
Subject: [PATCH] target-i386: Haswell-noTSX and Broadwell-noTSX

With the Intel microcode update that removed HLE and RTM, there will be
different kinds of Haswell and Broadwell CPUs out there: some that still
have the HLE and RTM features, and some that don't have the HLE and RTM
features. On both cases people may be willing to use the pc-*-2.3
machine-types.

So, to cover both cases, introduce Haswell-noTSX and Broadwell-noTSX CPU
models, for hosts that have Haswell and Broadwell CPUs without TSX support.

Backports commit a356850b80b3d13b2ef737dad2acb05e6da03753 from qemu
---
 qemu/target-i386/cpu.c | 90 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/qemu/target-i386/cpu.c b/qemu/target-i386/cpu.c
index e9818fc5..3e67f0c5 100644
--- a/qemu/target-i386/cpu.c
+++ b/qemu/target-i386/cpu.c
@@ -1090,6 +1090,8 @@ static X86CPUDefinition builtin_x86_defs[] = {
             CPUID_EXT2_SYSCALL,
         // FEAT_8000_0001_ECX
             CPUID_EXT3_LAHF_LM,
+        // FEAT_8000_0007_EDX
+            0,
         // FEAT_C000_0001_EDX
             0,
         // FEAT_KVM
@@ -1103,6 +1105,49 @@ static X86CPUDefinition builtin_x86_defs[] = {
         },
         "Intel Xeon E3-12xx v2 (Ivy Bridge)",
     },
+    {
+        "Haswell-noTSX",
+        0xd, 0x8000000A, 0,
+        CPUID_VENDOR_INTEL,
+        6, 60, 1,
+        {
+        // FEAT_1_EDX
+            CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
+            CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_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,
+        // FEAT_1_ECX
+            CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
+            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_MOVBE |
+            CPUID_EXT_PCID | CPUID_EXT_F16C | CPUID_EXT_RDRAND,
+        // FEAT_7_0_EBX
+            CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 |
+            CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |
+            CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID,
+        // FEAT_8000_0001_EDX
+            CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |
+            CPUID_EXT2_SYSCALL,
+        // FEAT_8000_0001_ECX
+            CPUID_EXT3_LAHF_LM,
+        // FEAT_8000_0007_EDX
+            0,
+        // FEAT_C000_0001_EDX
+            0,
+        // FEAT_KVM
+            0,
+        // FEAT_SVM
+            0,
+        // FEAT_XSAVE
+            CPUID_XSAVE_XSAVEOPT,
+        // FEAT_ARAT
+            CPUID_6_EAX_ARAT,
+        },
+        "Intel Core Processor (Haswell, no TSX)",
+    },
     {
         "Haswell",
         0xd, 0x8000000A, 0,
@@ -1147,6 +1192,51 @@ static X86CPUDefinition builtin_x86_defs[] = {
         },
         "Intel Core Processor (Haswell)",
     },
+    {
+        "Broadwell-noTSX",
+        0xd, 0x8000000A, 0,
+        CPUID_VENDOR_INTEL,
+        6, 61, 2,
+        {
+        // FEAT_1_EDX
+            CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
+            CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_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,
+        // FEAT_1_ECX
+            CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
+            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_MOVBE |
+            CPUID_EXT_PCID | CPUID_EXT_F16C | CPUID_EXT_RDRAND,
+        // FEAT_7_0_EBX
+            CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 |
+            CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |
+            CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |
+            CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |
+            CPUID_7_0_EBX_SMAP,
+        // FEAT_8000_0001_EDX
+            CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |
+            CPUID_EXT2_SYSCALL,
+        // FEAT_8000_0001_ECX
+            CPUID_EXT3_LAHF_LM | CPUID_EXT3_3DNOWPREFETCH,
+        // FEAT_8000_0007_EDX
+            0,
+        // FEAT_C000_0001_EDX
+            0,
+        // FEAT_KVM
+            0,
+        // FEAT_SVM
+            0,
+        // FEAT_XSAVE
+            CPUID_XSAVE_XSAVEOPT,
+        // FEAT_ARAT
+            CPUID_6_EAX_ARAT,
+        },
+        "Intel Core Processor (Broadwell, no TSX)",
+    },
     {
         "Broadwell",
         0xd, 0x8000000A, 0,