From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxG8U-00068u-Uu for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:42:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxG8O-00008o-NF for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:42:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61828) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxG8O-00008c-5h for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:42:40 -0400 From: Paolo Bonzini Date: Wed, 18 Jun 2014 15:42:04 +0200 Message-Id: <1403098928-30749-8-git-send-email-pbonzini@redhat.com> In-Reply-To: <1403098928-30749-1-git-send-email-pbonzini@redhat.com> References: <1403098928-30749-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 07/11] 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: Sergey Fedorov From: Sergey Fedorov Use dedicated qemu_soonest_timeout() instead of MIN(). Signed-off-by: Sergey Fedorov Signed-off-by: Paolo Bonzini --- 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.8.3.1