[libvirt] [PULL v2 05/43] hw/timer/sun4v-rtc: Convert from DPRINTF() macro to trace events

[Eduardo Habkost]

On Thu, Oct 25, 2018 at 06:17:59PM +0100, David Gibson wrote:
> On Thu, Oct 25, 2018 at 10:32:23AM -0300, Eduardo Habkost wrote:
> > From: Philippe Mathieu-Daudé <f4bug at amsat.org>
> > 
> > Signed-off-by: Philippe Mathieu-Daudé <f4bug at amsat.org>
> > Reviewed-by: Artyom Tarasenko <atar4qemu at gmail.com>
> > Reviewed-by: Cédric Le Goater <clg at kaod.org>
> > Message-Id: <20181002212522.23303-3-f4bug at amsat.org>
> > Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
> > ---
> >  hw/timer/sun4v-rtc.c  | 13 +++----------
> >  hw/timer/trace-events |  4 ++++
> >  2 files changed, 7 insertions(+), 10 deletions(-)
> > 
> > diff --git a/hw/timer/sun4v-rtc.c b/hw/timer/sun4v-rtc.c
> > index 310523225f..13be94f8da 100644
> > --- a/hw/timer/sun4v-rtc.c
> > +++ b/hw/timer/sun4v-rtc.c
> > @@ -14,15 +14,8 @@
> >  #include "hw/sysbus.h"
> >  #include "qemu/timer.h"
> >  #include "hw/timer/sun4v-rtc.h"
> > +#include "trace.h"
> >  
> > -//#define DEBUG_SUN4V_RTC
> > -
> > -#ifdef DEBUG_SUN4V_RTC
> > -#define DPRINTF(fmt, ...)                                       \
> > -    do { printf("sun4v_rtc: " fmt , ## __VA_ARGS__); } while (0)
> > -#else
> > -#define DPRINTF(fmt, ...) do {} while (0)
> > -#endif
> >  
> >  #define TYPE_SUN4V_RTC "sun4v_rtc"
> >  #define SUN4V_RTC(obj) OBJECT_CHECK(Sun4vRtc, (obj), TYPE_SUN4V_RTC)
> > @@ -41,14 +34,14 @@ static uint64_t sun4v_rtc_read(void *opaque, hwaddr addr,
> >          /* accessing the high 32 bits */
> >          val >>= 32;
> >      }
> > -    DPRINTF("read from " TARGET_FMT_plx " val %lx\n", addr, val);
> > +    trace_sun4v_rtc_read(addr, val);
> >      return val;
> >  }
> >  
> >  static void sun4v_rtc_write(void *opaque, hwaddr addr,
> >                               uint64_t val, unsigned size)
> >  {
> > -    DPRINTF("write 0x%x to " TARGET_FMT_plx "\n", (unsigned)val, addr);
> > +    trace_sun4v_rtc_read(addr, val);
> 
> Uh.. as in v1, it looks like this should be trace_sun4v_rtc_write().

Oops, my bad.  I can fix this manually in case there's a v3 pull
request, but I would really prefer that to be included in a
follow up patch instead of making this block the entire pull
request.

-- 
Eduardo