aboutsummaryrefslogtreecommitdiff
path: root/target-i386
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2014-10-03 16:39:47 -0300
committerAndreas Färber <afaerber@suse.de>2014-11-03 19:39:10 +0100
commit1cadaa9482244f7d6477afc34c04a5dad84afdde (patch)
tree1f4f6ebba9c72e257b55c7e5e34e7d35370e333c /target-i386
parent179b9f40f2582de75bd63a11040ae8f7437096b6 (diff)
downloadqemu-1cadaa9482244f7d6477afc34c04a5dad84afdde.zip
qemu-1cadaa9482244f7d6477afc34c04a5dad84afdde.tar.gz
qemu-1cadaa9482244f7d6477afc34c04a5dad84afdde.tar.bz2
target-i386: Rename KVM auto-feature-enable compat function
The x86_cpu_compat_disable_kvm_features() name was a bit confusing, as it won't forcibly disable the feature for all CPU models (i.e. add it to kvm_default_unset_features), but it will instead turn off the KVM auto-enabling of the feature (i.e. remove it from kvm_default_features), meaning the feature may still be enabled by default in some CPU models). Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/cpu.c2
-rw-r--r--target-i386/cpu.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index e4ccee1..1b25965 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -462,7 +462,7 @@ 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)
+void x86_cpu_compat_kvm_no_autoenable(FeatureWord w, uint32_t features)
{
kvm_default_features[w] &= ~features;
}
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 9f01831..a3fc6d8 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -1365,7 +1365,7 @@ void cpu_report_tpr_access(CPUX86State *env, TPRAccess access);
void x86_cpu_compat_set_features(const char *cpu_model, FeatureWord w,
uint32_t feat_add, uint32_t feat_remove);
-void x86_cpu_compat_disable_kvm_features(FeatureWord w, uint32_t features);
+void x86_cpu_compat_kvm_no_autoenable(FeatureWord w, uint32_t features);
/* Return name of 32-bit register, from a R_* constant */