mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
trace: move backend-specific code into the trace/ directory
Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
This commit is contained in:
parent
09001ee7b2
commit
edb47ec498
1
Makefile
1
Makefile
|
@ -209,6 +209,7 @@ clean:
|
||||||
rm -Rf .libs
|
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 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 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.c trace.h trace.c-timestamp trace.h-timestamp
|
||||||
rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
|
rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
|
||||||
rm -f trace-dtrace.h trace-dtrace.h-timestamp
|
rm -f trace-dtrace.h trace-dtrace.h-timestamp
|
||||||
|
|
|
@ -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")
|
$(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC dtrace -o $@ -G -s $<, " lt GEN trace-dtrace.o")
|
||||||
endif
|
endif
|
||||||
|
|
||||||
simpletrace.o: simpletrace.c $(GENERATED_HEADERS)
|
trace/simple.o: trace/simple.c $(GENERATED_HEADERS)
|
||||||
|
|
||||||
trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
|
trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
|
||||||
ifneq ($(TRACE_BACKEND),dtrace)
|
ifneq ($(TRACE_BACKEND),dtrace)
|
||||||
trace-obj-y = trace.o
|
trace-obj-y = trace.o
|
||||||
endif
|
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-$(CONFIG_TRACE_SIMPLE) += qemu-timer-common.o
|
||||||
|
|
||||||
|
trace-obj-y += $(addprefix trace/, $(trace-nested-y))
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
# smartcard
|
# smartcard
|
||||||
|
|
||||||
|
|
|
@ -158,7 +158,7 @@ linetoc_end_nop()
|
||||||
linetoh_begin_simple()
|
linetoh_begin_simple()
|
||||||
{
|
{
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
#include "simpletrace.h"
|
#include "trace/simple.h"
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
simple_event_num=0
|
simple_event_num=0
|
||||||
|
|
|
@ -8,8 +8,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef SIMPLETRACE_H
|
#ifndef TRACE_SIMPLE_H
|
||||||
#define SIMPLETRACE_H
|
#define TRACE_SIMPLE_H
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
@ -45,4 +45,4 @@ static inline bool st_init(const char *file)
|
||||||
}
|
}
|
||||||
#endif /* !CONFIG_TRACE_SIMPLE */
|
#endif /* !CONFIG_TRACE_SIMPLE */
|
||||||
|
|
||||||
#endif /* SIMPLETRACE_H */
|
#endif /* TRACE_SIMPLE_H */
|
2
vl.c
2
vl.c
|
@ -156,7 +156,7 @@ int main(int argc, char **argv)
|
||||||
#include "slirp/libslirp.h"
|
#include "slirp/libslirp.h"
|
||||||
|
|
||||||
#include "trace.h"
|
#include "trace.h"
|
||||||
#include "simpletrace.h"
|
#include "trace/simple.h"
|
||||||
#include "qemu-queue.h"
|
#include "qemu-queue.h"
|
||||||
#include "cpus.h"
|
#include "cpus.h"
|
||||||
#include "arch_init.h"
|
#include "arch_init.h"
|
||||||
|
|
Loading…
Reference in a new issue