SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull request

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJbEWBeAAoJEJykq7OBq3PI1sIIALG485dDBuZvku0m0K97v9u2
 sxVXzvou7Qbq9c0GOq52UBKduJwYlPlTIzMzvtSFHnl2DgrDqFcYv2hA29Mso6G1
 rC0lsbahngWYfdhqvwXK7N+Dc7/NN/CSENYqCeD0QG8ofvUy5XBHoBu1scynNoMK
 RRMITrXBOqlJuczNvAb5Kra1cW9/le8Qzp6xIqUv2chcUjSl2t4wLDikld7HOWA4
 vj6L8UNWl65HGX8+s7IsHpoHuI7OsfEkB4TFl2qNLQV7JOvLO571xYPWCS43nNZq
 TRD0SeB0EBFg4M4ZSZGWISjcHg2oYG9ChxJ/+lHSp5kpn6IcGBxPN+Q7WFHcY6k=
 =GbzI
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

Pull request

# gpg: Signature made Fri 01 Jun 2018 16:03:58 BST
# gpg:                using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace: Sort trace-events-subdirs

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-06-01 16:07:11 +01:00
commit ba7fccfffe
1 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
Makefile.objs
View File

@ -196,66 +196,66 @@ vhost-user-blk-obj-y = contrib/vhost-user-blk/
###################################################################### ######################################################################
trace-events-subdirs = trace-events-subdirs =
trace-events-subdirs += util trace-events-subdirs += accel/kvm
trace-events-subdirs += crypto trace-events-subdirs += accel/tcg
trace-events-subdirs += io trace-events-subdirs += audio
trace-events-subdirs += migration
trace-events-subdirs += block trace-events-subdirs += block
trace-events-subdirs += chardev trace-events-subdirs += chardev
trace-events-subdirs += crypto
trace-events-subdirs += hw/9pfs
trace-events-subdirs += hw/acpi
trace-events-subdirs += hw/alpha
trace-events-subdirs += hw/arm
trace-events-subdirs += hw/audio
trace-events-subdirs += hw/block trace-events-subdirs += hw/block
trace-events-subdirs += hw/block/dataplane trace-events-subdirs += hw/block/dataplane
trace-events-subdirs += hw/char trace-events-subdirs += hw/char
trace-events-subdirs += hw/intc
trace-events-subdirs += hw/net
trace-events-subdirs += hw/rdma
trace-events-subdirs += hw/rdma/vmw
trace-events-subdirs += hw/virtio
trace-events-subdirs += hw/audio
trace-events-subdirs += hw/misc
trace-events-subdirs += hw/misc/macio
trace-events-subdirs += hw/usb
trace-events-subdirs += hw/scsi
trace-events-subdirs += hw/nvram
trace-events-subdirs += hw/display trace-events-subdirs += hw/display
trace-events-subdirs += hw/input
trace-events-subdirs += hw/timer
trace-events-subdirs += hw/dma trace-events-subdirs += hw/dma
trace-events-subdirs += hw/sparc trace-events-subdirs += hw/hppa
trace-events-subdirs += hw/sparc64
trace-events-subdirs += hw/sd
trace-events-subdirs += hw/isa
trace-events-subdirs += hw/mem
trace-events-subdirs += hw/i386 trace-events-subdirs += hw/i386
trace-events-subdirs += hw/i386/xen trace-events-subdirs += hw/i386/xen
trace-events-subdirs += hw/9pfs trace-events-subdirs += hw/ide
trace-events-subdirs += hw/ppc trace-events-subdirs += hw/input
trace-events-subdirs += hw/intc
trace-events-subdirs += hw/isa
trace-events-subdirs += hw/mem
trace-events-subdirs += hw/misc
trace-events-subdirs += hw/misc/macio
trace-events-subdirs += hw/net
trace-events-subdirs += hw/nvram
trace-events-subdirs += hw/pci trace-events-subdirs += hw/pci
trace-events-subdirs += hw/pci-host trace-events-subdirs += hw/pci-host
trace-events-subdirs += hw/ppc
trace-events-subdirs += hw/rdma
trace-events-subdirs += hw/rdma/vmw
trace-events-subdirs += hw/s390x trace-events-subdirs += hw/s390x
trace-events-subdirs += hw/vfio trace-events-subdirs += hw/scsi
trace-events-subdirs += hw/acpi trace-events-subdirs += hw/sd
trace-events-subdirs += hw/arm trace-events-subdirs += hw/sparc
trace-events-subdirs += hw/alpha trace-events-subdirs += hw/sparc64
trace-events-subdirs += hw/hppa trace-events-subdirs += hw/timer
trace-events-subdirs += hw/xen
trace-events-subdirs += hw/ide
trace-events-subdirs += hw/tpm trace-events-subdirs += hw/tpm
trace-events-subdirs += ui trace-events-subdirs += hw/usb
trace-events-subdirs += audio trace-events-subdirs += hw/vfio
trace-events-subdirs += hw/virtio
trace-events-subdirs += hw/xen
trace-events-subdirs += io
trace-events-subdirs += linux-user
trace-events-subdirs += migration
trace-events-subdirs += nbd
trace-events-subdirs += net trace-events-subdirs += net
trace-events-subdirs += qapi
trace-events-subdirs += qom
trace-events-subdirs += scsi
trace-events-subdirs += target/arm trace-events-subdirs += target/arm
trace-events-subdirs += target/i386 trace-events-subdirs += target/i386
trace-events-subdirs += target/mips trace-events-subdirs += target/mips
trace-events-subdirs += target/sparc
trace-events-subdirs += target/s390x
trace-events-subdirs += target/ppc trace-events-subdirs += target/ppc
trace-events-subdirs += qom trace-events-subdirs += target/s390x
trace-events-subdirs += linux-user trace-events-subdirs += target/sparc
trace-events-subdirs += qapi trace-events-subdirs += ui
trace-events-subdirs += accel/tcg trace-events-subdirs += util
trace-events-subdirs += accel/kvm
trace-events-subdirs += nbd
trace-events-subdirs += scsi
trace-events-files = $(SRC_PATH)/trace-events $(trace-events-subdirs:%=$(SRC_PATH)/%/trace-events) trace-events-files = $(SRC_PATH)/trace-events $(trace-events-subdirs:%=$(SRC_PATH)/%/trace-events)