Revision 0b5538c3 vl.c

b/vl.c
47 47
#include <dirent.h>
48 48
#include <netdb.h>
49 49
#include <sys/select.h>
50
#ifdef CONFIG_SIMPLE_TRACE
51
#include "trace.h"
52
#endif
53 50

  
54 51
#ifdef CONFIG_BSD
55 52
#include <sys/stat.h>
......
159 156
#include "slirp/libslirp.h"
160 157

  
161 158
#include "trace.h"
159
#include "simpletrace.h"
162 160
#include "qemu-queue.h"
163 161
#include "cpus.h"
164 162
#include "arch_init.h"
......
1941 1939
    const char *incoming = NULL;
1942 1940
    int show_vnc_port = 0;
1943 1941
    int defconfig = 1;
1944

  
1945
#ifdef CONFIG_SIMPLE_TRACE
1946 1942
    const char *trace_file = NULL;
1947
#endif
1943

  
1948 1944
    atexit(qemu_run_exit_notifiers);
1949 1945
    error_set_progname(argv[0]);
1950 1946

  
......
2770 2766
    }
2771 2767
    loc_set_none();
2772 2768

  
2769
    st_init(trace_file);
2770

  
2773 2771
    /* If no data_dir is specified then try to find it relative to the
2774 2772
       executable path.  */
2775 2773
    if (!data_dir) {
......
2780 2778
        data_dir = CONFIG_QEMU_DATADIR;
2781 2779
    }
2782 2780

  
2783
#ifdef CONFIG_SIMPLE_TRACE
2784
    /*
2785
     * Set the trace file name, if specified.
2786
     */
2787
    st_set_trace_file(trace_file);
2788
#endif
2789 2781
    /*
2790 2782
     * Default to max_cpus = smp_cpus, in case the user doesn't
2791 2783
     * specify a max_cpus value.

Also available in: Unified diff