Skip to content

Commit

Permalink
remove TCG includes from common code
Browse files Browse the repository at this point in the history
Enable removing tcg/$tcg_arch from the include path when TCG is disabled.
Move translate-all.h to include/exec, since stubs exist for the functions
defined therein.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
bonzini committed Jan 2, 2021
1 parent 953d5a9 commit 3b9bd3f
Show file tree
Hide file tree
Showing 9 changed files with 5 additions and 9 deletions.
1 change: 0 additions & 1 deletion accel/stubs/tcg-stub.c
Expand Up @@ -12,7 +12,6 @@

#include "qemu/osdep.h"
#include "cpu.h"
#include "tcg/tcg.h"
#include "exec/exec-all.h"

void tb_flush(CPUState *cpu)
Expand Down
2 changes: 1 addition & 1 deletion accel/tcg/cputlb.c
Expand Up @@ -33,7 +33,7 @@
#include "exec/helper-proto.h"
#include "qemu/atomic.h"
#include "qemu/atomic128.h"
#include "translate-all.h"
#include "exec/translate-all.h"
#include "trace/trace-root.h"
#include "trace/mem.h"
#ifdef CONFIG_PLUGIN
Expand Down
2 changes: 1 addition & 1 deletion accel/tcg/translate-all.c
Expand Up @@ -49,7 +49,7 @@

#include "exec/cputlb.h"
#include "exec/tb-hash.h"
#include "translate-all.h"
#include "exec/translate-all.h"
#include "qemu/bitmap.h"
#include "qemu/error-report.h"
#include "qemu/qemu-print.h"
Expand Down
2 changes: 1 addition & 1 deletion accel/tcg/user-exec.c
Expand Up @@ -23,7 +23,7 @@
#include "tcg/tcg.h"
#include "qemu/bitops.h"
#include "exec/cpu_ldst.h"
#include "translate-all.h"
#include "exec/translate-all.h"
#include "exec/helper-proto.h"
#include "qemu/atomic128.h"
#include "trace/trace-root.h"
Expand Down
2 changes: 1 addition & 1 deletion cpu.c
Expand Up @@ -34,7 +34,7 @@
#include "sysemu/tcg.h"
#include "sysemu/kvm.h"
#include "sysemu/replay.h"
#include "translate-all.h"
#include "exec/translate-all.h"
#include "exec/log.h"

uintptr_t qemu_host_page_size;
Expand Down
1 change: 0 additions & 1 deletion hw/i386/kvmvapic.c
Expand Up @@ -21,7 +21,6 @@
#include "hw/sysbus.h"
#include "hw/boards.h"
#include "migration/vmstate.h"
#include "tcg/tcg.h"
#include "qom/object.h"

#define VAPIC_IO_PORT 0x7e
Expand Down
File renamed without changes.
1 change: 0 additions & 1 deletion monitor/misc.c
Expand Up @@ -77,7 +77,6 @@
#include "qapi/qmp-event.h"
#include "sysemu/cpus.h"
#include "qemu/cutils.h"
#include "tcg/tcg.h"

#if defined(TARGET_S390X)
#include "hw/s390x/storage-keys.h"
Expand Down
3 changes: 1 addition & 2 deletions softmmu/physmem.c
Expand Up @@ -25,7 +25,6 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "exec/target_page.h"
#include "tcg/tcg.h"
#include "hw/qdev-core.h"
#include "hw/qdev-properties.h"
#include "hw/boards.h"
Expand Down Expand Up @@ -53,7 +52,7 @@

#include "qemu/rcu_queue.h"
#include "qemu/main-loop.h"
#include "translate-all.h"
#include "exec/translate-all.h"
#include "sysemu/replay.h"

#include "exec/memory-internal.h"
Expand Down

0 comments on commit 3b9bd3f

Please sign in to comment.