summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2014-09-05 10:52:47 -0300
committerMichael Roth <mdroth@linux.vnet.ibm.com>2014-12-24 15:59:00 -0600
commit61048e194227847e3b3d59a7cee210755cecbabc (patch)
treee1103e7046bf2c78a998a643aa593b43fa9c8e48 /hw
parenta9ed61533f0590a3d024145d59dddc031ee86396 (diff)
downloadqemu-61048e194227847e3b3d59a7cee210755cecbabc.tar.gz
kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec calculation
Ensure proper env->tsc value for kvmclock_current_nsec calculation. Reported-by: Marcin Gibuła <m.gibula@beyond.pl> Analyzed-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> (cherry picked from commit 317b0a6d8ba44e9bf8f9c3dbd776c4536843d82c) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/i386/kvm/clock.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index 07b9c0e581..9d657662b2 100644
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@@ -16,6 +16,7 @@
#include "qemu-common.h"
#include "sysemu/sysemu.h"
#include "sysemu/kvm.h"
+#include "sysemu/cpus.h"
#include "hw/sysbus.h"
#include "hw/kvm/clock.h"
@@ -75,6 +76,9 @@ static void kvmclock_vm_state_change(void *opaque, int running,
if (s->clock_valid) {
return;
}
+
+ cpu_synchronize_all_states();
+ cpu_clean_all_dirty();
ret = kvm_vm_ioctl(kvm_state, KVM_GET_CLOCK, &data);
if (ret < 0) {
fprintf(stderr, "KVM_GET_CLOCK failed: %s\n", strerror(ret));