From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WuI4y-00057S-Sg for qemu-devel@nongnu.org; Tue, 10 Jun 2014 05:11:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WuI4p-0007c7-RR for qemu-devel@nongnu.org; Tue, 10 Jun 2014 05:10:52 -0400 Received: from mail-lb0-x22c.google.com ([2a00:1450:4010:c04::22c]:56158) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WuI4p-0007c1-90 for qemu-devel@nongnu.org; Tue, 10 Jun 2014 05:10:43 -0400 Received: by mail-lb0-f172.google.com with SMTP id l4so3761408lbv.3 for ; Tue, 10 Jun 2014 02:10:42 -0700 (PDT) From: Sergey Fedorov Date: Tue, 10 Jun 2014 13:10:28 +0400 Message-Id: <1402391428-3123-1-git-send-email-serge.fdrv@gmail.com> Subject: [Qemu-devel] [PATCH] qtest: fix qtest_clock_warp() for no deadline case List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alex Bligh , Stefan Hajnoczi , Paolo Bonzini , Sergey Fedorov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Richard Henderson Use dedicated qemu_soonest_timeout() instead of MIN(). Signed-off-by: Sergey Fedorov --- cpus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpus.c b/cpus.c index dd7ac13..af06dc0 100644 --- a/cpus.c +++ b/cpus.c @@ -347,7 +347,7 @@ void qtest_clock_warp(int64_t dest) assert(qtest_enabled()); while (clock < dest) { int64_t deadline = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL); - int64_t warp = MIN(dest - clock, deadline); + int64_t warp = qemu_soonest_timeout(dest - clock, deadline); seqlock_write_lock(&timers_state.vm_clock_seqlock); qemu_icount_bias += warp; seqlock_write_unlock(&timers_state.vm_clock_seqlock); -- 1.9.1