On Wed, Sep 14, 2016 at 03:09:31PM -0500, Eric Blake wrote: > On 09/14/2016 01:48 PM, Laurent Vivier wrote: > > Signed-off-by: Laurent Vivier <lviv...@redhat.com> > > --- > > hw/scsi/spapr_vscsi.c | 89 > > +++++++++++++++++++++------------------------------ > > hw/scsi/trace-events | 27 ++++++++++++++++ > > 2 files changed, 63 insertions(+), 53 deletions(-) > > > > > +++ b/hw/scsi/trace-events > > @@ -202,3 +202,30 @@ esp_pci_dma_abort(uint32_t val) "ABORT (%.8x)" > > esp_pci_dma_start(uint32_t val) "START (%.8x)" > > esp_pci_sbac_read(uint32_t reg) "sbac: 0x%8.8x" > > esp_pci_sbac_write(uint32_t reg, uint32_t val) "sbac: 0x%8.8x -> 0x%8.8x" > > + > > +# hw/scsi/spapr_vscsi.c > > + > > +spapr_vscsi_send_rsp(uint8_t status, int32_t res_in, int32_t res_out) > > "status: 0x%x, res_in: %"PRId32", res_out: %"PRId32 > > Same as before.
I've removed these blank lines as I merged.
> > +spapr_vscsi_fetch_desc_no_data(void) "no data descriptor"
> > +spapr_vscsi_fetch_desc_direct(void) "direct segment"
> > +spapr_vscsi_fetch_desc_indirect(uint32_t qtag, unsigned desc, unsigned
> > local_desc) "indirect segment local tag=0x%"PRIx32" desc#%u/%u"
> > +spapr_vscsi_fetch_desc_out_of_range(unsigned desc, unsigned desc_offset)
> > "#%u is ouf of range (%u bytes)"
> > +spapr_vscsi_fetch_desc_dma_read_error(int rc) "spapr_vio_dma_read -> %d
> > reading ext_desc"
> > +spapr_vscsi_fetch_desc_indirect_seg_ext(uint32_t qtag, unsigned n,
> > unsigned desc, uint64_t va, uint32_t len) "indirect segment ext.
> > tag=0x%"PRIx32" desc#%u/%u { va=0x%"PRIx64" len=0x%"PRIx32" }"
> > +spapr_vscsi_fetch_desc_out_of_desc(void) "Out of descriptors !"
>
> Probably worth dropping the ' !' while touching this (first, English
> doesn't want space before !; second, ! usually means you are shouting at
> the user, and doesn't appear in many other traces as a result).
That's a good change, but I'd prefer to see it as a follow up patch.
--
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
signature.asc
Description: PGP signature
