mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec calculation

Browse Source 
Ensure proper env->tsc value for kvmclock_current_nsec calculation.

Reported-by: Marcin Gibuła <m.gibula@beyond.pl>
Cc: qemu-stable@nongnu.org
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marcelo Tosatti 2014-06-03 13:34:48 -03:00 committed by Paolo Bonzini
parent f522d2acc5
commit 9b1786829a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/i386/kvm/clock.c
View File

@ -17,6 +17,7 @@
#include "qemu/host-utils.h" #include "qemu/host-utils.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
#include "sysemu/cpus.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/kvm/clock.h" #include "hw/kvm/clock.h"
@ -65,6 +66,7 @@ static uint64_t kvmclock_current_nsec(KVMClockState *s)
cpu_physical_memory_read(kvmclock_struct_pa, &time, sizeof(time)); cpu_physical_memory_read(kvmclock_struct_pa, &time, sizeof(time));
assert(time.tsc_timestamp <= migration_tsc);
delta = migration_tsc - time.tsc_timestamp; delta = migration_tsc - time.tsc_timestamp;
if (time.tsc_shift < 0) { if (time.tsc_shift < 0) {
delta >>= -time.tsc_shift; delta >>= -time.tsc_shift;
@ -123,6 +125,8 @@ static void kvmclock_vm_state_change(void *opaque, int running,
if (s->clock_valid) { if (s->clock_valid) {
return; return;
} }
cpu_synchronize_all_states();
ret = kvm_vm_ioctl(kvm_state, KVM_GET_CLOCK, &data); ret = kvm_vm_ioctl(kvm_state, KVM_GET_CLOCK, &data);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "KVM_GET_CLOCK failed: %s\n", strerror(ret)); fprintf(stderr, "KVM_GET_CLOCK failed: %s\n", strerror(ret));