/ - Diff - qemu - Greek Research and Technology Network's projects

     trace-obj-y = trace.o
     endif
     trace-nested-$(CONFIG_TRACE_DEFAULT) += default.o
     trace-nested-$(CONFIG_TRACE_SIMPLE) += simple.o
     trace-obj-$(CONFIG_TRACE_SIMPLE) += qemu-timer-common.o

     ;;
     esac
     # use default implementation for tracing backend-specific routines
     trace_default=yes
     echo "TRACE_BACKEND=$trace_backend" >> $config_host_mak
     if test "$trace_backend" = "nop"; then
       echo "CONFIG_TRACE_NOP=y" >> $config_host_mak
     fi
     if test "$trace_backend" = "simple"; then
       echo "CONFIG_TRACE_SIMPLE=y" >> $config_host_mak
       trace_default=no
       # Set the appropriate trace file.
       trace_file="\"$trace_file-\" FMT_pid"
     fi
-...
       fi
     fi
     echo "CONFIG_TRACE_FILE=$trace_file" >> $config_host_mak
     if test "$trace_default" = "yes"; then
       echo "CONFIG_TRACE_DEFAULT=y" >> $config_host_mak
     fi
     echo "TOOLS=$tools" >> $config_host_mak
     echo "ROMS=$roms" >> $config_host_mak

         },
     };
     #ifdef CONFIG_TRACE_SIMPLE
     static QemuOptsList qemu_trace_opts = {
         .name = "trace",
         .implied_opt_name = "trace",
-...
             { /* end of list */ }
         },
     };
     #endif
     static QemuOptsList qemu_cpudef_opts = {
         .name = "cpudef",
-...
         &qemu_global_opts,
         &qemu_mon_opts,
         &qemu_cpudef_opts,
     #ifdef CONFIG_TRACE_SIMPLE
         &qemu_trace_opts,
     #endif
         &qemu_option_rom_opts,
         &qemu_machine_opts,
         &qemu_boot_opts,

     @var{sysconfdir}/target-@var{ARCH}.conf on startup.  The @code{-nodefconfig}
     option will prevent QEMU from loading these configuration files at startup.
     ETEXI
     #ifdef CONFIG_TRACE_SIMPLE
     DEF("trace", HAS_ARG, QEMU_OPTION_trace,
         "-trace\n"
         "                Specify a trace file to log traces to\n",
         QEMU_ARCH_ALL)
     STEXI
     HXCOMM This line is not accurate, as the option is backend-specific but HX does
     HXCOMM not support conditional compilation of text.
     @item -trace
     @findex -trace
     Specify a trace file to log output traces to.
     This option is available only when using the @var{simple} tracing backend.
     ETEXI
     #endif
     HXCOMM This is the last statement. Insert new options before this line!
     STEXI

     /*
      * Interface for configuring and controlling the state of tracing events.
+     *
      * Copyright (C) 2011 Lluís Vilanova <vilanova@ac.upc.edu>
+     *
      * This work is licensed under the terms of the GNU GPL, version 2.  See
      * the COPYING file in the top-level directory.
      */
     #ifndef TRACE_CONTROL_H
     #define TRACE_CONTROL_H
     #include <stdbool.h>
     /** Initialize the tracing backend.
+     *
      * @file Name of trace output file; may be NULL.
      *       Corresponds to commandline option "-trace file=...".
      * @return Whether the backend could be successfully initialized.
      */
     bool trace_backend_init(const char *file);
     #endif  /* TRACE_CONTROL_H */

     /*
      * Default implementation for backend initialization from commandline.
+     *
      * Copyright (C) 2011 Lluís Vilanova <vilanova@ac.upc.edu>
+     *
      * This work is licensed under the terms of the GNU GPL, version 2.  See
      * the COPYING file in the top-level directory.
      */
     #include "trace/control.h"
     bool trace_backend_init(const char *file)
+    {
         if (file) {
             fprintf(stderr, "error: -trace file=...: "
                     "option not supported by the selected tracing backend\n");
             return false;
+        }
         return true;
+    }

     #include <pthread.h>
     #include "qemu-timer.h"
     #include "trace.h"
     #include "trace/control.h"
     /** Trace file header event ID */
     #define HEADER_EVENT_ID (~(uint64_t)0) /* avoids conflicting with TraceEventIDs */
-...
         flush_trace_file(true);
+    }
     bool st_init(const char *file)
     bool trace_backend_init(const char *file)
+    {
         pthread_t thread;
         pthread_attr_t attr;
-...
         pthread_sigmask(SIG_SETMASK, &oldset, NULL);
         if (ret != 0) {
             return false;
             fprintf(stderr, "warning: unable to initialize simple trace backend\n");
         } else {
             atexit(st_flush_trace_buffer);
             st_set_trace_file(file);
+        }
         atexit(st_flush_trace_buffer);
         st_set_trace_file(file);
         return true;
+    }

     #include <stdbool.h>
     #include <stdio.h>
     #ifdef CONFIG_TRACE_SIMPLE
     typedef uint64_t TraceEventID;
     typedef struct {
-...
     void st_set_trace_file_enabled(bool enable);
     bool st_set_trace_file(const char *file);
     void st_flush_trace_buffer(void);
     bool st_init(const char *file);
     #else
     static inline bool st_init(const char *file)
+    {
         return true;
+    }
     #endif /* !CONFIG_TRACE_SIMPLE */
     #endif /* TRACE_SIMPLE_H */

     #include "slirp/libslirp.h"
     #include "trace.h"
     #include "trace/simple.h"
     #include "trace/control.h"
     #include "qemu-queue.h"
     #include "cpus.h"
     #include "arch_init.h"
-...
         int show_vnc_port = 0;
     #endif
         int defconfig = 1;
         const char *trace_file = NULL;
         const char *log_mask = NULL;
         const char *log_file = NULL;
         GMemVTable mem_trace = {
-...
             .realloc = realloc_and_trace,
             .free = free_and_trace,
         };
         const char *trace_file = NULL;
         atexit(qemu_run_exit_notifiers);
         error_set_progname(argv[0]);
-...
+                    }
                     xen_mode = XEN_ATTACH;
                     break;
     #ifdef CONFIG_TRACE_SIMPLE
                 case QEMU_OPTION_trace:
+                {
                     opts = qemu_opts_parse(qemu_find_opts("trace"), optarg, 0);
                     if (opts) {
                         trace_file = qemu_opt_get(opts, "file");
                     if (!opts) {
                         exit(1);
+                    }
                     trace_file = qemu_opt_get(opts, "file");
                     break;
     #endif
+                }
                 case QEMU_OPTION_readconfig:
+                    {
                         int ret = qemu_read_config_file(optarg);
-...
             set_cpu_log(log_mask);
+        }
         if (!st_init(trace_file)) {
             fprintf(stderr, "warning: unable to initialize simple trace backend\n");
         if (!trace_backend_init(trace_file)) {
             exit(1);
+        }
         /* If no data_dir is specified then try to find it relative to the

Archipelago » qemu

Revision e4858974