Re: [Qemu-devel] [PATCH] qtest: fix qtest_clock_warp() for no deadline case

[Paolo Bonzini <pbonzini@redhat.com>]

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