summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Mueller2013-09-23 16:36:54 +0200
committerStefan Hajnoczi2014-01-27 15:49:39 +0100
commit8a745f2a9296ad2cf6bda33534ed298f2625a4ad (patch)
tree3fc2117f44d8850de4add13e73173da0ea918224
parentMerge remote-tracking branch 'qemu-kvm/uq/master' into staging (diff)
downloadqemu-8a745f2a9296ad2cf6bda33534ed298f2625a4ad.tar.gz
qemu-8a745f2a9296ad2cf6bda33534ed298f2625a4ad.tar.xz
qemu-8a745f2a9296ad2cf6bda33534ed298f2625a4ad.zip
tracing: start trace processing thread in final child process
When running with trace backend e.g. "simple" the writer thread needs to be implemented in the same process context as the trace points that will be processed. Under libvirtd control, qemu gets first started in daemonized mode to privide its capabilities. Creating the writer thread in the initial process context then leads to a dead lock because the thread gets termined together with the initial parent. (-daemonize) Signed-off-by: Michael Mueller <mimu@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> [minor whitespace fixes] Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--vl.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/vl.c b/vl.c
index 7f4fe0d5df..63f4d5585c 100644
--- a/vl.c
+++ b/vl.c
@@ -3879,8 +3879,10 @@ int main(int argc, char **argv, char **envp)
qemu_set_log(mask);
}
- if (!trace_backend_init(trace_events, trace_file)) {
- exit(1);
+ if (!is_daemonized()) {
+ if (!trace_backend_init(trace_events, trace_file)) {
+ exit(1);
+ }
}
/* If no data_dir is specified then try to find it relative to the
@@ -4379,6 +4381,12 @@ int main(int argc, char **argv, char **envp)
os_setup_post();
+ if (is_daemonized()) {
+ if (!trace_backend_init(trace_events, trace_file)) {
+ exit(1);
+ }
+ }
+
main_loop();
bdrv_close_all();
pause_all_vcpus();