From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
"Daniel P. Berrange" <berrange@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PULL 28/42] trace: split out trace events for hw/ppc/ directory
Date: Fri, 17 Jun 2016 16:59:39 +0100 [thread overview]
Message-ID: <1466179193-11232-29-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1466179193-11232-1-git-send-email-stefanha@redhat.com>
From: "Daniel P. Berrange" <berrange@redhat.com>
Move all trace-events for files in the hw/ppc/ directory to
their own file.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 1466066426-16657-27-git-send-email-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@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 daa4f33..607c9a7 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"
--
2.5.5
next prev parent reply other threads:[~2016-06-17 16:01 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-17 15:59 [Qemu-devel] [PULL 00/42] Tracing patches Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 01/42] exec: [tcg] Track which vCPU is performing translation and execution Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 02/42] trace: [all] Add "guest_mem_before" event Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 03/42] trace: add build framework for merging trace-events files Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 04/42] trace: split out trace events for util/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 05/42] trace: split out trace events for crypto/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 06/42] trace: split out trace events for io/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 07/42] trace: split out trace events for migration/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 08/42] trace: split out trace events for block/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 09/42] trace: split out trace events for hw/block/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 10/42] trace: split out trace events for hw/char/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 11/42] trace: split out trace events for hw/intc/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 12/42] trace: split out trace events for hw/net/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 13/42] trace: split out trace events for hw/virtio/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 14/42] trace: split out trace events for hw/audio/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 15/42] trace: split out trace events for hw/misc/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 16/42] trace: split out trace events for hw/usb/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 17/42] trace: split out trace events for hw/scsi/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 18/42] trace: split out trace events for hw/nvram/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 19/42] trace: split out trace events for hw/display/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 20/42] trace: split out trace events for hw/input/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 21/42] trace: split out trace events for hw/timer/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 22/42] trace: split out trace events for hw/dma/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 23/42] trace: split out trace events for hw/sparc/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 24/42] trace: split out trace events for hw/sd/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 25/42] trace: split out trace events for hw/isa/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 26/42] trace: split out trace events for hw/i386/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 27/42] trace: split out trace events for hw/9pfs/ directory Stefan Hajnoczi
2016-06-17 15:59 ` Stefan Hajnoczi [this message]
2016-06-17 15:59 ` [Qemu-devel] [PULL 29/42] trace: split out trace events for hw/pci/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 30/42] trace: split out trace events for hw/s390x/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 31/42] trace: split out trace events for hw/vfio/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 32/42] trace: split out trace events for hw/acpi/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 33/42] trace: split out trace events for hw/arm/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 34/42] trace: split out trace events for hw/alpha/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 35/42] trace: split out trace events for ui/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 36/42] trace: split out trace events for audio/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 37/42] trace: split out trace events for net/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 38/42] trace: split out trace events for target-sparc/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 39/42] trace: split out trace events for target-s390x/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 40/42] trace: split out trace events for target-ppc/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 41/42] trace: split out trace events for qom/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 42/42] trace: split out trace events for linux-user/ directory Stefan Hajnoczi
2016-06-20 8:45 ` [Qemu-devel] [PULL 00/42] Tracing patches Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2016-06-20 20:29 Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 28/42] trace: split out trace events for hw/ppc/ directory Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1466179193-11232-29-git-send-email-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=berrange@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).