This will help us simplify the code that calls report_unavailable_features() later.
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> --- Changes v1 -> v2: * Rebase to latest qom-cpu (commit 90c5d39c) Changes v2 -> v3: * Trivial rebase after QEMU 2.0 (onto commit 2d03b49) --- target-i386/cpu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 39ee1ce..f37ed40 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1236,8 +1236,9 @@ static const TypeInfo host_x86_cpu_type_info = { #endif -static int report_unavailable_features(FeatureWordInfo *f, uint32_t mask) +static int report_unavailable_features(FeatureWord w, uint32_t mask) { + FeatureWordInfo *f = &feature_word_info[w]; int i; for (i = 0; i < 32; ++i) { @@ -1837,7 +1838,7 @@ static int filter_features_for_kvm(X86CPU *cpu) cpu->filtered_features[w] = requested_features & ~env->features[w]; if (cpu->filtered_features[w]) { if (cpu->check_cpuid || cpu->enforce_cpuid) { - report_unavailable_features(wi, cpu->filtered_features[w]); + report_unavailable_features(w, cpu->filtered_features[w]); } rv = 1; } -- 1.9.0