yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-07-10 15:57:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

i386: Rename X86CPU::host_features to X86CPU::max_features

Browse source 
Rename the field and add a small comment to make its purpose
clearer.

Backports commit 44bd8e530661be1d22ae0f461a5c9bdbcc3847ec from qemu
This commit is contained in:
Eduardo Habkost 2018-03-02 10:51:34 -05:00 committed by Lioncash
parent ee609fa59f
commit be606acff9
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qemu/target/i386/cpu.c
View file

@ -3076,12 +3076,12 @@ static void x86_cpu_load_features(struct uc_struct *uc, X86CPU *cpu, Error **err
FeatureWord w; FeatureWord w;
Error *local_err = NULL; 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 * set using "feat=on|off". Once we fix this, we can convert
* plus_features & minus_features to global properties * plus_features & minus_features to global properties
* inside x86_cpu_parse_featurestr() too. * inside x86_cpu_parse_featurestr() too.
*/ */
if (cpu->host_features) { if (cpu->max_features) {
for (w = 0; w < FEATURE_WORDS; w++) { for (w = 0; w < FEATURE_WORDS; w++) {
env->features[w] = env->features[w] =
x86_cpu_get_supported_feature_word(uc, w, cpu->migratable); x86_cpu_get_supported_feature_word(uc, w, cpu->migratable);

2
qemu/target/i386/cpu.h
View file

@ -1192,7 +1192,7 @@ typedef struct X86CPU {
bool enforce_cpuid; bool enforce_cpuid;
bool expose_kvm; bool expose_kvm;
bool migratable; bool migratable;
bool host_features; bool max_features; /* Enable all supported features automatically */
uint32_t apic_id; uint32_t apic_id;
/* if true the CPUID code directly forward host cache leaves to the guest */ /* if true the CPUID code directly forward host cache leaves to the guest */