Commit 45bd0b41 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Stefan Hajnoczi
Browse files

trace: split trace_init_events out of trace_init_backends 



This is cleaner and has two advantages.  First, it improves error
reporting with -daemonize.  Second, multiple "-trace events" options
now cumulate.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Message-id: 1452174932-28657-3-git-send-email-den@openvz.org
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 52449a31

qemu-io.c

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ int main(int argc, char **argv) 
            }

            break;

        case 'T':

            if (!trace_init_backends(optarg, NULL)) {

            if (!trace_init_backends(optarg)) {

                exit(1); /* error message will have been printed */

            }

            break;

trace/control.c

+2 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ TraceEvent *trace_event_pattern(const char *pat, TraceEvent *ev) 
    return NULL;

}



static void trace_init_events(const char *fname)

void trace_init_events(const char *fname)

{

    Location loc;

    FILE *fp;
@@ -145,7 +145,7 @@ static void trace_init_events(const char *fname) 
    loc_pop(&loc);

}



bool trace_init_backends(const char *events, const char *file)

bool trace_init_backends(const char *file)

{

#ifdef CONFIG_TRACE_SIMPLE

    if (!st_init(file)) {
@@ -167,6 +167,5 @@ bool trace_init_backends(const char *events, const char *file) 
    }

#endif



    trace_init_events(events);

    return true;

}

trace/control.h

+12 −3
Original line number Diff line number Diff line
@@ -150,8 +150,6 @@ static void trace_event_set_state_dynamic(TraceEvent *ev, bool state); 


/**

 * trace_init_backends:

 * @events: Name of file with events to be enabled at startup; may be NULL.

 *          Corresponds to commandline option "-trace events=...".

 * @file:   Name of trace output file; may be NULL.

 *          Corresponds to commandline option "-trace file=...".

 *
@@ -159,7 +157,18 @@ static void trace_event_set_state_dynamic(TraceEvent *ev, bool state); 
 *

 * Returns: Whether the backends could be successfully initialized.

 */

bool trace_init_backends(const char *events, const char *file);

bool trace_init_backends(const char *file);



/**

 * trace_init_events:

 * @events: Name of file with events to be enabled at startup; may be NULL.

 *          Corresponds to commandline option "-trace events=...".

 *

 * Read the list of enabled tracing events.

 *

 * Returns: Whether the backends could be successfully initialized.

 */

void trace_init_events(const char *file);





#include "trace/control-internal.h"

vl.c

+4 −4
Original line number Diff line number Diff line
@@ -2988,7 +2988,6 @@ int main(int argc, char **argv, char **envp) 
    bool userconfig = true;

    const char *log_mask = NULL;

    const char *log_file = NULL;

    const char *trace_events = NULL;

    const char *trace_file = NULL;

    ram_addr_t maxram_size;

    uint64_t ram_slots = 0;
@@ -3905,8 +3904,9 @@ int main(int argc, char **argv, char **envp) 
                if (!opts) {

                    exit(1);

                }

                trace_events = qemu_opt_get(opts, "events");

                trace_init_events(qemu_opt_get(opts, "events"));

                trace_file = qemu_opt_get(opts, "file");

                qemu_opts_del(opts);

                break;

            }

            case QEMU_OPTION_readconfig:
@@ -4106,7 +4106,7 @@ int main(int argc, char **argv, char **envp) 
    }



    if (!is_daemonized()) {

        if (!trace_init_backends(trace_events, trace_file)) {

        if (!trace_init_backends(trace_file)) {

            exit(1);

        }

    }
@@ -4653,7 +4653,7 @@ int main(int argc, char **argv, char **envp) 
    os_setup_post();



    if (is_daemonized()) {

        if (!trace_init_backends(trace_events, trace_file)) {

        if (!trace_init_backends(trace_file)) {

            exit(1);

        }

    }