Skip to contentSkip to conversation

Fix build error on linux-user

PATCH In review Eduardo Habkost 2 participants 3 messages Sep 4, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix build error on linux-user

Move x86_cpu_get_supported_feature_word() prototype outside CONFIG_KVM, to fix build error on linux-user and !CONFIG_KVM.

---
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(-)
target-i386/cpu.c +3 -3
index 7002fd3..88b64d8 100644
@@ -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);
Signature · 1 line
1.9.3
#1 lore raw

Am 04.09.2014 18:58, schrieb Eduardo Habkost:

Quoted 7 lines

Move x86_cpu_get_supported_feature_word() prototype outside CONFIG_KVM, to fix build error on linux-user and !CONFIG_KVM.

---
Can be squashed into the "target-i386: Reject invalid CPU feature names on the command-line" patch I sent.

Thanks a lot, done.

Andreas

Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
#2 lore raw
Quoted 10 lines · Andreas Färber

Am 04.09.2014 18:58, schrieb Eduardo Habkost:

Quoted 7 lines

Move x86_cpu_get_supported_feature_word() prototype outside CONFIG_KVM, to fix build error on linux-user and !CONFIG_KVM.

---
Can be squashed into the "target-i386: Reject invalid CPU feature names on the command-line" patch I sent.

Thanks a lot, done.

My mistake: it was supposed to be squashed into. "target-i386: Support migratable=no properly". Sorry, again.

Signature · 1 line
Eduardo