Commit dec97760 authored Mar 14, 2019 by Markus Armbruster Committed by Stefan Hajnoczi Mar 22, 2019

trace-events: Fix attribution of trace points to source



Some trace points are attributed to the wrong source file.  Happens
when we neglect to update trace-events for code motion, or add events
in the wrong place, or misspell the file name.

Clean up with help of cleanup-trace-events.pl.  Same funnies as in the
previous commit, of course.  Manually shorten its change to
linux-user/trace-events to */signal.c.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 20190314180929.27722-6-armbru@redhat.com
Message-Id: <20190314180929.27722-6-armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

parent a9779a3a

authz/trace-events

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,5 +14,5 @@ qauthz_list_default_policy(void authz, const char identity, int policy) "AuthZ
		qauthz_list_file_load(void authz, const char filename) "AuthZ file %p load filename=%s"
		qauthz_list_file_refresh(void authz, const char filename, int success) "AuthZ file %p load filename=%s success=%d"

		# pam.c
		# pamacct.c
		qauthz_pam_check(void authz, const char identity, const char *service) "AuthZ PAM %p identity=%s service=%s"

hw/9pfs/trace-events

+1 −1

Original line number	Diff line number	Diff line
		# See docs/devel/tracing.txt for syntax documentation.

		# virtio-9p.c
		# 9p.c
		v9fs_rcancel(uint16_t tag, uint8_t id) "tag %d id %d"
		v9fs_rerror(uint16_t tag, uint8_t id, int err) "tag %d id %d err %d"
		v9fs_version(uint16_t tag, uint8_t id, int32_t msize, char* version) "tag %d id %d msize %d version %s"

hw/arm/trace-events

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,8 +10,6 @@ smmu_ptw_invalid_pte(int stage, int level, uint64_t baseaddr, uint64_t pteaddr,
		smmu_ptw_page_pte(int stage, int level, uint64_t iova, uint64_t baseaddr, uint64_t pteaddr, uint64_t pte, uint64_t address) "stage=%d level=%d iova=0x%"PRIx64" base@=0x%"PRIx64" pte@=0x%"PRIx64" pte=0x%"PRIx64" page address = 0x%"PRIx64
		smmu_ptw_block_pte(int stage, int level, uint64_t baseaddr, uint64_t pteaddr, uint64_t pte, uint64_t iova, uint64_t gpa, int bsize_mb) "stage=%d level=%d base@=0x%"PRIx64" pte@=0x%"PRIx64" pte=0x%"PRIx64" iova=0x%"PRIx64" block address = 0x%"PRIx64" block size = %d MiB"
		smmu_get_pte(uint64_t baseaddr, int index, uint64_t pteaddr, uint64_t pte) "baseaddr=0x%"PRIx64" index=0x%x, pteaddr=0x%"PRIx64", pte=0x%"PRIx64
		smmu_iotlb_cache_hit(uint16_t asid, uint64_t addr, uint32_t hit, uint32_t miss, uint32_t p) "IOTLB cache HIT asid=%d addr=0x%"PRIx64" hit=%d miss=%d hit rate=%d"
		smmu_iotlb_cache_miss(uint16_t asid, uint64_t addr, uint32_t hit, uint32_t miss, uint32_t p) "IOTLB cache MISS asid=%d addr=0x%"PRIx64" hit=%d miss=%d hit rate=%d"
		smmu_iotlb_inv_all(void) "IOTLB invalidate all"
		smmu_iotlb_inv_asid(uint16_t asid) "IOTLB invalidate asid=%d"
		smmu_iotlb_inv_iova(uint16_t asid, uint64_t addr) "IOTLB invalidate asid=%d addr=0x%"PRIx64
		@@ -48,6 +46,8 @@ smmuv3_cmdq_tlbi_nh_va(int vmid, int asid, uint64_t addr, bool leaf) "vmid =%d a
		smmuv3_cmdq_tlbi_nh_vaa(int vmid, uint64_t addr) "vmid =%d addr=0x%"PRIx64
		smmuv3_cmdq_tlbi_nh(void) ""
		smmuv3_cmdq_tlbi_nh_asid(uint16_t asid) "asid=%d"
		smmu_iotlb_cache_hit(uint16_t asid, uint64_t addr, uint32_t hit, uint32_t miss, uint32_t p) "IOTLB cache HIT asid=%d addr=0x%"PRIx64" hit=%d miss=%d hit rate=%d"
		smmu_iotlb_cache_miss(uint16_t asid, uint64_t addr, uint32_t hit, uint32_t miss, uint32_t p) "IOTLB cache MISS asid=%d addr=0x%"PRIx64" hit=%d miss=%d hit rate=%d"
		smmuv3_config_cache_inv(uint32_t sid) "Config cache INV for sid %d"
		smmuv3_notify_flag_add(const char *iommu) "ADD SMMUNotifier node for iommu mr=%s"
		smmuv3_notify_flag_del(const char *iommu) "DEL SMMUNotifier node for iommu mr=%s"

hw/block/trace-events

+2 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,8 @@
		fdc_ioport_read(uint8_t reg, uint8_t value) "read reg 0x%02x val 0x%02x"
		fdc_ioport_write(uint8_t reg, uint8_t value) "write reg 0x%02x val 0x%02x"

		# pflash_cfi0?.c
		# pflash_cfi02.c
		# pflash_cfi01.c
		pflash_reset(void) "reset"
		pflash_read(uint64_t offset, uint8_t cmd, int width, uint8_t wcycle) "offset:0x%04"PRIx64" cmd:0x%02x width:%d wcycle:%u"
		pflash_write(uint64_t offset, uint32_t value, int width, uint8_t wcycle) "offset:0x%04"PRIx64" value:0x%03x width:%d wcycle:%u"

hw/char/trace-events

+1 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ pl011_can_receive(uint32_t lcr, int read_count, int r) "LCR 0x%08x read_count %d
		pl011_put_fifo(uint32_t c, int read_count) "new char 0x%x read_count now %d"
		pl011_put_fifo_full(void) "FIFO now full, RXFF set"

		# cmsdk_apb_uart.c
		# cmsdk-apb-uart.c
		cmsdk_apb_uart_read(uint64_t offset, uint64_t data, unsigned size) "CMSDK APB UART read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u"
		cmsdk_apb_uart_write(uint64_t offset, uint64_t data, unsigned size) "CMSDK APB UART write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u"
		cmsdk_apb_uart_reset(void) "CMSDK APB UART: reset"