mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-i386: Don't declare variables in the middle of blocks

Browse Source 
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 <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Eduardo Habkost 2014-02-19 16:39:21 -03:00 committed by Andreas Färber
parent 9576de7573
commit 74f54bc4ba
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target-i386/cpu.c
View File

@ -1143,6 +1143,7 @@ static void kvm_cpu_fill_host(X86CPUDefinition *x86_cpu_def)
{ {
KVMState *s = kvm_state; KVMState *s = kvm_state;
uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0; uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0;
FeatureWord w;
assert(kvm_enabled()); 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); cpu_x86_fill_model_id(x86_cpu_def->model_id);
FeatureWord w;
for (w = 0; w < FEATURE_WORDS; w++) { for (w = 0; w < FEATURE_WORDS; w++) {
FeatureWordInfo *wi = &feature_word_info[w]; FeatureWordInfo *wi = &feature_word_info[w];
x86_cpu_def->features[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; CPUX86State *env = &cpu->env;
X86CPUDefinition def1, *def = &def1; X86CPUDefinition def1, *def = &def1;
const char *vendor;
char host_vendor[CPUID_VENDOR_SZ + 1];
memset(def, 0, sizeof(*def)); 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 * KVM's sysenter/syscall emulation in compatibility mode and
* when doing cross vendor migration * when doing cross vendor migration
*/ */
const char *vendor = def->vendor; vendor = def->vendor;
char host_vendor[CPUID_VENDOR_SZ + 1];
if (kvm_enabled()) { if (kvm_enabled()) {
uint32_t ebx = 0, ecx = 0, edx = 0; uint32_t ebx = 0, ecx = 0, edx = 0;
host_cpuid(0, 0, NULL, &ebx, &ecx, &edx); host_cpuid(0, 0, NULL, &ebx, &ecx, &edx);