[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 18/21] qemu-kvm: Cleanup/fix TSC and PV clock wri
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v2 18/21] qemu-kvm: Cleanup/fix TSC and PV clock writeback |
Date: |
Wed, 3 Feb 2010 09:53:43 +0100 |
Drop kvm_load_tsc in favor of level-dependent writeback in
kvm_arch_load_regs. KVM's PV clock MSRs fall in the same category and
should therefore only be written back on full sync.
Signed-off-by: Jan Kiszka <address@hidden>
---
qemu-kvm-x86.c | 19 +++++--------------
qemu-kvm.h | 4 ----
target-i386/machine.c | 5 -----
3 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index 23a23eb..e5040c9 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -972,8 +972,11 @@ void kvm_arch_load_regs(CPUState *env, int level)
set_msr_entry(&msrs[n++], MSR_LSTAR , env->lstar);
}
#endif
- set_msr_entry(&msrs[n++], MSR_KVM_SYSTEM_TIME, env->system_time_msr);
- set_msr_entry(&msrs[n++], MSR_KVM_WALL_CLOCK, env->wall_clock_msr);
+ if (level == KVM_PUT_FULL_STATE) {
+ set_msr_entry(&msrs[n++], MSR_IA32_TSC, env->tsc);
+ set_msr_entry(&msrs[n++], MSR_KVM_SYSTEM_TIME, env->system_time_msr);
+ set_msr_entry(&msrs[n++], MSR_KVM_WALL_CLOCK, env->wall_clock_msr);
+ }
rc = kvm_set_msrs(env, msrs, n);
if (rc == -1)
@@ -990,18 +993,6 @@ void kvm_arch_load_regs(CPUState *env, int level)
kvm_put_vcpu_events(env, level);
}
-void kvm_load_tsc(CPUState *env)
-{
- int rc;
- struct kvm_msr_entry msr;
-
- set_msr_entry(&msr, MSR_IA32_TSC, env->tsc);
-
- rc = kvm_set_msrs(env, &msr, 1);
- if (rc == -1)
- perror("kvm_set_tsc FAILED.\n");
-}
-
void kvm_arch_save_regs(CPUState *env)
{
struct kvm_regs regs;
diff --git a/qemu-kvm.h b/qemu-kvm.h
index ca5c700..4c009c9 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -958,7 +958,6 @@ int handle_tpr_access(void *opaque, CPUState *env, uint64_t
rip,
#ifdef TARGET_I386
#define qemu_kvm_has_pit_state2() kvm_has_pit_state2(kvm_context)
#endif
-void kvm_load_tsc(CPUState *env);
#else
#define kvm_nested 0
#define qemu_kvm_has_gsi_routing() (0)
@@ -966,9 +965,6 @@ void kvm_load_tsc(CPUState *env);
#define qemu_kvm_has_pit_state2() (0)
#endif
#define qemu_kvm_cpu_stop(env) do {} while(0)
-static inline void kvm_load_tsc(CPUState *env)
-{
-}
#endif
void kvm_mutex_unlock(void);
diff --git a/target-i386/machine.c b/target-i386/machine.c
index bcc315b..b547e2a 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -354,11 +354,6 @@ static int cpu_post_load(void *opaque, int version_id)
hw_breakpoint_insert(env, i);
tlb_flush(env, 1);
-
- if (kvm_enabled()) {
- kvm_load_tsc(env);
- }
-
return 0;
}
--
1.6.0.2
- [Qemu-devel] [PATCH v2 00/21] qemu-kvm: Hook cleanups and extended use of upstream code, Jan Kiszka, 2010/02/03
- [Qemu-devel] [PATCH v2 01/21] qemu-kvm: Drop vmport changes, Jan Kiszka, 2010/02/03
- [Qemu-devel] [PATCH v2 02/21] KVM: Make vmport KVM-compatible, Jan Kiszka, 2010/02/03
- [Qemu-devel] [PATCH v2 06/21] qemu-kvm: Use upstream kvm_setup_guest_memory, Jan Kiszka, 2010/02/03
- [Qemu-devel] [PATCH v2 03/21] qemu-kvm: Clean up register access API, Jan Kiszka, 2010/02/03
- [Qemu-devel] [PATCH v2 08/21] qemu-kvm: Use upstream kvm_arch_get_supported_cpuid, Jan Kiszka, 2010/02/03
- [Qemu-devel] [PATCH v2 04/21] KVM: x86: Fix up misreported CPU features, Jan Kiszka, 2010/02/03
- [Qemu-devel] [PATCH v2 09/21] qemu-kvm: Use upstream kvm_pit_in_kernel, Jan Kiszka, 2010/02/03
- [Qemu-devel] [PATCH v2 18/21] qemu-kvm: Cleanup/fix TSC and PV clock writeback,
Jan Kiszka <=
- [Qemu-devel] [PATCH v2 10/21] KVM: Move and rename regs_modified, Jan Kiszka, 2010/02/03
- [Qemu-devel] [PATCH v2 07/21] qemu-kvm: Use some more upstream prototypes, Jan Kiszka, 2010/02/03
- [Qemu-devel] [PATCH v2 11/21] KVM: Rework of guest debug state writing, Jan Kiszka, 2010/02/03
- [Qemu-devel] [PATCH v2 16/21] KVM: x86: Restrict writeback of VCPU state, Jan Kiszka, 2010/02/03
- [Qemu-devel] [PATCH v2 05/21] qemu-kvm: Use upstream kvm_enabled and cpu_synchronize_state, Jan Kiszka, 2010/02/03
- [Qemu-devel] [PATCH v2 20/21] qemu-kvm: Move kvm_set_boot_cpu_id, Jan Kiszka, 2010/02/03
- [Qemu-devel] [PATCH v2 21/21] qemu-kvm: Bring qemu_init_vcpu back home, Jan Kiszka, 2010/02/03
- [Qemu-devel] [PATCH v2 17/21] qemu-kvm: Use VCPU event state for reset and vmsave/load, Jan Kiszka, 2010/02/03
- [Qemu-devel] [PATCH v2 15/21] qemu-kvm: Clean up mpstate synchronization, Jan Kiszka, 2010/02/03
- [Qemu-devel] [PATCH v2 12/21] qemu-kvm: Use upstream kvm_vcpu_dirty, Jan Kiszka, 2010/02/03