Re: [PATCH 1/1] qemu_timer.c: add timer_deadline_ms() helper

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 3298 bytes --]

On Fri, Feb 26, 2021 at 03:29:55PM +0100, Paolo Bonzini wrote:
> On 25/02/21 22:29, Daniel Henrique Barboza wrote:
> > The pSeries machine is using QEMUTimer internals to return the timeout
> > in seconds for a timer object, in hw/ppc/spapr.c, function
> > spapr_drc_unplug_timeout_remaining_sec().
> > 
> > Create a helper in qemu-timer.c to retrieve the deadline for a QEMUTimer
> > object, in ms, to avoid exposing timer internals to the PPC code.
> > 
> > CC: Paolo Bonzini <pbonzini@redhat.com>
> > Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
> > ---
> > 
> > This patch is applicable on top of David's ppc-for-6.0.
> 
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>

With Paolo's ack, I've taken this into the ppc-for-6.0 tree, hope
that's ok.

> 
> >   hw/ppc/spapr_drc.c   |  5 ++---
> >   include/qemu/timer.h |  8 ++++++++
> >   util/qemu-timer.c    | 13 +++++++++++++
> >   3 files changed, 23 insertions(+), 3 deletions(-)
> > 
> > diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
> > index 8c4997d795..98b626acf9 100644
> > --- a/hw/ppc/spapr_drc.c
> > +++ b/hw/ppc/spapr_drc.c
> > @@ -421,9 +421,8 @@ void spapr_drc_unplug_request(SpaprDrc *drc)
> >   int spapr_drc_unplug_timeout_remaining_sec(SpaprDrc *drc)
> >   {
> > -    if (drc->unplug_requested && timer_pending(drc->unplug_timeout_timer)) {
> > -        return (qemu_timeout_ns_to_ms(drc->unplug_timeout_timer->expire_time) -
> > -                qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL)) / 1000;
> > +    if (drc->unplug_requested) {
> > +        return timer_deadline_ms(drc->unplug_timeout_timer) / 1000;
> >       }
> >       return 0;
> > diff --git a/include/qemu/timer.h b/include/qemu/timer.h
> > index 1678238384..5e76e3f8c2 100644
> > --- a/include/qemu/timer.h
> > +++ b/include/qemu/timer.h
> > @@ -795,6 +795,14 @@ static inline int64_t get_max_clock_jump(void)
> >       return 60 * NANOSECONDS_PER_SECOND;
> >   }
> > +/**
> > + * timer_deadline_ms:
> > + *
> > + * Returns the remaining miliseconds for @timer to expire, or zero
> > + * if the timer is no longer pending.
> > + */
> > +int64_t timer_deadline_ms(QEMUTimer *timer);
> > +
> >   /*
> >    * Low level clock functions
> >    */
> > diff --git a/util/qemu-timer.c b/util/qemu-timer.c
> > index 81c28af517..3a03a63daa 100644
> > --- a/util/qemu-timer.c
> > +++ b/util/qemu-timer.c
> > @@ -243,6 +243,19 @@ int64_t timerlist_deadline_ns(QEMUTimerList *timer_list)
> >       return delta;
> >   }
> > +/*
> > + * Returns the time remaining for the deadline, in ms.
> > + */
> > +int64_t timer_deadline_ms(QEMUTimer *timer)
> > +{
> > +    if (timer_pending(timer)) {
> > +        return qemu_timeout_ns_to_ms(timer->expire_time) -
> > +               qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL);
> > +    }
> > +
> > +    return 0;
> > +}
> > +
> >   /* Calculate the soonest deadline across all timerlists attached
> >    * to the clock. This is used for the icount timeout so we
> >    * ignore whether or not the clock should be used in deadline
> > 
> 

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]