diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-04-17 11:13:47 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-04-17 11:13:47 +0100 |
| commit | 0df2121693b9f0cc866b58a97db9c6441027e148 (patch) | |
| tree | e9590e837054cc6f62189530c52ebdae51ea66a8 | |
| parent | 32f418c0031ff6319a7c9f666e420566e95c70ae (diff) | |
| parent | 0d914f39a77954bf5472b16130aeefe573a068f5 (diff) | |
| download | qemu-0df2121693b9f0cc866b58a97db9c6441027e148.tar.gz | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging
i386: Don't automatically enable FEAT_KVM_HINTS bits
Bug fix for "-cpu host" with newer kernels.
# gpg: Signature made Mon 16 Apr 2018 17:37:53 BST
# gpg: using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/x86-next-pull-request:
i386: Don't automatically enable FEAT_KVM_HINTS bits
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/i386/cpu.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 1a6b082b6f..a20fe26573 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -295,6 +295,8 @@ typedef struct FeatureWordInfo { uint32_t tcg_features; /* Feature flags supported by TCG */ uint32_t unmigratable_flags; /* Feature flags known to be unmigratable */ uint32_t migratable_flags; /* Feature flags known to be migratable */ + /* Features that shouldn't be auto-enabled by "-cpu host" */ + uint32_t no_autoenable_flags; } FeatureWordInfo; static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { @@ -400,6 +402,11 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { }, .cpuid_eax = KVM_CPUID_FEATURES, .cpuid_reg = R_EDX, .tcg_features = TCG_KVM_FEATURES, + /* + * KVM hints aren't auto-enabled by -cpu host, they need to be + * explicitly enabled in the command-line. + */ + .no_autoenable_flags = ~0U, }, [FEAT_HYPERV_EAX] = { .feat_names = { @@ -4062,7 +4069,8 @@ static void x86_cpu_expand_features(X86CPU *cpu, Error **errp) */ env->features[w] |= x86_cpu_get_supported_feature_word(w, cpu->migratable) & - ~env->user_features[w]; + ~env->user_features[w] & \ + ~feature_word_info[w].no_autoenable_flags; } } |