43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From: Marcelo Tosatti <mtosatti@redhat.com>
|
|
Date: Fri, 5 Sep 2014 10:52:47 -0300
|
|
Subject: [PATCH] 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
|
|
|
|
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)
|
|
---
|
|
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 2fea4eb..eaf3f0a 100644
|
|
--- a/hw/i386/kvm/clock.c
|
|
+++ b/hw/i386/kvm/clock.c
|
|
@@ -17,6 +17,7 @@
|
|
#include "qemu/host-utils.h"
|
|
#include "sysemu/sysemu.h"
|
|
#include "sysemu/kvm.h"
|
|
+#include "sysemu/cpus.h"
|
|
#include "hw/sysbus.h"
|
|
#include "hw/kvm/clock.h"
|
|
|
|
@@ -124,6 +125,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));
|