From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDSqt-0006g4-05 for qemu-devel@nongnu.org; Thu, 16 Jun 2016 04:40:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDSqn-0000zT-9o for qemu-devel@nongnu.org; Thu, 16 Jun 2016 04:40:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53718) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDSqm-0000ys-V4 for qemu-devel@nongnu.org; Thu, 16 Jun 2016 04:40:33 -0400 From: "Daniel P. Berrange" Date: Thu, 16 Jun 2016 09:39:46 +0100 Message-Id: <1466066426-16657-1-git-send-email-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 00/40] Split up the trace-events file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi , Eric Blake , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Gerd Hoffmann , "Daniel P. Berrange" This is a followup to: v1: https://lists.gnu.org/archive/html/qemu-devel/2016-06/msg02537.html To quote Peter: pm215: "trace-events: causing merge conflicts since 2010" There's really no good reason why we should continue to suffer from this. Even if the trace tool generator can't yet generate multiple independant output files, we can still trivially have multiple independant input files. This series splits up trace-events so that there is one trace-events file per sub-directory that has tracing events defined. This means that the trace-events files now get assoociated with the subsystem maintainers if you run get_maintainer.pl on a patch. It also means that responsibility for resolving conflicts is now delegated to subsystem maintainers, and overall such conflicts should be much rarer. Finally, we will likely need this kind of split work done when we do finally get the ability to generate multiple output files, so it is a worthwhile thing to change now regardless. Changed in v2: - Don't include docs header in all trace-events files (Llu=C3=ADs, Stefan) - Fix make install rule to use BUILD_DIR instead of SRC_PATH (Gerd) - Update docs/tracing.txt & qemu-options.hx (Stefan) - Install to /usr/share/qemu/trace-events-all so that filename to pass to simpletrace.py is the same both in tree & out of tree, to avoid confusion. Daniel P. Berrange (40): trace: add build framework for merging trace-events files trace: split out trace events for util/ directory trace: split out trace events for crypto/ directory trace: split out trace events for io/ directory trace: split out trace events for migration/ directory trace: split out trace events for block/ directory trace: split out trace events for hw/block/ directory trace: split out trace events for hw/char/ directory trace: split out trace events for hw/intc/ directory trace: split out trace events for hw/net/ directory trace: split out trace events for hw/virtio/ directory trace: split out trace events for hw/audio/ directory trace: split out trace events for hw/misc/ directory trace: split out trace events for hw/usb/ directory trace: split out trace events for hw/scsi/ directory trace: split out trace events for hw/nvram/ directory trace: split out trace events for hw/display/ directory trace: split out trace events for hw/input/ directory trace: split out trace events for hw/timer/ directory trace: split out trace events for hw/dma/ directory trace: split out trace events for hw/sparc/ directory trace: split out trace events for hw/sd/ directory trace: split out trace events for hw/isa/ directory trace: split out trace events for hw/i386/ directory trace: split out trace events for hw/9pfs/ directory trace: split out trace events for hw/ppc/ directory trace: split out trace events for hw/pci/ directory trace: split out trace events for hw/s390x/ directory trace: split out trace events for hw/vfio/ directory trace: split out trace events for hw/acpi/ directory trace: split out trace events for hw/arm/ directory trace: split out trace events for hw/alpha/ directory trace: split out trace events for ui/ directory trace: split out trace events for audio/ directory trace: split out trace events for net/ directory trace: split out trace events for target-sparc/ directory trace: split out trace events for target-s390x/ directory trace: split out trace events for target-ppc/ directory trace: split out trace events for qom/ directory trace: split out trace events for linux-user/ directory .gitignore | 1 + Makefile | 2 +- Makefile.objs | 43 + Makefile.target | 6 +- audio/trace-events | 17 + block/trace-events | 116 +++ crypto/trace-events | 19 + docs/tracing.txt | 32 +- hw/9pfs/trace-events | 47 ++ hw/acpi/trace-events | 18 + hw/alpha/trace-events | 4 + hw/arm/trace-events | 4 + hw/audio/trace-events | 19 + hw/block/trace-events | 17 + hw/char/trace-events | 49 ++ hw/display/trace-events | 122 +++ hw/dma/trace-events | 32 + hw/i386/trace-events | 12 + hw/input/trace-events | 25 + hw/intc/trace-events | 82 ++ hw/isa/trace-events | 9 + hw/misc/trace-events | 52 ++ hw/net/trace-events | 272 ++++++ hw/nvram/trace-events | 10 + hw/pci/trace-events | 9 + hw/ppc/trace-events | 39 + hw/s390x/trace-events | 15 + hw/scsi/trace-events | 204 +++++ hw/sd/trace-events | 5 + hw/sparc/trace-events | 11 + hw/timer/trace-events | 51 ++ hw/usb/trace-events | 268 ++++++ hw/vfio/trace-events | 116 +++ hw/virtio/trace-events | 16 + io/trace-events | 63 ++ linux-user/trace-events | 12 + migration/trace-events | 208 +++++ net/trace-events | 4 + qemu-options.hx | 8 +- qom/trace-events | 5 + target-ppc/trace-events | 5 + target-s390x/trace-events | 21 + target-sparc/trace-events | 28 + trace-events | 2029 ---------------------------------------= ------ trace/Makefile.objs | 25 +- ui/trace-events | 48 ++ util/trace-events | 13 + 47 files changed, 2151 insertions(+), 2062 deletions(-) create mode 100644 audio/trace-events create mode 100644 block/trace-events create mode 100644 crypto/trace-events create mode 100644 hw/9pfs/trace-events create mode 100644 hw/acpi/trace-events create mode 100644 hw/alpha/trace-events create mode 100644 hw/arm/trace-events create mode 100644 hw/audio/trace-events create mode 100644 hw/block/trace-events create mode 100644 hw/char/trace-events create mode 100644 hw/display/trace-events create mode 100644 hw/dma/trace-events create mode 100644 hw/i386/trace-events create mode 100644 hw/input/trace-events create mode 100644 hw/intc/trace-events create mode 100644 hw/isa/trace-events create mode 100644 hw/misc/trace-events create mode 100644 hw/net/trace-events create mode 100644 hw/nvram/trace-events create mode 100644 hw/pci/trace-events create mode 100644 hw/ppc/trace-events create mode 100644 hw/s390x/trace-events create mode 100644 hw/scsi/trace-events create mode 100644 hw/sd/trace-events create mode 100644 hw/sparc/trace-events create mode 100644 hw/timer/trace-events create mode 100644 hw/usb/trace-events create mode 100644 hw/vfio/trace-events create mode 100644 hw/virtio/trace-events create mode 100644 io/trace-events create mode 100644 linux-user/trace-events create mode 100644 migration/trace-events create mode 100644 net/trace-events create mode 100644 qom/trace-events create mode 100644 target-ppc/trace-events create mode 100644 target-s390x/trace-events create mode 100644 target-sparc/trace-events create mode 100644 ui/trace-events create mode 100644 util/trace-events --=20 2.5.5