[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/19] target-i386: kvm: Don't enable MONITOR by defa
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 01/19] target-i386: kvm: Don't enable MONITOR by default on any CPU model |
Date: |
Thu, 26 Jun 2014 00:12:01 +0200 |
From: Eduardo Habkost <address@hidden>
KVM never supported the MONITOR flag so it doesn't make sense to have it
enabled by default when KVM is enabled.
The rationale here is similar to the cases where it makes sense to have
a feature enabled by default on all CPU models when on KVM mode (e.g.
x2apic). In this case we are having a feature disabled by default for
the same reasons.
In this case we don't need machine-type compat code because it is
currently impossible to run a KVM VM with the MONITOR flag set.
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
target-i386/cpu.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 8983457..23ce915 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -373,6 +373,12 @@ static uint32_t kvm_default_features[FEATURE_WORDS] = {
[FEAT_1_ECX] = CPUID_EXT_X2APIC,
};
+/* Features that are not added by default to any CPU model when KVM is enabled.
+ */
+static uint32_t kvm_default_unset_features[FEATURE_WORDS] = {
+ [FEAT_1_ECX] = CPUID_EXT_MONITOR,
+};
+
void x86_cpu_compat_disable_kvm_features(FeatureWord w, uint32_t features)
{
kvm_default_features[w] &= ~features;
@@ -1888,6 +1894,7 @@ static void x86_cpu_load_def(X86CPU *cpu,
X86CPUDefinition *def, Error **errp)
FeatureWord w;
for (w = 0; w < FEATURE_WORDS; w++) {
env->features[w] |= kvm_default_features[w];
+ env->features[w] &= ~kvm_default_unset_features[w];
}
}
--
1.8.4.5
- [Qemu-devel] [PULL 00/19] QOM CPUState patch queue 2014-06-26, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 01/19] target-i386: kvm: Don't enable MONITOR by default on any CPU model,
Andreas Färber <=
- [Qemu-devel] [PULL 12/19] target-i386: Support check/enforce flags in TCG mode, too, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 03/19] target-i386: Merge feature filtering/checking functions, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 02/19] target-i386: Simplify reporting of unavailable features, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 06/19] target-i386: Make TCG feature filtering more readable, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 07/19] target-i386: Filter FEAT_7_0_EBX TCG features too, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 09/19] target-i386: Define TCG_*_FEATURES earlier in cpu.c, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 05/19] target-i386: Isolate KVM-specific code on CPU feature filtering logic, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 10/19] target-i386: Loop-based copying and setting/unsetting of feature words, Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 04/19] target-i386: Pass FeatureWord argument to report_unavailable_features(), Andreas Färber, 2014/06/25
- [Qemu-devel] [PULL 13/19] target-i386: Add "migratable" property to "host" CPU model, Andreas Färber, 2014/06/25