diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2015-10-09 12:18:13 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2015-10-09 12:18:14 +0100 |
commit | b37686f7e84b22cfaf7fd01ac5133f2617cc3027 (patch) | |
tree | 61130f2388058912040c1b1972662f3aadbe5d8b /trace-events | |
parent | 8be6e623a28497d1dcd10547a573c9143ece525c (diff) | |
parent | 98cf48f60aa4999f5b2808569a193a401a390e6a (diff) |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Fri 09 Oct 2015 10:15:13 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/tracing-pull-request:
trace: remove malloc tracing
docs: update the usage example of "dtrace" backend in tracing.txt
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'trace-events')
-rw-r--r-- | trace-events | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/trace-events b/trace-events index 67902920e8..b813ae4c77 100644 --- a/trace-events +++ b/trace-events @@ -603,9 +603,6 @@ scsi_request_sense(int target, int lun, int tag) "target %d lun %d tag %d" vm_state_notify(int running, int reason) "running %d reason %d" load_file(const char *name, const char *path) "name %s location %s" runstate_set(int new_state) "new state %d" -g_malloc(size_t size, void *ptr) "size %zu ptr %p" -g_realloc(void *ptr, size_t size, void *newptr) "ptr %p size %zu newptr %p" -g_free(void *ptr) "ptr %p" system_wakeup_request(int reason) "reason=%d" qemu_system_shutdown_request(void) "" qemu_system_powerdown_request(void) "" |