| Message ID | 20201216135529.265165-2-pbonzini@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Cleanup includes for no-TCG builds | expand |
On 12/16/20 7:55 AM, Paolo Bonzini wrote: > 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> > --- > accel/stubs/tcg-stub.c | 1 - > accel/tcg/cputlb.c | 2 +- > accel/tcg/translate-all.c | 2 +- > accel/tcg/user-exec.c | 2 +- > cpu.c | 2 +- > hw/i386/kvmvapic.c | 1 - > {accel/tcg => include/exec}/translate-all.h | 0 > monitor/misc.c | 1 - > softmmu/physmem.c | 3 +-- > 9 files changed, 5 insertions(+), 9 deletions(-) > rename {accel/tcg => include/exec}/translate-all.h (100%) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 12/16/20 2:55 PM, Paolo Bonzini wrote: > 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> > --- > accel/stubs/tcg-stub.c | 1 - > accel/tcg/cputlb.c | 2 +- > accel/tcg/translate-all.c | 2 +- > accel/tcg/user-exec.c | 2 +- > cpu.c | 2 +- > hw/i386/kvmvapic.c | 1 - > {accel/tcg => include/exec}/translate-all.h | 0 > monitor/misc.c | 1 - > softmmu/physmem.c | 3 +-- > 9 files changed, 5 insertions(+), 9 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/accel/stubs/tcg-stub.c b/accel/stubs/tcg-stub.c index e4bbf997aa..8c18d3eabd 100644 --- a/accel/stubs/tcg-stub.c +++ b/accel/stubs/tcg-stub.c @@ -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) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 42ab79c1a5..ced3dc077e 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -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 diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index b7d50a73d4..a1803a1026 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -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" diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 4ebe25461a..abb9555201 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -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" diff --git a/cpu.c b/cpu.c index 0c485cdf2d..0b245cda2e 100644 --- a/cpu.c +++ b/cpu.c @@ -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; diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index 077c3f4866..2c1898032e 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -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 diff --git a/accel/tcg/translate-all.h b/include/exec/translate-all.h similarity index 100% rename from accel/tcg/translate-all.h rename to include/exec/translate-all.h diff --git a/monitor/misc.c b/monitor/misc.c index fde6e36a0b..9a132f73d1 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -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" diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 2cd1de4a2c..67b53d39e4 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -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" @@ -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"
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> --- accel/stubs/tcg-stub.c | 1 - accel/tcg/cputlb.c | 2 +- accel/tcg/translate-all.c | 2 +- accel/tcg/user-exec.c | 2 +- cpu.c | 2 +- hw/i386/kvmvapic.c | 1 - {accel/tcg => include/exec}/translate-all.h | 0 monitor/misc.c | 1 - softmmu/physmem.c | 3 +-- 9 files changed, 5 insertions(+), 9 deletions(-) rename {accel/tcg => include/exec}/translate-all.h (100%)