diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-29 00:34:20 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-29 00:34:20 +0100 |
| commit | cc9a366d3b161d255fcf25aad30e0c8fcc766013 (patch) | |
| tree | 1d11db4580c10d5cd3ab3468746030cbe07bd005 /Makefile.objs | |
| parent | c640f2849ee8775fe1bbd7a2772610aa77816f9f (diff) | |
| parent | 43e21e4907a009d87f6aef44663d9e1f7b181b8d (diff) | |
| download | qemu-cc9a366d3b161d255fcf25aad30e0c8fcc766013.zip qemu-cc9a366d3b161d255fcf25aad30e0c8fcc766013.tar.gz qemu-cc9a366d3b161d255fcf25aad30e0c8fcc766013.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Wed 28 Sep 2016 22:30:45 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# 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: Document the execution mode of guest events
trace: Add event "guest_cpu_reset"
trace: Add event "guest_cpu_enter"
trace: Properly initialize dynamic event states in hot-plugged vCPUs
trace: move hw/virtio/virtio-balloon.c trace points into correct file
trace: move hw/mem/pc-dimm.c trace points into correct file
trace: move util/qemu-coroutine*.c trace points into correct file
trace: move util/buffer.c trace points into correct file
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.objs b/Makefile.objs index a8e0224..02fb8e7 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -142,6 +142,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 |