From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38376)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1WuJq9-00010I-2Q
	for qemu-devel@nongnu.org; Tue, 10 Jun 2014 07:03:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1WuJpw-0004gU-Rd
	for qemu-devel@nongnu.org; Tue, 10 Jun 2014 07:03:40 -0400
Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]:54607)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1WuJpw-0004gO-L0
	for qemu-devel@nongnu.org; Tue, 10 Jun 2014 07:03:28 -0400
Received: by mail-wi0-f176.google.com with SMTP id n3so3227160wiv.9
	for <qemu-devel@nongnu.org>; Tue, 10 Jun 2014 04:03:26 -0700 (PDT)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <5396E5FB.50509@redhat.com>
Date: Tue, 10 Jun 2014 13:03:23 +0200
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1402391428-3123-1-git-send-email-serge.fdrv@gmail.com>
In-Reply-To: <1402391428-3123-1-git-send-email-serge.fdrv@gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] qtest: fix qtest_clock_warp() for no
	deadline case
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: Sergey Fedorov <serge.fdrv@gmail.com>, qemu-devel@nongnu.org
Cc: Richard Henderson <rth@twiddle.net>, Stefan Hajnoczi <stefanha@redhat.com>, Alex Bligh <alex@alex.org.uk>, =?ISO-8859-1?Q?Andreas_F=E4rber?= <afaerber@suse.de>

Il 10/06/2014 11:10, Sergey Fedorov ha scritto:
> Use dedicated qemu_soonest_timeout() instead of MIN().
>
> Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com>
> ---
>  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);
>

Thanks, I will make sure this gets into QEMU 2.1.

Paolo