[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/7] target-i386: get/put MSR_TSC_AUX across reset an
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 7/7] target-i386: get/put MSR_TSC_AUX across reset and migration |
Date: |
Mon, 28 Sep 2015 14:31:39 -0300 |
From: Amit Shah <address@hidden>
There's one report of migration breaking due to missing MSR_TSC_AUX
save/restore. Fix this by adding a new subsection that saves the state
of this MSR.
https://bugzilla.redhat.com/show_bug.cgi?id=1261797
Reported-by: Xiaoqing Wei <address@hidden>
Signed-off-by: Amit Shah <address@hidden>
CC: Paolo Bonzini <address@hidden>
CC: Juan Quintela <address@hidden>
CC: "Dr. David Alan Gilbert" <address@hidden>
CC: Marcelo Tosatti <address@hidden>
CC: Richard Henderson <address@hidden>
CC: Eduardo Habkost <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/kvm.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 7b0ba17..80d1a7e 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -67,6 +67,7 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
static bool has_msr_star;
static bool has_msr_hsave_pa;
+static bool has_msr_tsc_aux;
static bool has_msr_tsc_adjust;
static bool has_msr_tsc_deadline;
static bool has_msr_feature_control;
@@ -825,6 +826,10 @@ static int kvm_get_supported_msrs(KVMState *s)
has_msr_hsave_pa = true;
continue;
}
+ if (kvm_msr_list->indices[i] == MSR_TSC_AUX) {
+ has_msr_tsc_aux = true;
+ continue;
+ }
if (kvm_msr_list->indices[i] == MSR_TSC_ADJUST) {
has_msr_tsc_adjust = true;
continue;
@@ -1299,6 +1304,9 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
if (has_msr_hsave_pa) {
kvm_msr_entry_set(&msrs[n++], MSR_VM_HSAVE_PA, env->vm_hsave);
}
+ if (has_msr_tsc_aux) {
+ kvm_msr_entry_set(&msrs[n++], MSR_TSC_AUX, env->tsc_aux);
+ }
if (has_msr_tsc_adjust) {
kvm_msr_entry_set(&msrs[n++], MSR_TSC_ADJUST, env->tsc_adjust);
}
@@ -1671,6 +1679,9 @@ static int kvm_get_msrs(X86CPU *cpu)
if (has_msr_hsave_pa) {
msrs[n++].index = MSR_VM_HSAVE_PA;
}
+ if (has_msr_tsc_aux) {
+ msrs[n++].index = MSR_TSC_AUX;
+ }
if (has_msr_tsc_adjust) {
msrs[n++].index = MSR_TSC_ADJUST;
}
@@ -1820,6 +1831,9 @@ static int kvm_get_msrs(X86CPU *cpu)
case MSR_IA32_TSC:
env->tsc = msrs[i].data;
break;
+ case MSR_TSC_AUX:
+ env->tsc_aux = msrs[i].data;
+ break;
case MSR_TSC_ADJUST:
env->tsc_adjust = msrs[i].data;
break;
--
2.1.0
- [Qemu-devel] [PULL 0/7] X86 queue, 2015-09-28, Eduardo Habkost, 2015/09/29
- [Qemu-devel] [PULL 1/7] cpu: Introduce X86CPUTopoInfo structure for argument simplification, Eduardo Habkost, 2015/09/29
- [Qemu-devel] [PULL 2/7] vl: Add another sanity check to smp_parse() function, Eduardo Habkost, 2015/09/29
- [Qemu-devel] [PULL 3/7] target-i386: Enable "check" mode by default, Eduardo Habkost, 2015/09/29
- [Qemu-devel] [PULL 4/7] target-i386: Convert kvm_default_*features to property/value pairs, Eduardo Habkost, 2015/09/29
- [Qemu-devel] [PULL 5/7] target-i386: Move breakpoint related functions to new file, Eduardo Habkost, 2015/09/29
- [Qemu-devel] [PULL 6/7] target-i386: Make check_hw_breakpoints static, Eduardo Habkost, 2015/09/29
- [Qemu-devel] [PULL 7/7] target-i386: get/put MSR_TSC_AUX across reset and migration,
Eduardo Habkost <=