Re: [PATCH 7/8] hw/m68k/mcf5206.c: Switch to transaction-based ptimer API

[Philippe Mathieu-Daudé]

On 10/17/19 3:29 PM, Peter Maydell wrote:
> Switch the mcf5206 code away from bottom-half based ptimers to
> the new transaction-based ptimer API.  This just requires adding
> begin/commit calls around the various places that modify the ptimer
> state, and using the new ptimer_init() function to create the timer.
>
> Signed-off-by: Peter Maydell <address@hidden>
> ---
>   hw/m68k/mcf5206.c | 9 +++++----
>   1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
> index a49096367cb..c05401e0e50 100644
> --- a/hw/m68k/mcf5206.c
> +++ b/hw/m68k/mcf5206.c
> @@ -8,7 +8,6 @@
>   
>   #include "qemu/osdep.h"
>   #include "qemu/error-report.h"
> -#include "qemu/main-loop.h"
>   #include "cpu.h"
>   #include "hw/hw.h"
>   #include "hw/irq.h"
> @@ -57,6 +56,7 @@ static void m5206_timer_recalibrate(m5206_timer_state *s)
>       int prescale;
>       int mode;
>   
> +    ptimer_transaction_begin(s->timer);
>       ptimer_stop(s->timer);
>   
>       if ((s->tmr & TMR_RST) == 0)
> @@ -78,6 +78,7 @@ static void m5206_timer_recalibrate(m5206_timer_state *s)
>       ptimer_set_limit(s->timer, s->trr, 0);
>   
>       ptimer_run(s->timer, 0);
> +    ptimer_transaction_commit(s->timer);
>   }
>   
>   static void m5206_timer_trigger(void *opaque)
> @@ -123,7 +124,9 @@ static void m5206_timer_write(m5206_timer_state *s, 
> uint32_t addr, uint32_t val)
>           s->tcr = val;
>           break;
>       case 0xc:
> +        ptimer_transaction_begin(s->timer);
>           ptimer_set_count(s->timer, val);
> +        ptimer_transaction_commit(s->timer);
>           break;
>       case 0x11:
>           s->ter &= ~val;
> @@ -137,11 +140,9 @@ static void m5206_timer_write(m5206_timer_state *s, 
> uint32_t addr, uint32_t val)
>   static m5206_timer_state *m5206_timer_init(qemu_irq irq)
>   {
>       m5206_timer_state *s;
> -    QEMUBH *bh;
>   
>       s = g_new0(m5206_timer_state, 1);
> -    bh = qemu_bh_new(m5206_timer_trigger, s);
> -    s->timer = ptimer_init_with_bh(bh, PTIMER_POLICY_DEFAULT);
> +    s->timer = ptimer_init(m5206_timer_trigger, s, PTIMER_POLICY_DEFAULT);
>       s->irq = irq;
>       m5206_timer_reset(s);
>       return s;

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>