From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu2fC-0005X3-Vk for qemu-devel@nongnu.org; Mon, 09 Jun 2014 12:43:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wu2f3-0001pd-VY for qemu-devel@nongnu.org; Mon, 09 Jun 2014 12:43:14 -0400 Received: from mail-lb0-x234.google.com ([2a00:1450:4010:c04::234]:51967) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu2f3-0001p7-Nx for qemu-devel@nongnu.org; Mon, 09 Jun 2014 12:43:05 -0400 Received: by mail-lb0-f180.google.com with SMTP id p9so3123939lbv.25 for ; Mon, 09 Jun 2014 09:43:03 -0700 (PDT) From: Sergey Fedorov Date: Mon, 9 Jun 2014 20:42:51 +0400 Message-Id: <1402332171-7159-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 If there is no deadline across all timerlists attached to the clock then qemu_clock_deadline_ns_all() returns -1. Cast it to unsinged so MIN() do not treat it as minimum. Signed-off-by: Sergey Fedorov --- cpus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpus.c b/cpus.c index dd7ac13..3ec15cb 100644 --- a/cpus.c +++ b/cpus.c @@ -346,8 +346,8 @@ void qtest_clock_warp(int64_t dest) int64_t clock = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); assert(qtest_enabled()); while (clock < dest) { - int64_t deadline = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL); - int64_t warp = MIN(dest - clock, deadline); + uint64_t deadline = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL); + uint64_t warp = MIN(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