[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/10] kvm: i386: fix LAPIC TSC deadline timer save/
From: |
Gleb Natapov |
Subject: |
[Qemu-devel] [PATCH 08/10] kvm: i386: fix LAPIC TSC deadline timer save/restore |
Date: |
Wed, 28 Aug 2013 17:33:36 +0300 |
From: Marcelo Tosatti <address@hidden>
The configuration of the timer represented by MSR_IA32_TSCDEADLINE depends on:
- APIC LVT Timer register.
- TSC value.
Change the order to respect the dependency.
Signed-off-by: Marcelo Tosatti <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
target-i386/kvm.c | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 7bb8455..58f7bb7 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -1073,6 +1073,26 @@ static void kvm_msr_entry_set(struct kvm_msr_entry
*entry,
entry->data = value;
}
+static int kvm_put_tscdeadline_msr(X86CPU *cpu)
+{
+ CPUX86State *env = &cpu->env;
+ struct {
+ struct kvm_msrs info;
+ struct kvm_msr_entry entries[1];
+ } msr_data;
+ struct kvm_msr_entry *msrs = msr_data.entries;
+
+ if (!has_msr_tsc_deadline) {
+ return 0;
+ }
+
+ kvm_msr_entry_set(&msrs[0], MSR_IA32_TSCDEADLINE, env->tsc_deadline);
+
+ msr_data.info.nmsrs = 1;
+
+ return kvm_vcpu_ioctl(CPU(cpu), KVM_SET_MSRS, &msr_data);
+}
+
static int kvm_put_msrs(X86CPU *cpu, int level)
{
CPUX86State *env = &cpu->env;
@@ -1096,9 +1116,6 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
if (has_msr_tsc_adjust) {
kvm_msr_entry_set(&msrs[n++], MSR_TSC_ADJUST, env->tsc_adjust);
}
- if (has_msr_tsc_deadline) {
- kvm_msr_entry_set(&msrs[n++], MSR_IA32_TSCDEADLINE, env->tsc_deadline);
- }
if (has_msr_misc_enable) {
kvm_msr_entry_set(&msrs[n++], MSR_IA32_MISC_ENABLE,
env->msr_ia32_misc_enable);
@@ -1808,6 +1825,12 @@ int kvm_arch_put_registers(CPUState *cpu, int level)
return ret;
}
}
+
+ ret = kvm_put_tscdeadline_msr(x86_cpu);
+ if (ret < 0) {
+ return ret;
+ }
+
ret = kvm_put_vcpu_events(x86_cpu, level);
if (ret < 0) {
return ret;
--
1.7.10.4
- [Qemu-devel] [PATCH v3 00/10] [PULL] qemu-kvm.git uq/master queue, Gleb Natapov, 2013/08/28
- [Qemu-devel] [PATCH 05/10] kvm: x86: fix setting IA32_FEATURE_CONTROL with nested VMX disabled, Gleb Natapov, 2013/08/28
- [Qemu-devel] [PATCH 06/10] kvm: Simplify kvm_handle_io, Gleb Natapov, 2013/08/28
- [Qemu-devel] [PATCH 02/10] target-i386: remove tabs from target-i386/cpu.h, Gleb Natapov, 2013/08/28
- [Qemu-devel] [PATCH 01/10] Initialize IA32_FEATURE_CONTROL MSR in reset and migration, Gleb Natapov, 2013/08/28
- [Qemu-devel] [PATCH 08/10] kvm: i386: fix LAPIC TSC deadline timer save/restore,
Gleb Natapov <=
- [Qemu-devel] [PATCH 09/10] kvm: shorten the parameter list for get_real_device(), Gleb Natapov, 2013/08/28
- [Qemu-devel] [PATCH 03/10] kvm: migrate vPMU state, Gleb Natapov, 2013/08/28
- [Qemu-devel] [PATCH 04/10] kvm: add KVM_IRQFD_FLAG_RESAMPLE support, Gleb Natapov, 2013/08/28
- [Qemu-devel] [PATCH 07/10] kvm-all.c: max_cpus should not exceed KVM vcpu limit, Gleb Natapov, 2013/08/28
- [Qemu-devel] [PATCH 10/10] kvm-stub: fix compilation, Gleb Natapov, 2013/08/28