Re: [Qemu-devel] [PATCH] m48t59: use rtc_clock for alarm timer

[Andreas Färber]

Am 20.01.2012 13:05, schrieb Paolo Bonzini:
> This lets the RTC get adjustments from the host NTP client.
> The watchdog still uses the vm_clock.  The previous behavior is
> available with "-rtc clock=vm".
> 

> Signed-off-by: Paolo Bonzini <address@hidden>

Reviewed-by: Andreas Färber <address@hidden>
Cc: Blue

Andreas

> ---
>  hw/m48t59.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/m48t59.c b/hw/m48t59.c
> index c043996..fd5dc00 100644
> --- a/hw/m48t59.c
> +++ b/hw/m48t59.c
> @@ -126,7 +126,7 @@ static void alarm_cb (void *opaque)
>          /* Repeat once a second */
>          next_time = 1;
>      }
> -    qemu_mod_timer(NVRAM->alrm_timer, qemu_get_clock_ns(vm_clock) +
> +    qemu_mod_timer(NVRAM->alrm_timer, qemu_get_clock_ns(rtc_clock) +
>                      next_time * 1000);
>      qemu_set_irq(NVRAM->IRQ, 0);
>  }
> @@ -687,7 +687,7 @@ static void m48t59_init_common(M48t59State *s)
>  {
>      s->buffer = g_malloc0(s->size);
>      if (s->type == 59) {
> -        s->alrm_timer = qemu_new_timer_ns(vm_clock, &alarm_cb, s);
> +        s->alrm_timer = qemu_new_timer_ns(rtc_clock, &alarm_cb, s);
>          s->wd_timer = qemu_new_timer_ns(vm_clock, &watchdog_cb, s);
>      }
>      qemu_get_timedate(&s->alarm, 0);

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg