trace: move backend-specific code into the trace/ directory

Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>

diff --git a/Makefile b/Makefile
index 86068498e95844c45800a7e010bb341248050fed..13be25a3820cc72d11c1029665cd0b310e520f12 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -209,6 +209,7 @@ clean:
        rm -Rf .libs
        rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d qapi/*.o qapi/*.d qga/*.o qga/*.d
        rm -f qemu-img-cmds.h
+       rm -f trace/*.o trace/*.d
        rm -f trace.c trace.h trace.c-timestamp trace.h-timestamp
        rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
        rm -f trace-dtrace.h trace-dtrace.h-timestamp

diff --git a/Makefile.objs b/Makefile.objs
index 833158b1b6748ab5ce2eaa89844a1263198fc2e5..4f8b0ed6898bcfbdbb52cc2aaf8ce46e831b7b1b 100644 (file)
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -372,16 +372,18 @@ trace-dtrace.lo: trace-dtrace.dtrace
        $(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC dtrace -o $@ -G -s $<, "  lt GEN trace-dtrace.o")
 endif
 
-simpletrace.o: simpletrace.c $(GENERATED_HEADERS)
+trace/simple.o: trace/simple.c $(GENERATED_HEADERS)
 
 trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
 ifneq ($(TRACE_BACKEND),dtrace)
 trace-obj-y = trace.o
 endif
 
-trace-obj-$(CONFIG_TRACE_SIMPLE) += simpletrace.o
+trace-nested-$(CONFIG_TRACE_SIMPLE) += simple.o
 trace-obj-$(CONFIG_TRACE_SIMPLE) += qemu-timer-common.o
 
+trace-obj-y += $(addprefix trace/, $(trace-nested-y))
+
 ######################################################################
 # smartcard
 

diff --git a/scripts/tracetool b/scripts/tracetool
index 2155a57df2a02d3ec58321c544cf658245f25dae..9ed4fae70f137a7db75d0879b6041f1d030b6143 100755 (executable)
--- a/scripts/tracetool
+++ b/scripts/tracetool
@@ -158,7 +158,7 @@ linetoc_end_nop()
 linetoh_begin_simple()
 {
     cat <<EOF
-#include "simpletrace.h"
+#include "trace/simple.h"
 EOF
 
     simple_event_num=0

diff --git a/simpletrace.c b/trace/simple.c
similarity index 100%
rename from simpletrace.c
rename to trace/simple.c

diff --git a/simpletrace.h b/trace/simple.h
similarity index 95%
rename from simpletrace.h
rename to trace/simple.h
index 507dd878d711c21b2ea0339d0f6a0837c695c764..77633ab68ae7a32a95414937f762dc51694bf3e7 100644 (file)
--- a/simpletrace.h
+++ b/trace/simple.h
@@ -8,8 +8,8 @@
  *
  */
 
-#ifndef SIMPLETRACE_H
-#define SIMPLETRACE_H
+#ifndef TRACE_SIMPLE_H
+#define TRACE_SIMPLE_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -45,4 +45,4 @@ static inline bool st_init(const char *file)
 }
 #endif /* !CONFIG_TRACE_SIMPLE */
 
-#endif /* SIMPLETRACE_H */
+#endif /* TRACE_SIMPLE_H */

diff --git a/vl.c b/vl.c
index 8c7aaaa1922d710bcb0caf39eb847aec0eb55d91..145d7384d874a541b9a9f5059b7e3807dd3ba61d 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -156,7 +156,7 @@ int main(int argc, char **argv)
 #include "slirp/libslirp.h"
 
 #include "trace.h"
-#include "simpletrace.h"
+#include "trace/simple.h"
 #include "qemu-queue.h"
 #include "cpus.h"
 #include "arch_init.h"