From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag9lD-0006TP-OD for qemu-devel@nongnu.org; Wed, 16 Mar 2016 07:37:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ag9l9-0001Th-Oz for qemu-devel@nongnu.org; Wed, 16 Mar 2016 07:37:07 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:23481 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag9l9-0001Sr-Cs for qemu-devel@nongnu.org; Wed, 16 Mar 2016 07:37:03 -0400 From: "Denis V. Lunev" Date: Wed, 16 Mar 2016 14:36:51 +0300 Message-Id: <1458128212-4197-2-git-send-email-den@openvz.org> In-Reply-To: <1458128212-4197-1-git-send-email-den@openvz.org> References: <1458128212-4197-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 1/2] trace: do not always call exit() in trace_enable_events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, Stefan Hajnoczi , "Denis V. Lunev" 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 CC: Stefan Hajnoczi Reviewed-by: Paolo Bonzini --- trace/control.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/trace/control.c b/trace/control.c index 20d3370..2d404c3 100644 --- a/trace/control.c +++ b/trace/control.c @@ -19,6 +19,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]; @@ -131,7 +132,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.1.4