Commit 88affa1c authored by Harsh Prateek Bora's avatar Harsh Prateek Bora Committed by Stefan Hajnoczi
Browse files

monitor: remove unused do_info_trace 

Going forward with simpletrace v2 variable size trace records, we cannot
have a generic function to print trace event info and therefore this
interface becomes invalid.

As per Stefan Hajnoczi:

"This command is only available from the human monitor.  It's not very
useful because it historically hasn't been able to pretty-print events
or show them in the right order (we use a ringbuffer but it prints
them out from index 0).

Therefore, I don't think we're under any obligation to keep this
command around.  No one has complained about it's limitations - I
think this is a sign that no one has used it.  I'd be okay with a
patch that removes it."

Ref: http://lists.gnu.org/archive/html/qemu-devel/2012-01/msg01268.html



Signed-off-by: default avatarHarsh Prateek Bora <harsh@linux.vnet.ibm.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
parent 794b1f96

monitor.c

+0 −16
Original line number Diff line number Diff line
@@ -941,13 +941,6 @@ static void do_info_cpu_stats(Monitor *mon) 
}

#endif



#if defined(CONFIG_TRACE_SIMPLE)

static void do_info_trace(Monitor *mon)

{

    st_print_trace((FILE *)mon, &monitor_fprintf);

}

#endif



static void do_trace_print_events(Monitor *mon)

{

    trace_print_events((FILE *)mon, &monitor_fprintf);
@@ -2689,15 +2682,6 @@ static mon_cmd_t info_cmds[] = { 
        .help       = "show roms",

        .mhandler.info = do_info_roms,

    },

#if defined(CONFIG_TRACE_SIMPLE)

    {

        .name       = "trace",

        .args_type  = "",

        .params     = "",

        .help       = "show current contents of trace buffer",

        .mhandler.info = do_info_trace,

    },

#endif

    {

        .name       = "trace-events",

        .args_type  = "",

trace/simple.c

+0 −18
Original line number Diff line number Diff line
@@ -291,24 +291,6 @@ void st_print_trace_file_status(FILE *stream, int (*stream_printf)(FILE *stream, 
                  trace_file_name, trace_fp ? "on" : "off");

}



void st_print_trace(FILE *stream, int (*stream_printf)(FILE *stream, const char *fmt, ...))

{

    unsigned int i;



    for (i = 0; i < TRACE_BUF_LEN; i++) {

        TraceRecord record;



        if (!get_trace_record(i, &record)) {

            continue;

        }

        stream_printf(stream, "Event %" PRIu64 " : %" PRIx64 " %" PRIx64

                      " %" PRIx64 " %" PRIx64 " %" PRIx64 " %" PRIx64 "\n",

                      record.event, record.x1, record.x2,

                      record.x3, record.x4, record.x5,

                      record.x6);

    }

}



void st_flush_trace_buffer(void)

{

    flush_trace_file(true);

trace/simple.h

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ void trace3(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3); 
void trace4(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, uint64_t x4);

void trace5(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, uint64_t x4, uint64_t x5);

void trace6(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, uint64_t x4, uint64_t x5, uint64_t x6);

void st_print_trace(FILE *stream, fprintf_function stream_printf);

void st_print_trace_file_status(FILE *stream, fprintf_function stream_printf);

void st_set_trace_file_enabled(bool enable);

bool st_set_trace_file(const char *file);