Re: [PATCH v6 01/42] nvme: rename trace events to nvme_dev

[Klaus Birkelund Jensen]

On Mar 25 12:36, Maxim Levitsky wrote:
> On Mon, 2020-03-16 at 07:28 -0700, Klaus Jensen wrote:
> > From: Klaus Jensen <address@hidden>
> > 
> > Change the prefix of all nvme device related trace events to 'nvme_dev'
> > to not clash with trace events from the nvme block driver.
> > 
> > Signed-off-by: Klaus Jensen <address@hidden>
> > Acked-by: Keith Busch <address@hidden>
> > Reviewed-by: Maxim Levitsky <address@hidden>
> > ---
> >  hw/block/nvme.c       | 188 +++++++++++++++++++++---------------------
> >  hw/block/trace-events | 172 +++++++++++++++++++-------------------
> >  2 files changed, 180 insertions(+), 180 deletions(-)
> > 
> > diff --git a/hw/block/nvme.c b/hw/block/nvme.c
> > index d28335cbf377..3e4b18956ed2 100644
> > --- a/hw/block/nvme.c
> > +++ b/hw/block/nvme.c
> > @@ -1035,32 +1035,32 @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr 
> > offset, uint64_t data,
> >      switch (offset) {
> >      case 0xc:   /* INTMS */
> >          if (unlikely(msix_enabled(&(n->parent_obj)))) {
> > -            NVME_GUEST_ERR(nvme_ub_mmiowr_intmask_with_msix,
> > +            NVME_GUEST_ERR(nvme_dev_ub_mmiowr_intmask_with_msix,
> >                             "undefined access to interrupt mask set"
> >                             " when MSI-X is enabled");
> >              /* should be ignored, fall through for now */
> >          }
> >          n->bar.intms |= data & 0xffffffff;
> >          n->bar.intmc = n->bar.intms;
> > -        trace_nvme_mmio_intm_set(data & 0xffffffff,
> > +        trace_nvme_dev_mmio_intm_set(data & 0xffffffff,
> >                                   n->bar.intmc);
> Indention.
> 

Fixed.

> >          nvme_irq_check(n);
> >          break;
> >      case 0x10:  /* INTMC */
> >          if (unlikely(msix_enabled(&(n->parent_obj)))) {
> > -            NVME_GUEST_ERR(nvme_ub_mmiowr_intmask_with_msix,
> > +            NVME_GUEST_ERR(nvme_dev_ub_mmiowr_intmask_with_msix,
> >                             "undefined access to interrupt mask clr"
> >                             " when MSI-X is enabled");
> >              /* should be ignored, fall through for now */
> >          }
> >          n->bar.intms &= ~(data & 0xffffffff);
> >          n->bar.intmc = n->bar.intms;
> > -        trace_nvme_mmio_intm_clr(data & 0xffffffff,
> > +        trace_nvme_dev_mmio_intm_clr(data & 0xffffffff,
> >                                   n->bar.intmc);
> Indention.
> 

Fixed.

> 
> 
> Other that indention nitpicks, no changes vs V5,
> so my reviewed-by kept correctly.
> 
> Best regards,
>       Maxim Levitsky
>