[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/7] Fix build on !KVM_CAP_MCE
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 3/7] Fix build on !KVM_CAP_MCE |
Date: |
Thu, 21 Oct 2010 16:25:49 -0200 |
From: Hidetoshi Seto <address@hidden>
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 <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
target-i386/kvm.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 9144f74..587ee19 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -783,7 +783,7 @@ static int kvm_put_msrs(CPUState *env, int level)
struct kvm_msr_entry entries[100];
} msr_data;
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_ESP, env->sysenter_esp);
@@ -805,6 +805,7 @@ static int kvm_put_msrs(CPUState *env, int level)
}
#ifdef KVM_CAP_MCE
if (env->mcg_cap) {
+ int i;
if (level == KVM_PUT_RESET_STATE)
kvm_msr_entry_set(&msrs[n++], MSR_MCG_STATUS, env->mcg_status);
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 &&
msrs[i].index < MSR_MC0_CTL + (env->mcg_cap & 0xff) * 4) {
env->mce_banks[msrs[i].index - MSR_MC0_CTL] = msrs[i].data;
- break;
}
#endif
+ break;
}
}
--
1.7.2.1
- [Qemu-devel] [PATCH 0/7] [PULL] qemu-kvm.git uq/master queue, Marcelo Tosatti, 2010/10/21
- [Qemu-devel] [PATCH 5/7] kvm: factor out kvm_has_msr_star, Marcelo Tosatti, 2010/10/21
- [Qemu-devel] [PATCH 4/7] kvm: add save/restore of MSR_VM_HSAVE_PA, Marcelo Tosatti, 2010/10/21
- [Qemu-devel] [PATCH 3/7] Fix build on !KVM_CAP_MCE,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 7/7] kvm: save/restore x86-64 MSRs on x86-64 kernels, Marcelo Tosatti, 2010/10/21
- [Qemu-devel] [PATCH 1/7] x86, mce: ignore SRAO only when MCG_SER_P is available, Marcelo Tosatti, 2010/10/21
- [Qemu-devel] [PATCH 6/7] kvm: writeback SMP TSCs on migration only, Marcelo Tosatti, 2010/10/21
- [Qemu-devel] [PATCH 2/7] x86, mce: broadcast mce depending on the cpu version, Marcelo Tosatti, 2010/10/21
- Re: [Qemu-devel] [PATCH 0/7] [PULL] qemu-kvm.git uq/master queue, Anthony Liguori, 2010/10/22