From patchwork Thu Jun 24 11:31:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prerna Saxena X-Patchwork-Id: 56783 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F1D06B6F10 for ; Thu, 24 Jun 2010 21:33:01 +1000 (EST) Received: from localhost ([127.0.0.1]:52142 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ORkfz-00059U-1H for incoming@patchwork.ozlabs.org; Thu, 24 Jun 2010 07:32:59 -0400 Received: from [140.186.70.92] (port=38929 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ORkeS-0004h0-JI for qemu-devel@nongnu.org; Thu, 24 Jun 2010 07:31:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1ORkeR-0005iI-6R for qemu-devel@nongnu.org; Thu, 24 Jun 2010 07:31:24 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:45516) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ORkeQ-0005i3-Jo for qemu-devel@nongnu.org; Thu, 24 Jun 2010 07:31:23 -0400 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp05.au.ibm.com (8.14.4/8.13.1) with ESMTP id o5OBRC2L029722 for ; Thu, 24 Jun 2010 21:27:12 +1000 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o5OBVJJZ1773648 for ; Thu, 24 Jun 2010 21:31:20 +1000 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o5OBVJVu015472 for ; Thu, 24 Jun 2010 21:31:19 +1000 Received: from zephyr ([9.124.35.39]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o5OBVH6r015420; Thu, 24 Jun 2010 21:31:18 +1000 Date: Thu, 24 Jun 2010 17:01:15 +0530 From: Prerna Saxena To: qemu-devel@nongnu.org Message-ID: <20100624170115.6ea594a2@zephyr> In-Reply-To: <20100624164930.7859b779@zephyr> References: <20100624164930.7859b779@zephyr> Organization: IBM X-Mailer: Claws Mail 3.7.5 (GTK+ 2.16.6; i586-redhat-linux-gnu) Mime-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Anthony Liguori , Stefan Hajnoczi , kvm@vger.kernel.org, Jan Kiszka , Luiz Capitulino , Soni , Ananth Narayan , Maneesh Subject: [Qemu-devel] [RFC v4][PATCH 2/3] Monitor command 'info trace' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Monitor command 'info trace' to display contents of trace buffer Signed-off-by: Prerna Saxena --- configure | 3 +++ monitor.c | 12 ++++++++++++ qemu-monitor.hx | 4 ++++ simpletrace.c | 12 ++++++++++++ tracetool | 1 + 5 files changed, 32 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 675d0fc..56af8dd 100755 --- a/configure +++ b/configure @@ -2302,6 +2302,9 @@ bsd) esac echo "TRACE_BACKEND=$trace_backend" >> $config_host_mak +if test "$trace_backend" = "simple"; then + echo "CONFIG_SIMPLE_TRACE=y" >> $config_host_mak +fi if test "$trace_backend" = "ust"; then LIBS="-lust $LIBS" fi diff --git a/monitor.c b/monitor.c index ad50f12..8b60830 100644 --- a/monitor.c +++ b/monitor.c @@ -55,6 +55,9 @@ #include "json-streamer.h" #include "json-parser.h" #include "osdep.h" +#ifdef CONFIG_SIMPLE_TRACE +#include "trace.h" +#endif //#define DEBUG //#define DEBUG_COMPLETION @@ -2780,6 +2783,15 @@ static const mon_cmd_t info_cmds[] = { .help = "show roms", .mhandler.info = do_info_roms, }, +#if defined(CONFIG_SIMPLE_TRACE) + { + .name = "trace", + .args_type = "", + .params = "", + .help = "show current contents of trace buffer", + .mhandler.info = do_info_trace, + }, +#endif { .name = NULL, }, diff --git a/qemu-monitor.hx b/qemu-monitor.hx index b6e3467..766c30f 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -114,6 +114,10 @@ show migration status show balloon information @item info qtree show device tree +#ifdef CONFIG_SIMPLE_TRACE +@item info trace +show contents of trace buffer +#endif @end table ETEXI diff --git a/simpletrace.c b/simpletrace.c index b488380..5734d15 100644 --- a/simpletrace.c +++ b/simpletrace.c @@ -1,5 +1,6 @@ #include #include +#include "monitor.h" #include "trace.h" typedef struct { @@ -62,3 +63,14 @@ void trace4(TraceEventID event, unsigned long x1, unsigned long x2, unsigned lon void trace5(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3, unsigned long x4, unsigned long x5) { trace(event, x1, x2, x3, x4, x5); } + +void do_info_trace(Monitor *mon) +{ + unsigned int i; + + for (i = 0; i < trace_idx ; i++) { + monitor_printf(mon, "Event %lu : %lx %lx %lx %lx %lx\n", + trace_buf[i].event, trace_buf[i].x1, trace_buf[i].x2, + trace_buf[i].x3, trace_buf[i].x4, trace_buf[i].x5); + } +} diff --git a/tracetool b/tracetool index 0dc7f1b..6f8f8a9 100755 --- a/tracetool +++ b/tracetool @@ -130,6 +130,7 @@ void trace2(TraceEventID event, unsigned long x1, unsigned long x2); void trace3(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3); void trace4(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3, unsigned long x4); void trace5(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3, unsigned long x4, unsigned long x5); +void do_info_trace(Monitor *mon); EOF simple_event_num=0