Received: from eggs.gnu.org ([2001:4830:134:3::10]:35432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPaMr-0000Js-QE for qemu-devel@nongnu.org; Thu, 04 Sep 2014 12:58:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPaMl-0005ox-Lm for qemu-devel@nongnu.org; Thu, 04 Sep 2014 12:58:41 -0400 Date: Thu, 4 Sep 2014 13:58:29 -0300 From: Eduardo Habkost Message-ID: <20140904165829.GD8481@thinpad.lan.raisama.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [qom-cpu PATCH] Fix build error on linux-user List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andreas =?iso-8859-1?Q?F=E4rber?= Cc: Michael Roth , Marcelo Tosatti , qemu-devel@nongnu.org, qemu-stable@nongnu.org, Igor Mammedov , Paolo Bonzini 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 --- 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