From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42775) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw92G-0000MJ-FT for qemu-devel@nongnu.org; Tue, 10 Nov 2015 08:32:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zw92A-0000xb-Pz for qemu-devel@nongnu.org; Tue, 10 Nov 2015 08:32:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37797) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw92A-0000xX-LP for qemu-devel@nongnu.org; Tue, 10 Nov 2015 08:32:26 -0500 From: Stefan Hajnoczi Date: Tue, 10 Nov 2015 13:31:48 +0000 Message-Id: <1447162308-8517-16-git-send-email-stefanha@redhat.com> In-Reply-To: <1447162308-8517-1-git-send-email-stefanha@redhat.com> References: <1447162308-8517-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 15/15] log: add "-d trace:PATTERN" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Denis V. Lunev" , Peter Maydell , Stefan Hajnoczi , Paolo Bonzini From: Paolo Bonzini This is a bit easier to use than "-trace" if you are also enabling other kinds of logging. It is also more discoverable for experienced QEMU users, and accessible from user-mode emulators. Signed-off-by: Paolo Bonzini Signed-off-by: Denis V. Lunev Acked-by: Christian Borntraeger Message-id: 1446151457-21157-12-git-send-email-den@openvz.org Signed-off-by: Stefan Hajnoczi --- util/log.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/util/log.c b/util/log.c index 5cc71eb..c5f24ce 100644 --- a/util/log.c +++ b/util/log.c @@ -19,6 +19,7 @@ #include "qemu-common.h" #include "qemu/log.h" +#include "trace/control.h" static char *logfilename; FILE *qemu_logfile; @@ -152,6 +153,11 @@ int qemu_str_to_log_mask(const char *str) for (item = qemu_log_items; item->mask != 0; item++) { mask |= item->mask; } +#ifdef CONFIG_TRACE_LOG + } else if (strncmp(p, "trace:", 6) == 0 && p + 6 != p1) { + trace_enable_events(p + 6); + mask |= LOG_TRACE; +#endif } else { for (item = qemu_log_items; item->mask != 0; item++) { if (cmp1(p, p1 - p, item->name)) { @@ -159,9 +165,9 @@ int qemu_str_to_log_mask(const char *str) } } return 0; + found: + mask |= item->mask; } - found: - mask |= item->mask; if (*p1 != ',') { break; } @@ -175,6 +181,10 @@ void qemu_print_log_usage(FILE *f) const QEMULogItem *item; fprintf(f, "Log items (comma separated):\n"); for (item = qemu_log_items; item->mask != 0; item++) { - fprintf(f, "%-10s %s\n", item->name, item->help); + fprintf(f, "%-15s %s\n", item->name, item->help); } +#ifdef CONFIG_TRACE_LOG + fprintf(f, "trace:PATTERN enable trace events\n"); + fprintf(f, "\nUse \"-d trace:help\" to get a list of trace events.\n\n"); +#endif } -- 2.5.0