Re: [Qemu-devel] [qom-cpu PATCH v2] target-i386: Don't declare variables in the middle of blocks

[Andreas Färber]

Am 19.02.2014 20:39, schrieb Eduardo Habkost:
 Some of my recent changes introduced variable declarations in the middle
 of code blocks.
 
 Fix the code so that it compiles without warnings when using
 -Wdeclaration-after-statement.
 
 Signed-off-by: Eduardo Habkost ehabk...@redhat.com
 ---
 Changes v2:
  * Rebased on top of qom-cpu

I could've sworn that I applied v1, but it's indeed not on qom-cpu...

Thanks for rebasing, applied to qom-cpu:
https://github.com/afaerber/qemu-cpu/commits/qom-cpu

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

[Qemu-devel] [qom-cpu PATCH v2] target-i386: Don't declare variables in the middle of blocks

[Eduardo Habkost]

Some of my recent changes introduced variable declarations in the middle
of code blocks.

Fix the code so that it compiles without warnings when using
-Wdeclaration-after-statement.

Signed-off-by: Eduardo Habkost ehabk...@redhat.com
---
Changes v2:
 * Rebased on top of qom-cpu
---
 target-i386/cpu.c | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 5a530b5..9ff1062 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1143,6 +1143,7 @@ static void kvm_cpu_fill_host(X86CPUDefinition 
*x86_cpu_def)
 {
 KVMState *s = kvm_state;
 uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0;
+FeatureWord w;
 
 assert(kvm_enabled());
 
@@ -1163,7 +1164,6 @@ static void kvm_cpu_fill_host(X86CPUDefinition 
*x86_cpu_def)
 
 cpu_x86_fill_model_id(x86_cpu_def-model_id);
 
-FeatureWord w;
 for (w = 0; w  FEATURE_WORDS; w++) {
 FeatureWordInfo *wi = feature_word_info[w];
 x86_cpu_def-features[w] =
@@ -1823,6 +1823,8 @@ static void x86_cpu_load_def(X86CPU *cpu, const char 
*name, Error **errp)
 {
 CPUX86State *env = cpu-env;
 X86CPUDefinition def1, *def = def1;
+const char *vendor;
+char host_vendor[CPUID_VENDOR_SZ + 1];
 
 memset(def, 0, sizeof(*def));
 
@@ -1862,8 +1864,7 @@ static void x86_cpu_load_def(X86CPU *cpu, const char 
*name, Error **errp)
  * KVM's sysenter/syscall emulation in compatibility mode and
  * when doing cross vendor migration
  */
-const char *vendor = def-vendor;
-char host_vendor[CPUID_VENDOR_SZ + 1];
+vendor = def-vendor;
 if (kvm_enabled()) {
 uint32_t  ebx = 0, ecx = 0, edx = 0;
 host_cpuid(0, 0, NULL, ebx, ecx, edx);
-- 
1.8.5.3