diff options
| -rw-r--r-- | Makefile.objs | 1 | ||||
| -rw-r--r-- | Makefile.target | 7 | ||||
| -rw-r--r-- | accel/tcg/Makefile.objs | 2 | ||||
| -rw-r--r-- | accel/tcg/cpu-exec-common.c (renamed from cpu-exec-common.c) | 0 | ||||
| -rw-r--r-- | accel/tcg/cpu-exec.c (renamed from cpu-exec.c) | 2 | ||||
| -rw-r--r-- | accel/tcg/cputlb.c (renamed from cputlb.c) | 0 | ||||
| -rw-r--r-- | accel/tcg/trace-events | 7 | ||||
| -rw-r--r-- | trace-events | 5 |
8 files changed, 14 insertions, 10 deletions
diff --git a/Makefile.objs b/Makefile.objs index d32f2db34d..871eca80e9 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -162,6 +162,7 @@ trace-events-subdirs += target/ppc trace-events-subdirs += qom trace-events-subdirs += linux-user trace-events-subdirs += qapi +trace-events-subdirs += accel/tcg trace-events-files = $(SRC_PATH)/trace-events $(trace-events-subdirs:%=$(SRC_PATH)/%/trace-events) diff --git a/Makefile.target b/Makefile.target index c3c08ff7cc..18470ddb12 100644 --- a/Makefile.target +++ b/Makefile.target @@ -88,9 +88,9 @@ all: $(PROGS) stap ######################################################### # cpu emulator library -obj-y = exec.o translate-all.o cpu-exec.o +obj-y = exec.o translate-all.o +obj-y += accel/ obj-y += translate-common.o -obj-y += cpu-exec-common.o obj-y += tcg/tcg.o tcg/tcg-op.o tcg/optimize.o obj-$(CONFIG_TCG_INTERPRETER) += tci.o obj-y += tcg/tcg-common.o @@ -143,8 +143,7 @@ obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o obj-y += qtest.o bootdevice.o obj-y += hw/ obj-$(CONFIG_KVM) += kvm-all.o -obj-y += accel/ -obj-y += memory.o cputlb.o +obj-y += memory.o obj-y += memory_mapping.o obj-y += dump.o obj-y += migration/ram.o diff --git a/accel/tcg/Makefile.objs b/accel/tcg/Makefile.objs index 6e3211ade1..940379beb8 100644 --- a/accel/tcg/Makefile.objs +++ b/accel/tcg/Makefile.objs @@ -1 +1,3 @@ obj-$(CONFIG_SOFTMMU) += tcg-all.o +obj-$(CONFIG_SOFTMMU) += cputlb.o +obj-y += cpu-exec.o cpu-exec-common.o diff --git a/cpu-exec-common.c b/accel/tcg/cpu-exec-common.c index e81da276bb..e81da276bb 100644 --- a/cpu-exec-common.c +++ b/accel/tcg/cpu-exec-common.c diff --git a/cpu-exec.c b/accel/tcg/cpu-exec.c index 5b181c18ed..3581618bc0 100644 --- a/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" #include "cpu.h" -#include "trace-root.h" +#include "trace.h" #include "disas/disas.h" #include "exec/exec-all.h" #include "tcg.h" diff --git a/cputlb.c b/accel/tcg/cputlb.c index 743776ae19..743776ae19 100644 --- a/cputlb.c +++ b/accel/tcg/cputlb.c diff --git a/accel/tcg/trace-events b/accel/tcg/trace-events new file mode 100644 index 0000000000..f2db388bdc --- /dev/null +++ b/accel/tcg/trace-events @@ -0,0 +1,7 @@ +# Trace events for debugging and performance instrumentation + +# TCG related tracing (mostly disabled by default) +# cpu-exec.c +disable exec_tb(void *tb, uintptr_t pc) "tb:%p pc=0x%"PRIxPTR +disable exec_tb_nocache(void *tb, uintptr_t pc) "tb:%p pc=0x%"PRIxPTR +disable exec_tb_exit(void *last_tb, unsigned int flags) "tb:%p flags=%x" diff --git a/trace-events b/trace-events index fd83087e39..279aedee1f 100644 --- a/trace-events +++ b/trace-events @@ -69,11 +69,6 @@ kvm_irqchip_update_msi_route(int virq) "Updating MSI route virq=%d" kvm_irqchip_release_virq(int virq) "virq %d" # TCG related tracing (mostly disabled by default) -# cpu-exec.c -disable exec_tb(void *tb, uintptr_t pc) "tb:%p pc=0x%"PRIxPTR -disable exec_tb_nocache(void *tb, uintptr_t pc) "tb:%p pc=0x%"PRIxPTR -disable exec_tb_exit(void *last_tb, unsigned int flags) "tb:%p flags=%x" - # translate-all.c translate_block(void *tb, uintptr_t pc, uint8_t *tb_code) "tb:%p, pc:0x%"PRIxPTR", tb_code:%p" |