From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42551)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1WrrgC-0004zA-BK
	for qemu-devel@nongnu.org; Tue, 03 Jun 2014 12:35:21 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1Wrrg5-00063v-NG
	for qemu-devel@nongnu.org; Tue, 03 Jun 2014 12:35:16 -0400
Received: from mx1.redhat.com ([209.132.183.28]:27929)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1Wrrg5-00063f-G4
	for qemu-devel@nongnu.org; Tue, 03 Jun 2014 12:35:09 -0400
Date: Tue, 3 Jun 2014 13:34:48 -0300
From: Marcelo Tosatti <mtosatti@redhat.com>
Message-ID: <20140603163448.GA11829@amt.cnet>
References: <1400253321-9239-1-git-send-email-agraf@suse.de>
	<538CDF30.9050902@beyond.pl> <20140603051630.GA2289@amt.cnet>
	<538DADED.4040609@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <538DADED.4040609@redhat.com>
Content-Transfer-Encoding: quoted-printable
Subject: [Qemu-devel] [PATCH uq/master] kvmclock: Ensure proper env->tsc
 value for kvmclock_current_nsec calculation
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Marcin =?utf-8?Q?Gibu=C5=82a?= <m.gibula@beyond.pl>, Alexander Graf <agraf@suse.de>, qemu-devel@nongnu.org


Ensure proper env->tsc value for kvmclock_current_nsec calculation.

Reported-by: Marcin Gibu=C5=82a <m.gibula@beyond.pl>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index 6f4ed28a..bef2504 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"
=20
@@ -65,6 +66,7 @@ static uint64_t kvmclock_current_nsec(KVMClockState *s)
=20
     cpu_physical_memory_read(kvmclock_struct_pa, &time, sizeof(time));
=20
+    assert(time.tsc_timestamp <=3D migration_tsc);
     delta =3D migration_tsc - time.tsc_timestamp;
     if (time.tsc_shift < 0) {
         delta >>=3D -time.tsc_shift;
@@ -123,6 +125,8 @@ static void kvmclock_vm_state_change(void *opaque, in=
t running,
         if (s->clock_valid) {
             return;
         }
+
+        cpu_synchronize_all_states();
         ret =3D kvm_vm_ioctl(kvm_state, KVM_GET_CLOCK, &data);
         if (ret < 0) {
             fprintf(stderr, "KVM_GET_CLOCK failed: %s\n", strerror(ret))=
;