From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bB3Ie-00068l-AB for qemu-devel@nongnu.org; Thu, 09 Jun 2016 12:59:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bB3IX-00053M-73 for qemu-devel@nongnu.org; Thu, 09 Jun 2016 12:59:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39113) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bB3IW-00053E-Vb for qemu-devel@nongnu.org; Thu, 09 Jun 2016 12:59:13 -0400 From: "Daniel P. Berrange" Date: Thu, 9 Jun 2016 17:58:18 +0100 Message-Id: <1465491514-7365-25-git-send-email-berrange@redhat.com> In-Reply-To: <1465491514-7365-1-git-send-email-berrange@redhat.com> References: <1465491514-7365-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v1 24/40] trace: split out trace events for hw/i386/ directory List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Peter Maydell , "Daniel P. Berrange" Move all trace-events for files in the hw/i386/ directory to their own file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 1 + hw/i386/trace-events | 37 +++++++++++++++++++++++++++++++++++++ trace-events | 11 ----------- 3 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 hw/i386/trace-events diff --git a/Makefile.objs b/Makefile.objs index 764e6fd..e1f5cc6 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -141,3 +141,4 @@ trace-events-y += hw/dma/trace-events trace-events-y += hw/sparc/trace-events trace-events-y += hw/sd/trace-events trace-events-y += hw/isa/trace-events +trace-events-y += hw/i386/trace-events diff --git a/hw/i386/trace-events b/hw/i386/trace-events new file mode 100644 index 0000000..bd8c3a0 --- /dev/null +++ b/hw/i386/trace-events @@ -0,0 +1,37 @@ +# Trace events for debugging and performance instrumentation +# +# This file is processed by the tracetool script during the build. +# +# To add a new trace event: +# +# 1. Choose a name for the trace event. Declare its arguments and format +# string. +# +# 2. Call the trace event from code using trace_##name, e.g. multiwrite_cb() -> +# trace_multiwrite_cb(). The source file must #include "trace.h". +# +# Format of a trace event: +# +# [disable] ( [, ] ...) "" +# +# Example: g_malloc(size_t size) "size %zu" +# +# The "disable" keyword will build without the trace event. +# +# The must be a valid as a C function name. +# +# Types should be standard C types. Use void * for pointers because the trace +# system may not have the necessary headers included. +# +# The should be a sprintf()-compatible format string. + +# hw/i386/xen/xen_platform.c +xen_platform_log(char *s) "xen platform: %s" + +# hw/i386/xen/xen_pvdevice.c +xen_pv_mmio_read(uint64_t addr) "WARNING: read from Xen PV Device MMIO space (address %"PRIx64")" +xen_pv_mmio_write(uint64_t addr) "WARNING: write to Xen PV Device MMIO space (address %"PRIx64")" + +# hw/i386/pc.c +mhp_pc_dimm_assigned_slot(int slot) "0x%d" +mhp_pc_dimm_assigned_address(uint64_t addr) "0x%"PRIx64 diff --git a/trace-events b/trace-events index 8a4f05b..98313b1 100644 --- a/trace-events +++ b/trace-events @@ -82,9 +82,6 @@ xen_map_cache(uint64_t phys_addr) "want %#"PRIx64 xen_remap_bucket(uint64_t index) "index %#"PRIx64 xen_map_cache_return(void* ptr) "%p" -# hw/i386/xen/xen_platform.c -xen_platform_log(char *s) "xen platform: %s" - # qemu-coroutine.c qemu_coroutine_enter(void *from, void *to, void *opaque) "from %p to %p opaque %p" qemu_coroutine_yield(void *from, void *to) "from %p to %p" @@ -332,10 +329,6 @@ memory_region_tb_write(int cpu_index, uint64_t addr, uint64_t value, unsigned si object_dynamic_cast_assert(const char *type, const char *target, const char *file, int line, const char *func) "%s->%s (%s:%d:%s)" object_class_dynamic_cast_assert(const char *type, const char *target, const char *file, int line, const char *func) "%s->%s (%s:%d:%s)" -# hw/i386/xen/xen_pvdevice.c -xen_pv_mmio_read(uint64_t addr) "WARNING: read from Xen PV Device MMIO space (address %"PRIx64")" -xen_pv_mmio_write(uint64_t addr) "WARNING: write to Xen PV Device MMIO space (address %"PRIx64")" - # hw/pci/pci_host.c pci_cfg_read(const char *dev, unsigned devid, unsigned fnid, unsigned offs, unsigned val) "%s %02u:%u @0x%x -> 0x%x" pci_cfg_write(const char *dev, unsigned devid, unsigned fnid, unsigned offs, unsigned val) "%s %02u:%u @0x%x <- 0x%x" @@ -473,10 +466,6 @@ mhp_acpi_clear_remove_evt(uint32_t slot) "slot[0x%"PRIx32"] clear remove event" mhp_acpi_pc_dimm_deleted(uint32_t slot) "slot[0x%"PRIx32"] pc-dimm deleted" mhp_acpi_pc_dimm_delete_failed(uint32_t slot) "slot[0x%"PRIx32"] pc-dimm delete failed" -# hw/i386/pc.c -mhp_pc_dimm_assigned_slot(int slot) "0x%d" -mhp_pc_dimm_assigned_address(uint64_t addr) "0x%"PRIx64 - # target-s390x/kvm.c kvm_enable_cmma(int rc) "CMMA: enabling with result code %d" kvm_clear_cmma(int rc) "CMMA: clearing with result code %d" -- 2.5.5