On 16.06.2016 10:40, Daniel P. Berrange wrote: > Move all trace-events for files in the hw/ppc/ directory to > their own file. > > Signed-off-by: Daniel P. Berrange <berra...@redhat.com> > --- > Makefile.objs | 1 + > hw/ppc/trace-events | 39 +++++++++++++++++++++++++++++++++++++++ > trace-events | 38 -------------------------------------- > 3 files changed, 40 insertions(+), 38 deletions(-) > create mode 100644 hw/ppc/trace-events > > diff --git a/Makefile.objs b/Makefile.objs > index 82bef4d..388e2e9 100644 > --- a/Makefile.objs > +++ b/Makefile.objs > @@ -143,3 +143,4 @@ trace-events-y += hw/sd/trace-events > trace-events-y += hw/isa/trace-events > trace-events-y += hw/i386/trace-events > trace-events-y += hw/9pfs/trace-events > +trace-events-y += hw/ppc/trace-events > diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events > new file mode 100644 > index 0000000..6da7135 > --- /dev/null > +++ b/hw/ppc/trace-events > @@ -0,0 +1,39 @@ > +# See docs/trace-events.txt for syntax documentation. > + > +# hw/ppc/spapr_pci.c > +spapr_pci_msi(const char *msg, uint32_t ca) "%s (cfg=%x)" > +spapr_pci_msi_setup(const char *name, unsigned vector, uint64_t addr) > "dev\"%s\" vector %u, addr=%"PRIx64 > +spapr_pci_rtas_ibm_change_msi(unsigned cfg, unsigned func, unsigned req, > unsigned first) "cfgaddr %x func %u, requested %u, first irq %u" > +spapr_pci_rtas_ibm_query_interrupt_source_number(unsigned ioa, unsigned > intr) "queries for #%u, IRQ%u" > +spapr_pci_msi_write(uint64_t addr, uint64_t data, uint32_t dt_irq) > "@%"PRIx64"<=%"PRIx64" IRQ %u" > +spapr_pci_lsi_set(const char *busname, int pin, uint32_t irq) "%s PIN%d IRQ > %u" > +spapr_pci_msi_retry(unsigned config_addr, unsigned req_num, unsigned > max_irqs) "Guest device at %x asked %u, have only %u" > + > +# hw/ppc/spapr.c > +spapr_cas_failed(unsigned long n) "DT diff buffer is too small: %ld bytes" > +spapr_cas_continue(unsigned long n) "Copy changes to the guest: %ld bytes" > + > +# hw/ppc/spapr_hcall.c > +spapr_cas_pvr_try(uint32_t pvr) "%x" > +spapr_cas_pvr(uint32_t cur_pvr, bool cpu_match, uint32_t new_pvr, uint64_t > pcr) "current=%x, cpu_match=%u, new=%x, compat flags=%"PRIx64 > + > +# hw/ppc/spapr_iommu.c > +spapr_iommu_put(uint64_t liobn, uint64_t ioba, uint64_t tce, uint64_t ret) > "liobn=%"PRIx64" ioba=0x%"PRIx64" tce=0x%"PRIx64" ret=%"PRId64 > +spapr_iommu_get(uint64_t liobn, uint64_t ioba, uint64_t ret, uint64_t tce) > "liobn=%"PRIx64" ioba=0x%"PRIx64" ret=%"PRId64" tce=0x%"PRIx64 > +spapr_iommu_indirect(uint64_t liobn, uint64_t ioba, uint64_t tce, uint64_t > iobaN, uint64_t tceN, uint64_t ret) "liobn=%"PRIx64" ioba=0x%"PRIx64" > tcelist=0x%"PRIx64" iobaN=0x%"PRIx64" tceN=0x%"PRIx64" ret=%"PRId64 > +spapr_iommu_stuff(uint64_t liobn, uint64_t ioba, uint64_t tce_value, > uint64_t npages, uint64_t ret) "liobn=%"PRIx64" ioba=0x%"PRIx64" > tcevalue=0x%"PRIx64" npages=%"PRId64" ret=%"PRId64 > +spapr_iommu_pci_put(uint64_t liobn, uint64_t ioba, uint64_t tce, uint64_t > ret) "liobn=%"PRIx64" ioba=0x%"PRIx64" tce=0x%"PRIx64" ret=%"PRId64 > +spapr_iommu_pci_get(uint64_t liobn, uint64_t ioba, uint64_t ret, uint64_t > tce) "liobn=%"PRIx64" ioba=0x%"PRIx64" ret=%"PRId64" tce=0x%"PRIx64 > +spapr_iommu_pci_indirect(uint64_t liobn, uint64_t ioba, uint64_t tce, > uint64_t iobaN, uint64_t tceN, uint64_t ret) "liobn=%"PRIx64" > ioba=0x%"PRIx64" tcelist=0x%"PRIx64" iobaN=0x%"PRIx64" tceN=0x%"PRIx64" > ret=%"PRId64 > +spapr_iommu_pci_stuff(uint64_t liobn, uint64_t ioba, uint64_t tce_value, > uint64_t npages, uint64_t ret) "liobn=%"PRIx64" ioba=0x%"PRIx64" > tcevalue=0x%"PRIx64" npages=%"PRId64" ret=%"PRId64 > +spapr_iommu_xlate(uint64_t liobn, uint64_t ioba, uint64_t tce, unsigned > perm, unsigned pgsize) "liobn=%"PRIx64" 0x%"PRIx64" -> 0x%"PRIx64" perm=%u > mask=%x" > +spapr_iommu_new_table(uint64_t liobn, void *table, int fd) "liobn=%"PRIx64" > table=%p fd=%d" > +spapr_iommu_pre_save(uint64_t liobn, uint32_t nb, uint64_t offs, uint32_t > ps) "liobn=%"PRIx64" %"PRIx32" bus_offset=%"PRIx64" ps=%"PRIu32 > +spapr_iommu_post_load(uint64_t liobn, uint32_t pre_nb, uint32_t post_nb, > uint64_t offs, uint32_t ps) "liobn=%"PRIx64" %"PRIx32" => %"PRIx32" > bus_offset=%"PRIx64" ps=%"PRIu32 > + > +# hw/ppc/ppc.c > +ppc_tb_adjust(uint64_t offs1, uint64_t offs2, int64_t diff, int64_t seconds) > "adjusted from 0x%"PRIx64" to 0x%"PRIx64", diff %"PRId64" (%"PRId64"s)" > + > +# hw/ppc/prep.c > +prep_io_800_writeb(uint32_t addr, uint32_t val) "0x%08" PRIx32 " => 0x%02" > PRIx32 > +prep_io_800_readb(uint32_t addr, uint32_t retval) "0x%08" PRIx32 " <= 0x%02" > PRIx32 > diff --git a/trace-events b/trace-events > index 44956ec..a727158 100644 > --- a/trace-events > +++ b/trace-events > @@ -184,48 +184,10 @@ qemu_spice_destroy_primary_surface(int qid, uint32_t > sid, int async) "%d sid=%u > qemu_spice_wakeup(uint32_t qid) "%d" > qemu_spice_create_update(uint32_t left, uint32_t right, uint32_t top, > uint32_t bottom) "lr %d -> %d, tb -> %d -> %d" > > -# hw/ppc/spapr_pci.c > -spapr_pci_msi(const char *msg, uint32_t ca) "%s (cfg=%x)" > -spapr_pci_msi_setup(const char *name, unsigned vector, uint64_t addr) > "dev\"%s\" vector %u, addr=%"PRIx64 > -spapr_pci_rtas_ibm_change_msi(unsigned cfg, unsigned func, unsigned req, > unsigned first) "cfgaddr %x func %u, requested %u, first irq %u" > -spapr_pci_rtas_ibm_query_interrupt_source_number(unsigned ioa, unsigned > intr) "queries for #%u, IRQ%u" > -spapr_pci_msi_write(uint64_t addr, uint64_t data, uint32_t dt_irq) > "@%"PRIx64"<=%"PRIx64" IRQ %u" > -spapr_pci_lsi_set(const char *busname, int pin, uint32_t irq) "%s PIN%d IRQ > %u" > -spapr_pci_msi_retry(unsigned config_addr, unsigned req_num, unsigned > max_irqs) "Guest device at %x asked %u, have only %u" > - > # hw/pci/pci.c > pci_update_mappings_del(void *d, uint32_t bus, uint32_t slot, uint32_t func, > int bar, uint64_t addr, uint64_t size) "d=%p %02x:%02x.%x > %d,%#"PRIx64"+%#"PRIx64 > pci_update_mappings_add(void *d, uint32_t bus, uint32_t slot, uint32_t func, > int bar, uint64_t addr, uint64_t size) "d=%p %02x:%02x.%x > %d,%#"PRIx64"+%#"PRIx64 > > -# hw/ppc/spapr.c > -spapr_cas_failed(unsigned long n) "DT diff buffer is too small: %ld bytes" > -spapr_cas_continue(unsigned long n) "Copy changes to the guest: %ld bytes" > - > -# hw/ppc/spapr_hcall.c > -spapr_cas_pvr_try(uint32_t pvr) "%x" > -spapr_cas_pvr(uint32_t cur_pvr, bool cpu_match, uint32_t new_pvr, uint64_t > pcr) "current=%x, cpu_match=%u, new=%x, compat flags=%"PRIx64 > - > -# hw/ppc/spapr_iommu.c > -spapr_iommu_put(uint64_t liobn, uint64_t ioba, uint64_t tce, uint64_t ret) > "liobn=%"PRIx64" ioba=0x%"PRIx64" tce=0x%"PRIx64" ret=%"PRId64 > -spapr_iommu_get(uint64_t liobn, uint64_t ioba, uint64_t ret, uint64_t tce) > "liobn=%"PRIx64" ioba=0x%"PRIx64" ret=%"PRId64" tce=0x%"PRIx64 > -spapr_iommu_indirect(uint64_t liobn, uint64_t ioba, uint64_t tce, uint64_t > iobaN, uint64_t tceN, uint64_t ret) "liobn=%"PRIx64" ioba=0x%"PRIx64" > tcelist=0x%"PRIx64" iobaN=0x%"PRIx64" tceN=0x%"PRIx64" ret=%"PRId64 > -spapr_iommu_stuff(uint64_t liobn, uint64_t ioba, uint64_t tce_value, > uint64_t npages, uint64_t ret) "liobn=%"PRIx64" ioba=0x%"PRIx64" > tcevalue=0x%"PRIx64" npages=%"PRId64" ret=%"PRId64 > -spapr_iommu_pci_put(uint64_t liobn, uint64_t ioba, uint64_t tce, uint64_t > ret) "liobn=%"PRIx64" ioba=0x%"PRIx64" tce=0x%"PRIx64" ret=%"PRId64 > -spapr_iommu_pci_get(uint64_t liobn, uint64_t ioba, uint64_t ret, uint64_t > tce) "liobn=%"PRIx64" ioba=0x%"PRIx64" ret=%"PRId64" tce=0x%"PRIx64 > -spapr_iommu_pci_indirect(uint64_t liobn, uint64_t ioba, uint64_t tce, > uint64_t iobaN, uint64_t tceN, uint64_t ret) "liobn=%"PRIx64" > ioba=0x%"PRIx64" tcelist=0x%"PRIx64" iobaN=0x%"PRIx64" tceN=0x%"PRIx64" > ret=%"PRId64 > -spapr_iommu_pci_stuff(uint64_t liobn, uint64_t ioba, uint64_t tce_value, > uint64_t npages, uint64_t ret) "liobn=%"PRIx64" ioba=0x%"PRIx64" > tcevalue=0x%"PRIx64" npages=%"PRId64" ret=%"PRId64 > -spapr_iommu_xlate(uint64_t liobn, uint64_t ioba, uint64_t tce, unsigned > perm, unsigned pgsize) "liobn=%"PRIx64" 0x%"PRIx64" -> 0x%"PRIx64" perm=%u > mask=%x" > -spapr_iommu_new_table(uint64_t liobn, void *table, int fd) "liobn=%"PRIx64" > table=%p fd=%d" > -spapr_iommu_pre_save(uint64_t liobn, uint32_t nb, uint64_t offs, uint32_t > ps) "liobn=%"PRIx64" %"PRIx32" bus_offset=%"PRIx64" ps=%"PRIu32 > -spapr_iommu_post_load(uint64_t liobn, uint32_t pre_nb, uint32_t post_nb, > uint64_t offs, uint32_t ps) "liobn=%"PRIx64" %"PRIx32" => %"PRIx32" > bus_offset=%"PRIx64" ps=%"PRIu32 > - > -# hw/ppc/ppc.c > -ppc_tb_adjust(uint64_t offs1, uint64_t offs2, int64_t diff, int64_t seconds) > "adjusted from 0x%"PRIx64" to 0x%"PRIx64", diff %"PRId64" (%"PRId64"s)" > - > -# hw/ppc/prep.c > -prep_io_800_writeb(uint32_t addr, uint32_t val) "0x%08" PRIx32 " => 0x%02" > PRIx32 > -prep_io_800_readb(uint32_t addr, uint32_t retval) "0x%08" PRIx32 " <= 0x%02" > PRIx32 > - > # target-s390x/mmu_helper.c > get_skeys_nonzero(int rc) "SKEY: Call to get_skeys unexpectedly returned %d" > set_skeys_nonzero(int rc) "SKEY: Call to set_skeys unexpectedly returned %d" >
Looks sane. Reviewed-by: Thomas Huth <th...@redhat.com>
