From ead6288c371b882d955fe76e407c25d9b5a893ed Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Mon, 22 Sep 2014 17:05:26 +0200 Subject: [PATCH 07/13] kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec calculation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-id: <20140922170613.816907826@redhat.com> Patchwork-id: 61361 O-Subject: [PATCH RHEV-7.1 qemu-kvm-rhev 2/3] kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec calculation Bugzilla: 1143054 RH-Acked-by: Eduardo Habkost RH-Acked-by: Radim Krcmar RH-Acked-by: Paolo Bonzini commit 317b0a6d8ba44e9bf8f9c3dbd776c4536843d82c upstream of qemu-kvm.git uq/master branch Author: Marcelo Tosatti Ensure proper env->tsc value for kvmclock_current_nsec calculation. Reported-by: Marcin Gibuła Analyzed-by: Marcin Gibuła Cc: qemu-stable@nongnu.org Signed-off-by: Marcelo Tosatti Signed-off-by: Paolo Bonzini Signed-off-by: Miroslav Rezanina --- hw/i386/kvm/clock.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index 07b9c0e..9d65766 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)); -- 1.8.3.1