From acc6809ddc45dd9a896c53ec7b61e66604923cd7 Mon Sep 17 00:00:00 2001 From: "Denis V. Lunev" Date: Wed, 16 Mar 2016 14:36:51 +0300 Subject: [PATCH] trace: do not always call exit() in trace_enable_events The problem is that virsh qemu-monitor-command --hmp VM log trace:help forces QEMU to exit even when running VM normally. Signed-off-by: Denis V. Lunev Reviewed-by: Paolo Bonzini Message-id: 1458128212-4197-2-git-send-email-den@openvz.org CC: Stefan Hajnoczi Reviewed-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi --- trace/control.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/trace/control.c b/trace/control.c index ccddda5..d099f73 100644 --- a/trace/control.c +++ b/trace/control.c @@ -20,6 +20,7 @@ #include "qemu/log.h" #endif #include "qemu/error-report.h" +#include "monitor/monitor.h" int trace_events_enabled_count; bool trace_events_dstate[TRACE_EVENT_COUNT]; @@ -132,7 +133,9 @@ void trace_enable_events(const char *line_buf) { if (is_help_option(line_buf)) { trace_list_events(); - exit(0); + if (cur_mon == NULL) { + exit(0); + } } else { do_trace_enable_events(line_buf); } -- 2.7.4