]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commit
Revert "kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec calculation"
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 15 Jul 2014 19:45:42 +0000 (21:45 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 18 Jul 2014 13:15:14 +0000 (15:15 +0200)
commit108e4c3871e0d0cd185ccffef5e932961f92dd63
treef7d3788ad0b7b7d40fd92e74e4d402189e57e047
parentbb2eb1892d36e5c9fa1695924434313e3acbb1c0
Revert "kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec calculation"

This reverts commit 9b1786829aefb83f37a8f3135e3ea91c56001b56.

This patch fixed a hang introduced by commit a096b3a (kvmclock: Ensure
time in migration never goes backward, 2014-05-16), but it causes
a regression in migration whose cause is not quite clear.

Because of this, I'm choosing to revert both patches.  This trades a
2.1 regression for a bug that's been there forever.

Cc: agraf@suse.de
Cc: mtosatti@redhat.com
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
hw/i386/kvm/clock.c