Commit 1aa85f46 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Tracing pull request

# gpg: Signature made Tue 01 Jul 2014 09:56:27 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: add qemu_system_powerdown_request and qemu_system_shutdown_request trace events

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8593efa4 bc78cff9

trace-events

+2 −0
Original line number Diff line number Diff line
@@ -511,6 +511,8 @@ 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) ""



# block/qcow2.c

qcow2_writev_start_req(void *co, int64_t sector, int nb_sectors) "co %p sector %" PRIx64 " nb_sectors %d"

vl.c

+2 −0
Original line number Diff line number Diff line
@@ -1921,6 +1921,7 @@ void qemu_system_killed(int signal, pid_t pid) 


void qemu_system_shutdown_request(void)

{

    trace_qemu_system_shutdown_request();

    shutdown_requested = 1;

    qemu_notify_event();

}
@@ -1933,6 +1934,7 @@ static void qemu_system_powerdown(void) 


void qemu_system_powerdown_request(void)

{

    trace_qemu_system_powerdown_request();

    powerdown_requested = 1;

    qemu_notify_event();

}