Skip to content

Commit

Permalink
i386: Rename X86CPU::host_features to X86CPU::max_features
Browse files Browse the repository at this point in the history
Rename the field and add a small comment to make its purpose
clearer.

Message-Id: <20170119210449.11991-4-ehabkost@redhat.com>
Tested-by: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
  • Loading branch information
ehabkost committed Feb 27, 2017
1 parent f48c883 commit 44bd8e5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions target/i386/cpu.c
Expand Up @@ -1583,7 +1583,7 @@ static void host_x86_cpu_initfn(Object *obj)
/* We can't fill the features array here because we don't know yet if
* "migratable" is true or false.
*/
cpu->host_features = true;
cpu->max_features = true;

/* If KVM is disabled, x86_cpu_realizefn() will report an error later */
if (kvm_enabled()) {
Expand Down Expand Up @@ -3101,12 +3101,12 @@ static void x86_cpu_load_features(X86CPU *cpu, Error **errp)
GList *l;
Error *local_err = NULL;

/*TODO: cpu->host_features incorrectly overwrites features
/*TODO: cpu->max_features incorrectly overwrites features
* set using "feat=on|off". Once we fix this, we can convert
* plus_features & minus_features to global properties
* inside x86_cpu_parse_featurestr() too.
*/
if (cpu->host_features) {
if (cpu->max_features) {
for (w = 0; w < FEATURE_WORDS; w++) {
env->features[w] =
x86_cpu_get_supported_feature_word(w, cpu->migratable);
Expand Down
2 changes: 1 addition & 1 deletion target/i386/cpu.h
Expand Up @@ -1211,7 +1211,7 @@ struct X86CPU {
bool enforce_cpuid;
bool expose_kvm;
bool migratable;
bool host_features;
bool max_features; /* Enable all supported features automatically */
uint32_t apic_id;

/* Enables publishing of TSC increment and Local APIC bus frequencies to
Expand Down

0 comments on commit 44bd8e5

Please sign in to comment.