From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91J-0006H3-Ik for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:32:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX91D-0005bB-G5 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:32:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48134) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91D-0005b7-A8 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:32:39 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D28B5C0567A1 for ; Tue, 9 Aug 2016 15:32:38 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:31:31 +0100 Message-Id: <1470756748-18933-4-git-send-email-berrange@redhat.com> In-Reply-To: <1470756748-18933-1-git-send-email-berrange@redhat.com> References: <1470756748-18933-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH for-2.8 v1 03/60] trace: move hw/mem/pc-dimm.c trace points into correct file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Daniel P. Berrange" The trace points for hw/mem/pc-dimm.c were mistakenly put in the hw/i386/trace-events file, instead of hw/mem/trace-events. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 1 + hw/i386/trace-events | 4 ---- hw/mem/trace-events | 5 +++++ 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 hw/mem/trace-events diff --git a/Makefile.objs b/Makefile.objs index 6d5ddcf..b371ebb 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -141,6 +141,7 @@ 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/mem/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/i386/trace-events b/hw/i386/trace-events index b4882c1..507f753 100644 --- a/hw/i386/trace-events +++ b/hw/i386/trace-events @@ -7,9 +7,5 @@ xen_platform_log(char *s) "xen platform: %s" 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 - # hw/i386/x86-iommu.c x86_iommu_iec_notify(bool global, uint32_t index, uint32_t mask) "Notify IEC invalidation: global=%d index=%" PRIu32 " mask=%" PRIu32 diff --git a/hw/mem/trace-events b/hw/mem/trace-events new file mode 100644 index 0000000..3a49215 --- /dev/null +++ b/hw/mem/trace-events @@ -0,0 +1,5 @@ +# See docs/trace-events.txt for syntax documentation. + +# hw/mem/pc-dimm.c +mhp_pc_dimm_assigned_slot(int slot) "0x%d" +mhp_pc_dimm_assigned_address(uint64_t addr) "0x%"PRIx64 -- 2.7.4