Re: [Qemu-devel] [RFC PATCH 06/12] icount: make icount extra computed on icount clock as well.

[Paolo Bonzini <pbonzini@redhat.com>]

Il 21/03/2014 20:17, fred.konrad@greensocs.com ha scritto:
> From: KONRAD Frederic <fred.konrad@greensocs.com>
>
> This takes icount clock in account for icount extra computation so icount
> clock's timers will be triggered at the exact time.
>
> Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
> ---
>  cpus.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/cpus.c b/cpus.c
> index 01c48e9..825d438 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -1292,6 +1292,7 @@ static int tcg_cpu_exec(CPUArchState *env)
>      if (use_icount) {
>          int64_t count;
>          int64_t deadline;
> +        int64_t icount_deadline;
>          int decr;
>          timers_state.qemu_icount -= (cpu->icount_decr.u16.low
>                                      + cpu->icount_extra);
> @@ -1308,6 +1309,15 @@ static int tcg_cpu_exec(CPUArchState *env)
>              deadline = INT32_MAX;
>          }
>
> +        /*
> +         * Take icount clock deadline in account too, and keep the nearest
> +         * deadline.
> +         */
> +        icount_deadline = qemu_clock_deadline_ns_all(QEMU_CLOCK_ICOUNT);
> +        if ((icount_deadline >= 0) && (icount_deadline < deadline)) {
> +            deadline = icount_deadline;
> +        }
> +
>          count = qemu_icount_round(deadline);
>          timers_state.qemu_icount += count;
>          decr = (count > 0xffff) ? 0xffff : count;
>

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>