From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=50723 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUFv5-0003G8-TY for qemu-devel@nongnu.org; Thu, 01 Jul 2010 05:19:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OUFv4-0005mh-I9 for qemu-devel@nongnu.org; Thu, 01 Jul 2010 05:18:55 -0400 Received: from mtagate3.de.ibm.com ([195.212.17.163]:58869) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OUFv4-0005mG-AW for qemu-devel@nongnu.org; Thu, 01 Jul 2010 05:18:54 -0400 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate3.de.ibm.com (8.13.1/8.13.1) with ESMTP id o619IqE0014808 for ; Thu, 1 Jul 2010 09:18:52 GMT Received: from d12av04.megacenter.de.ibm.com (d12av04.megacenter.de.ibm.com [9.149.165.229]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o619Ig6x1495286 for ; Thu, 1 Jul 2010 11:18:52 +0200 Received: from d12av04.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av04.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id o619IfiX008039 for ; Thu, 1 Jul 2010 11:18:41 +0200 Date: Thu, 1 Jul 2010 10:18:41 +0100 From: Stefan Hajnoczi Message-ID: <20100701091839.GB2344@stefan-thinkpad.transitives.com> References: <20100630211145.41631855@zephyr> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100630211145.41631855@zephyr> Subject: [Qemu-devel] Re: [PATCH][Tracing] Fix build errors for target i386-linux-user List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Prerna Saxena Cc: Maneesh Soni , qemu-devel , Ananth Narayan On Wed, Jun 30, 2010 at 09:11:45PM +0530, Prerna Saxena wrote: > [PATCH 1/1] Move definitions of monitor command handlers (do_info_trace, > do_info_all_trace_events) to monitor.c. This removes build errors for > user targets such as i386-linux-user, which are not linked with monitor. > > The export of trace_buf and trace_idx is an unfortunate side effect, > since these are needed by do_info_trace which dumps buffer > contents. "git grep monitor_printf" suggests that other source files do their own monitor printing. Did you look into alternatives that don't expose the trace buffer internals? I feel #ifndef CONFIG_USER_ONLY in simpletrace.c would be would be nicer than exposing the internals. (CONFIG_USER_ONLY is just a guess, I haven't investigated which is the right thing to test for.) Stefan > > Signed-off-by: Prerna Saxena > --- > monitor.c | 21 +++++++++++++++++++++ > simpletrace.c | 39 ++------------------------------------- > tracetool | 16 ++++++++++++++++ > 3 files changed, 39 insertions(+), 37 deletions(-) > > diff --git a/monitor.c b/monitor.c > index 433a3ec..9b5d65a 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -540,6 +540,27 @@ static void do_change_trace_event_state(Monitor *mon, const QDict *qdict) > bool new_state = qdict_get_bool(qdict, "option"); > change_trace_event_state(tp_name, new_state); > } > + > +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); > + } > +} > + > +void do_info_all_trace_events(Monitor *mon) > +{ > + unsigned int i; > + > + for (i = 0; i < NR_TRACE_EVENTS; i++) { > + monitor_printf(mon, "%s [Event ID %u] : state %u\n", > + trace_list[i].tp_name, i, trace_list[i].state); > + } > +} > #endif > > static void user_monitor_complete(void *opaque, QObject *ret_data) > diff --git a/simpletrace.c b/simpletrace.c > index 57c41fc..834b4c1 100644 > --- a/simpletrace.c > +++ b/simpletrace.c > @@ -1,23 +1,9 @@ > #include > #include > -#include "monitor.h" > #include "trace.h" > > -typedef struct { > - unsigned long event; > - unsigned long x1; > - unsigned long x2; > - unsigned long x3; > - unsigned long x4; > - unsigned long x5; > -} TraceRecord; > - > -enum { > - TRACE_BUF_LEN = 64 * 1024 / sizeof(TraceRecord), > -}; > - > -static TraceRecord trace_buf[TRACE_BUF_LEN]; > -static unsigned int trace_idx; > +TraceRecord trace_buf[TRACE_BUF_LEN]; > +unsigned int trace_idx; > static FILE *trace_fp; > > static void trace(TraceEventID event, unsigned long x1, > @@ -69,27 +55,6 @@ void trace5(TraceEventID event, unsigned long x1, unsigned long x2, unsigned lon > 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); > - } > -} > - > -void do_info_all_trace_events(Monitor *mon) > -{ > - unsigned int i; > - > - for (i = 0; i < NR_TRACE_EVENTS; i++) { > - monitor_printf(mon, "%s [Event ID %u] : state %u\n", > - trace_list[i].tp_name, i, trace_list[i].state); > - } > -} > - > static TraceEvent* find_trace_event_by_name(const char *tname) > { > unsigned int i; > diff --git a/tracetool b/tracetool > index c77280d..c7a690d 100755 > --- a/tracetool > +++ b/tracetool > @@ -125,6 +125,22 @@ typedef struct { > bool state; > } TraceEvent; > > +typedef struct { > + unsigned long event; > + unsigned long x1; > + unsigned long x2; > + unsigned long x3; > + unsigned long x4; > + unsigned long x5; > +} TraceRecord; > + > +enum { > + TRACE_BUF_LEN = 64 * 1024 / sizeof(TraceRecord), > +}; > + > +extern TraceRecord trace_buf[TRACE_BUF_LEN]; > +extern unsigned int trace_idx; > + > void trace1(TraceEventID event, unsigned long x1); > void trace2(TraceEventID event, unsigned long x1, unsigned long x2); > void trace3(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3); > -- > 1.6.2.5 > > > > -- > Prerna Saxena > > Linux Technology Centre, > IBM Systems and Technology Lab, > Bangalore, India >