From be606acff99783b31fec348387d6d8c8fac4000e Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Fri, 2 Mar 2018 10:51:34 -0500 Subject: [PATCH] i386: Rename X86CPU::host_features to X86CPU::max_features Rename the field and add a small comment to make its purpose clearer. Backports commit 44bd8e530661be1d22ae0f461a5c9bdbcc3847ec from qemu --- qemu/target/i386/cpu.c | 4 ++-- qemu/target/i386/cpu.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qemu/target/i386/cpu.c b/qemu/target/i386/cpu.c index 0ac838c2..8a616af7 100644 --- a/qemu/target/i386/cpu.c +++ b/qemu/target/i386/cpu.c @@ -3076,12 +3076,12 @@ static void x86_cpu_load_features(struct uc_struct *uc, X86CPU *cpu, Error **err FeatureWord w; 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(uc, w, cpu->migratable); diff --git a/qemu/target/i386/cpu.h b/qemu/target/i386/cpu.h index 148b39ee..3c0a33d1 100644 --- a/qemu/target/i386/cpu.h +++ b/qemu/target/i386/cpu.h @@ -1192,7 +1192,7 @@ typedef 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; /* if true the CPUID code directly forward host cache leaves to the guest */