aboutsummaryrefslogtreecommitdiff
path: root/bsd-user
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-09-29 00:34:20 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-09-29 00:34:20 +0100
commitcc9a366d3b161d255fcf25aad30e0c8fcc766013 (patch)
tree1d11db4580c10d5cd3ab3468746030cbe07bd005 /bsd-user
parentc640f2849ee8775fe1bbd7a2772610aa77816f9f (diff)
parent43e21e4907a009d87f6aef44663d9e1f7b181b8d (diff)
downloadqemu-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 'bsd-user')
-rw-r--r--bsd-user/main.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 35125b7..d803d3e 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -1116,7 +1116,6 @@ int main(int argc, char **argv)
gdbserver_start (gdbstub_port);
gdb_handlesig(cpu, 0);
}
- trace_init_vcpu_events();
cpu_loop(env);
/* never exits */
return 0;