ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build on !KVM_CAP_MCE 

This patch removes following warnings:

target-i386/kvm.c: In function 'kvm_put_msrs':
target-i386/kvm.c:782: error: unused variable 'i'
target-i386/kvm.c: In function 'kvm_get_msrs':
target-i386/kvm.c:1083: error: label at end of compound statement

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Hidetoshi Seto 2010-10-21 17:23:14 +09:00 committed by Marcelo Tosatti
parent f71ac88fe9
commit d8da8574b1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target-i386/kvm.c
View File

@ -783,7 +783,7 @@ static int kvm_put_msrs(CPUState *env, int level)
struct kvm_msr_entry entries[100]; struct kvm_msr_entry entries[100];
} msr_data; } msr_data;
struct kvm_msr_entry *msrs = msr_data.entries; struct kvm_msr_entry *msrs = msr_data.entries;
int i, n = 0; int n = 0;
kvm_msr_entry_set(&msrs[n++], MSR_IA32_SYSENTER_CS, env->sysenter_cs); kvm_msr_entry_set(&msrs[n++], MSR_IA32_SYSENTER_CS, env->sysenter_cs);
kvm_msr_entry_set(&msrs[n++], MSR_IA32_SYSENTER_ESP, env->sysenter_esp); kvm_msr_entry_set(&msrs[n++], MSR_IA32_SYSENTER_ESP, env->sysenter_esp);
@ -805,6 +805,7 @@ static int kvm_put_msrs(CPUState *env, int level)
} }
#ifdef KVM_CAP_MCE #ifdef KVM_CAP_MCE
if (env->mcg_cap) { if (env->mcg_cap) {
int i;
if (level == KVM_PUT_RESET_STATE) if (level == KVM_PUT_RESET_STATE)
kvm_msr_entry_set(&msrs[n++], MSR_MCG_STATUS, env->mcg_status); kvm_msr_entry_set(&msrs[n++], MSR_MCG_STATUS, env->mcg_status);
else if (level == KVM_PUT_FULL_STATE) { else if (level == KVM_PUT_FULL_STATE) {
@ -1089,9 +1090,9 @@ static int kvm_get_msrs(CPUState *env)
if (msrs[i].index >= MSR_MC0_CTL && if (msrs[i].index >= MSR_MC0_CTL &&
msrs[i].index < MSR_MC0_CTL + (env->mcg_cap & 0xff) * 4) { msrs[i].index < MSR_MC0_CTL + (env->mcg_cap & 0xff) * 4) {
env->mce_banks[msrs[i].index - MSR_MC0_CTL] = msrs[i].data; env->mce_banks[msrs[i].index - MSR_MC0_CTL] = msrs[i].data;
break;
} }
#endif #endif
break;
} }
} }