[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/10] Add savevm/loadvm support for MCE
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 10/10] Add savevm/loadvm support for MCE |
Date: |
Tue, 19 Oct 2010 08:40:36 -0200 |
Port qemu-kvm's
commit 1bab5d11545d8de5facf46c28630085a2f9651ae
Author: Huang Ying <address@hidden>
Date: Wed Mar 3 16:52:46 2010 +0800
Add savevm/loadvm support for MCE
MCE registers are saved/load into/from CPUState in
kvm_arch_save/load_regs. To simulate the MCG_STATUS clearing upon
reset, MSR_MCG_STATUS is set to 0 for KVM_PUT_RESET_STATE.
Signed-off-by: Marcelo Tosatti <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
target-i386/kvm.c | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 84bd400..d940175 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -777,7 +777,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 n = 0;
+ int i, 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);
@@ -797,6 +797,18 @@ static int kvm_put_msrs(CPUState *env, int level)
env->system_time_msr);
kvm_msr_entry_set(&msrs[n++], MSR_KVM_WALL_CLOCK, env->wall_clock_msr);
}
+#ifdef KVM_CAP_MCE
+ if (env->mcg_cap) {
+ 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) {
+ kvm_msr_entry_set(&msrs[n++], MSR_MCG_STATUS, env->mcg_status);
+ kvm_msr_entry_set(&msrs[n++], MSR_MCG_CTL, env->mcg_ctl);
+ for (i = 0; i < (env->mcg_cap & 0xff) * 4; i++)
+ kvm_msr_entry_set(&msrs[n++], MSR_MC0_CTL + i,
env->mce_banks[i]);
+ }
+ }
+#endif
msr_data.info.nmsrs = n;
@@ -1004,6 +1016,15 @@ static int kvm_get_msrs(CPUState *env)
msrs[n++].index = MSR_KVM_SYSTEM_TIME;
msrs[n++].index = MSR_KVM_WALL_CLOCK;
+#ifdef KVM_CAP_MCE
+ if (env->mcg_cap) {
+ msrs[n++].index = MSR_MCG_STATUS;
+ msrs[n++].index = MSR_MCG_CTL;
+ for (i = 0; i < (env->mcg_cap & 0xff) * 4; i++)
+ msrs[n++].index = MSR_MC0_CTL + i;
+ }
+#endif
+
msr_data.info.nmsrs = n;
ret = kvm_vcpu_ioctl(env, KVM_GET_MSRS, &msr_data);
if (ret < 0)
@@ -1046,6 +1067,22 @@ static int kvm_get_msrs(CPUState *env)
case MSR_KVM_WALL_CLOCK:
env->wall_clock_msr = msrs[i].data;
break;
+#ifdef KVM_CAP_MCE
+ case MSR_MCG_STATUS:
+ env->mcg_status = msrs[i].data;
+ break;
+ case MSR_MCG_CTL:
+ env->mcg_ctl = msrs[i].data;
+ break;
+#endif
+ default:
+#ifdef KVM_CAP_MCE
+ 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
}
}
--
1.7.2.1
- [Qemu-devel] [PATCH 00/10] [PULL] qemu-kvm.git uq/master queue, Marcelo Tosatti, 2010/10/19
- [Qemu-devel] [PATCH 06/10] kvm: x86: add mce support, Marcelo Tosatti, 2010/10/19
- [Qemu-devel] [PATCH 10/10] Add savevm/loadvm support for MCE,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 09/10] MCE: Relay UCR MCE to guest, Marcelo Tosatti, 2010/10/19
- [Qemu-devel] [PATCH 07/10] Export qemu_ram_addr_from_host, Marcelo Tosatti, 2010/10/19
- [Qemu-devel] [PATCH 05/10] Expose thread_id in info cpus, Marcelo Tosatti, 2010/10/19
- [Qemu-devel] [PATCH 02/10] Add svm cpuid features, Marcelo Tosatti, 2010/10/19
- [Qemu-devel] [PATCH 03/10] signalfd compatibility, Marcelo Tosatti, 2010/10/19
- [Qemu-devel] [PATCH 08/10] Add RAM -> physical addr mapping in MCE simulation, Marcelo Tosatti, 2010/10/19
- [Qemu-devel] [PATCH 04/10] iothread: use signalfd, Marcelo Tosatti, 2010/10/19
- [Qemu-devel] [PATCH 01/10] Set cpuid definition to 0 before initializing it, Marcelo Tosatti, 2010/10/19
- Re: [Qemu-devel] [PATCH 00/10] [PULL] qemu-kvm.git uq/master queue, Anthony Liguori, 2010/10/19