Merge commit '9257d46d55f1fe4e8209be9a6870e339ac3266fe' into upstream-merge

* commit '9257d46d55f1fe4e8209be9a6870e339ac3266fe': (132 commits)
  add win32 qemu-thread implementation
  Refactor thread retrieval and check
  use win32 timer queues
  implement win32 dynticks timer
  unlock iothread during WaitForMultipleObjects
  hw/fmopl: Fix buffer access out-of-bounds errors
  moving eeprom initialization
  pc: fix wrong CMOS values for floppy drives
  microblaze: Add PVR for writeback cache, endians
  microblaze: Fix PetaLogix company name
  vmstate: move timers to use test instead of version
  vmstate: be able to store/save a pci device from a pointer
  vmstate: Add a way to send a partial array
  vmstate: add VMSTATE_STRUCT_VARRAY_UINT32
  vmstate: add VMSTATE_INT64_ARRAY
  vmstate: add VMSTATE_STRUCT_VARRAY_INT32
  vmstate: add UINT32 VARRAYS
  vmstate: Fix varrays with uint8 indexes
  vmstate: add VMSTATE_UINT32_EQUAL
  vnc: Fix stack corruption and other bitmap related bugs
  ...

Conflicts:
	Makefile.objs

1 files changed, 4 insertions, 12 deletions

diff --git a/vl.c b/vl.c
index ac1bdd346..8bcf2ae7c 100644
--- a/vl.c
+++ b/vl.c
@@ -47,9 +47,6 @@
 #include <dirent.h>
 #include <netdb.h>
 #include <sys/select.h>
-#ifdef CONFIG_SIMPLE_TRACE
-#include "trace.h"
-#endif
 
 #ifdef CONFIG_BSD
 #include <sys/stat.h>
@@ -160,6 +157,7 @@ int main(int argc, char **argv)
 #include "slirp/libslirp.h"
 
 #include "trace.h"
+#include "simpletrace.h"
 #include "qemu-queue.h"
 #include "cpus.h"
 #include "arch_init.h"
@@ -1965,10 +1963,8 @@ int main(int argc, char **argv, char **envp)
     const char *incoming = NULL;
     int show_vnc_port = 0;
     int defconfig = 1;
-
-#ifdef CONFIG_SIMPLE_TRACE
     const char *trace_file = NULL;
-#endif
+
     atexit(qemu_run_exit_notifiers);
     error_set_progname(argv[0]);
 
@@ -2831,6 +2827,8 @@ int main(int argc, char **argv, char **envp)
     }
     loc_set_none();
 
+    st_init(trace_file);
+
     /* If no data_dir is specified then try to find it relative to the
        executable path.  */
     if (!data_dir) {
@@ -2841,12 +2839,6 @@ int main(int argc, char **argv, char **envp)
         data_dir = CONFIG_QEMU_DATADIR;
     }
 
-#ifdef CONFIG_SIMPLE_TRACE
-    /*
-     * Set the trace file name, if specified.
-     */
-    st_set_trace_file(trace_file);
-#endif
     /*
      * Default to max_cpus = smp_cpus, in case the user doesn't
      * specify a max_cpus value.