From 5eb76e480b42206d3640c1aab8a376ba350f70bb Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 16 Jun 2016 09:40:10 +0100 Subject: [PATCH] trace: split out trace events for hw/i386/ directory Move all trace-events for files in the hw/i386/ directory to their own file. Signed-off-by: Daniel P. Berrange Message-id: 1466066426-16657-25-git-send-email-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- Makefile.objs | 1 + hw/i386/trace-events | 12 ++++++++++++ trace-events | 11 ----------- 3 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 hw/i386/trace-events diff --git a/Makefile.objs b/Makefile.objs index 764e6fd285..e1f5cc62b0 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 0000000000..ea77bc24c3 --- /dev/null +++ b/hw/i386/trace-events @@ -0,0 +1,12 @@ +# See docs/trace-events.txt for syntax documentation. + +# 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 5cefe286ac..12be22601d 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" @@ -333,10 +330,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" @@ -474,10 +467,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.11.4.GIT