Move x86_cpu_get_supported_feature_word() prototype outside CONFIG_KVM, to fix build error on linux-user and !CONFIG_KVM.
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> --- Can be squashed into the "target-i386: Reject invalid CPU feature names on the command-line" patch I sent. --- target-i386/cpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 7002fd3..88b64d8 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1255,6 +1255,9 @@ void x86_cpu_compat_set_features(const char *cpu_model, FeatureWord w, } } +static uint32_t x86_cpu_get_supported_feature_word(FeatureWord w, + bool migratable_only); + #ifdef CONFIG_KVM static int cpu_x86_fill_model_id(char *str) @@ -1311,9 +1314,6 @@ static void host_x86_cpu_class_init(ObjectClass *oc, void *data) dc->props = host_x86_cpu_properties; } -static uint32_t x86_cpu_get_supported_feature_word(FeatureWord w, - bool migratable_only); - static void host_x86_cpu_initfn(Object *obj) { X86CPU *cpu = X86_CPU(obj); -- 1.9.3