From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Eric Blake" <eblake@redhat.com>,
"Lluís Vilanova" <vilanova@ac.upc.edu>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Daniel P. Berrange" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH v2 26/40] trace: split out trace events for hw/ppc/ directory
Date: Thu, 16 Jun 2016 09:40:12 +0100 [thread overview]
Message-ID: <1466066426-16657-27-git-send-email-berrange@redhat.com> (raw)
In-Reply-To: <1466066426-16657-1-git-send-email-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>
---
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"
--
2.5.5
next prev parent reply other threads:[~2016-06-16 8:41 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-16 8:39 [Qemu-devel] [PATCH v2 00/40] Split up the trace-events file Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 01/40] trace: add build framework for merging trace-events files Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 02/40] trace: split out trace events for util/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 03/40] trace: split out trace events for crypto/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 04/40] trace: split out trace events for io/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 05/40] trace: split out trace events for migration/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 06/40] trace: split out trace events for block/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 07/40] trace: split out trace events for hw/block/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 08/40] trace: split out trace events for hw/char/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 09/40] trace: split out trace events for hw/intc/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 10/40] trace: split out trace events for hw/net/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 11/40] trace: split out trace events for hw/virtio/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 12/40] trace: split out trace events for hw/audio/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 13/40] trace: split out trace events for hw/misc/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 14/40] trace: split out trace events for hw/usb/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 15/40] trace: split out trace events for hw/scsi/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 16/40] trace: split out trace events for hw/nvram/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 17/40] trace: split out trace events for hw/display/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 18/40] trace: split out trace events for hw/input/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 19/40] trace: split out trace events for hw/timer/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 20/40] trace: split out trace events for hw/dma/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 21/40] trace: split out trace events for hw/sparc/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 22/40] trace: split out trace events for hw/sd/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 23/40] trace: split out trace events for hw/isa/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 24/40] trace: split out trace events for hw/i386/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 25/40] trace: split out trace events for hw/9pfs/ directory Daniel P. Berrange
2016-06-16 8:40 ` Daniel P. Berrange [this message]
2016-06-16 9:49 ` [Qemu-devel] [PATCH v2 26/40] trace: split out trace events for hw/ppc/ directory Thomas Huth
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 27/40] trace: split out trace events for hw/pci/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 28/40] trace: split out trace events for hw/s390x/ directory Daniel P. Berrange
2016-06-16 9:57 ` Cornelia Huck
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 29/40] trace: split out trace events for hw/vfio/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 30/40] trace: split out trace events for hw/acpi/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 31/40] trace: split out trace events for hw/arm/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 32/40] trace: split out trace events for hw/alpha/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 33/40] trace: split out trace events for ui/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 34/40] trace: split out trace events for audio/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 35/40] trace: split out trace events for net/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 36/40] trace: split out trace events for target-sparc/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 37/40] trace: split out trace events for target-s390x/ directory Daniel P. Berrange
2016-06-16 9:58 ` Cornelia Huck
2016-06-17 13:29 ` Stefan Hajnoczi
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 38/40] trace: split out trace events for target-ppc/ directory Daniel P. Berrange
2016-06-16 9:51 ` Thomas Huth
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 39/40] trace: split out trace events for qom/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 40/40] trace: split out trace events for linux-user/ directory Daniel P. Berrange
2016-06-16 12:51 ` Laurent Vivier
2016-06-16 13:00 ` [Qemu-devel] [PATCH v2 00/40] Split up the trace-events file Peter Maydell
2016-06-16 13:07 ` Daniel P. Berrange
2016-06-17 13:30 ` 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=1466066426-16657-27-git-send-email-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=eblake@redhat.com \
--cc=kraxel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=vilanova@ac.upc.edu \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.