diff mbox

[4/4] target-i386: Disable DE on qemu64 & qemu32 on TCG

Message ID 1441999509-26881-5-git-send-email-ehabkost@redhat.com
State New
Headers show

Commit Message

Eduardo Habkost Sept. 11, 2015, 7:25 p.m. UTC 
We don't want to make QEMU show CPUID feature warnings by default when
running in TCG mode, so disable the flag in the default qemu32 and
qemu64 CPU models, and add it to kvm_default_props so it gets enabled
when running KVM.

We don't need any compat code for this because:
* DE was already enabled in KVM mode, and is kept enabled
* DE was already disabled in TCG mode, and is kept disabled

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 target-i386/cpu.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index ec9eca2..1617e48 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -669,7 +669,7 @@  static X86CPUDefinition builtin_x86_defs[] = {
         .model = 6,
         .stepping = 3,
         .features[FEAT_1_EDX] =
-            CPUID_FP87 | CPUID_DE | CPUID_PSE | CPUID_TSC |
+            CPUID_FP87 | CPUID_PSE | CPUID_TSC |
             CPUID_MSR | CPUID_MCE | CPUID_CX8 | CPUID_PGE | CPUID_CMOV |
             CPUID_PAT | CPUID_FXSR | CPUID_MMX | CPUID_SSE | CPUID_SSE2 |
             CPUID_PAE | CPUID_SEP | CPUID_APIC |
@@ -775,7 +775,7 @@  static X86CPUDefinition builtin_x86_defs[] = {
         .model = 6,
         .stepping = 3,
         .features[FEAT_1_EDX] =
-            CPUID_FP87 | CPUID_DE | CPUID_PSE | CPUID_TSC |
+            CPUID_FP87 | CPUID_PSE | CPUID_TSC |
             CPUID_MSR | CPUID_MCE | CPUID_CX8 | CPUID_PGE | CPUID_CMOV |
             CPUID_PAT | CPUID_FXSR | CPUID_MMX | CPUID_SSE | CPUID_SSE2 |
             CPUID_PAE | CPUID_SEP | CPUID_APIC,
@@ -1385,6 +1385,8 @@  static PropValue kvm_default_props[] = {
     { NULL, "acpi", "off" },
     { NULL, "monitor", "off" },
     { NULL, "svm", "off" },
+    { X86_CPU_TYPE_NAME("qemu64"), "de", "on" },
+    { X86_CPU_TYPE_NAME("qemu32"), "de", "on" },
     { NULL, NULL },
 };