[Qemu-devel] [PATCH v1 00/40] Split up the trace-events file

[Daniel P. Berrange]

To quote Peter today:

  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.

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        |   42 +
 block/trace-events        |  141 ++++
 crypto/trace-events       |   44 +
 hw/9pfs/trace-events      |   72 ++
 hw/acpi/trace-events      |   43 +
 hw/alpha/trace-events     |   29 +
 hw/arm/trace-events       |   29 +
 hw/audio/trace-events     |   44 +
 hw/block/trace-events     |   42 +
 hw/char/trace-events      |   74 ++
 hw/display/trace-events   |  147 ++++
 hw/dma/trace-events       |   57 ++
 hw/i386/trace-events      |   37 +
 hw/input/trace-events     |   50 ++
 hw/intc/trace-events      |  107 +++
 hw/isa/trace-events       |   34 +
 hw/misc/trace-events      |   77 ++
 hw/net/trace-events       |  297 +++++++
 hw/nvram/trace-events     |   35 +
 hw/pci/trace-events       |   34 +
 hw/ppc/trace-events       |   64 ++
 hw/s390x/trace-events     |   39 +
 hw/scsi/trace-events      |  229 +++++
 hw/sd/trace-events        |   30 +
 hw/sparc/trace-events     |   36 +
 hw/timer/trace-events     |   76 ++
 hw/usb/trace-events       |  293 +++++++
 hw/vfio/trace-events      |  141 ++++
 hw/virtio/trace-events    |   41 +
 io/trace-events           |   88 ++
 linux-user/trace-events   |   37 +
 migration/trace-events    |  233 ++++++
 net/trace-events          |   29 +
 qom/trace-events          |   30 +
 target-ppc/trace-events   |   30 +
 target-s390x/trace-events |   46 +
 target-sparc/trace-events |   53 ++
 trace-events              | 2028 ---------------------------------------------
 trace/Makefile.objs       |   25 +-
 ui/trace-events           |   73 ++
 util/trace-events         |   38 +
 45 files changed, 3103 insertions(+), 2043 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

-- 
2.5.5