[Qemu-devel] Re: [PATCH] [sparc32] fix last cpu timer initialization

[Blue Swirl]

Thanks, applied. Please remember to use Signed-off-by tag.


On Mon, Aug 2, 2010 at 5:58 PM, Artyom Tarasenko
<address@hidden> wrote:
> The timer #0 is the system timer, so the timer #num_cpu is the
> timer of the last CPU, and it must be initialized in slavio_timer_reset.
>
> Don't mark non-existing timers as running.
> ---
>  hw/slavio_timer.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/slavio_timer.c b/hw/slavio_timer.c
> index d787553..c125de4 100644
> --- a/hw/slavio_timer.c
> +++ b/hw/slavio_timer.c
> @@ -377,12 +377,12 @@ static void slavio_timer_reset(DeviceState *d)
>         curr_timer->limit = 0;
>         curr_timer->count = 0;
>         curr_timer->reached = 0;
> -        if (i < s->num_cpus) {
> +        if (i <= s->num_cpus) {
>             ptimer_set_limit(curr_timer->timer,
>                              LIMIT_TO_PERIODS(TIMER_MAX_COUNT32), 1);
>             ptimer_run(curr_timer->timer, 0);
> +            curr_timer->running = 1;
>         }
> -        curr_timer->running = 1;
>     }
>     s->cputimer_mode = 0;
>  }
> --
> 1.6.2.5
>
>