Message ID | 1525376963-79623-43-git-send-email-mst@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 05/03/2018 10:51 PM, Michael S. Tsirkin wrote: > Some places include tcg.h, others tcg/tcg.h. > Let's be consistent. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > --- > include/exec/translator.h | 2 +- > trace/mem.h | 2 +- > accel/stubs/tcg-stub.c | 2 +- > accel/tcg/cputlb.c | 2 +- > accel/tcg/translator.c | 2 +- > disas/tci.c | 2 +- > hw/i386/kvmvapic.c | 2 +- > tcg/tcg-common.c | 2 +- > tcg/tci.c | 2 +- > 9 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/include/exec/translator.h b/include/exec/translator.h > index e2dc2a0..a915953 100644 > --- a/include/exec/translator.h > +++ b/include/exec/translator.h > @@ -20,7 +20,7 @@ > > > #include "exec/exec-all.h" > -#include "tcg/tcg.h" > +#include "tcg.h" > > > /** > diff --git a/trace/mem.h b/trace/mem.h > index 9c88bcb..39a1e21 100644 > --- a/trace/mem.h > +++ b/trace/mem.h > @@ -10,7 +10,7 @@ > #ifndef TRACE__MEM_H > #define TRACE__MEM_H > > -#include "tcg/tcg.h" > +#include "tcg.h" > > > /** > diff --git a/accel/stubs/tcg-stub.c b/accel/stubs/tcg-stub.c > index ee575a8..ab2a372b 100644 > --- a/accel/stubs/tcg-stub.c > +++ b/accel/stubs/tcg-stub.c > @@ -13,7 +13,7 @@ > #include "qemu/osdep.h" > #include "qemu-common.h" > #include "cpu.h" > -#include "tcg/tcg.h" > +#include "tcg.h" > #include "exec/cpu-common.h" > #include "exec/exec-all.h" > > diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c > index 0543903..d295d14 100644 > --- a/accel/tcg/cputlb.c > +++ b/accel/tcg/cputlb.c > @@ -27,7 +27,7 @@ > #include "exec/cputlb.h" > #include "exec/memory-internal.h" > #include "exec/ram_addr.h" > -#include "tcg/tcg.h" > +#include "tcg.h" > #include "qemu/error-report.h" > #include "exec/log.h" > #include "exec/helper-proto.h" > diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c > index 23c6602..01480b9 100644 > --- a/accel/tcg/translator.c > +++ b/accel/tcg/translator.c > @@ -11,7 +11,7 @@ > #include "qemu-common.h" > #include "qemu/error-report.h" > #include "cpu.h" > -#include "tcg/tcg.h" > +#include "tcg.h" > #include "tcg/tcg-op.h" > #include "exec/exec-all.h" > #include "exec/gen-icount.h" > diff --git a/disas/tci.c b/disas/tci.c > index 1cdf5ee..7408a56 100644 > --- a/disas/tci.c > +++ b/disas/tci.c > @@ -20,7 +20,7 @@ > #include "qemu/osdep.h" > #include "qemu-common.h" > #include "disas/bfd.h" > -#include "tcg/tcg.h" > +#include "tcg.h" > > /* Disassemble TCI bytecode. */ > int print_insn_tci(bfd_vma addr, disassemble_info *info) > diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c > index fc962c5..23aef34 100644 > --- a/hw/i386/kvmvapic.c > +++ b/hw/i386/kvmvapic.c > @@ -18,7 +18,7 @@ > #include "sysemu/kvm.h" > #include "hw/i386/apic_internal.h" > #include "hw/sysbus.h" > -#include "tcg/tcg.h" > +#include "tcg.h" > > #define VAPIC_IO_PORT 0x7e > > diff --git a/tcg/tcg-common.c b/tcg/tcg-common.c > index 2f139de..d80cbec 100644 > --- a/tcg/tcg-common.c > +++ b/tcg/tcg-common.c > @@ -25,7 +25,7 @@ > #include "qemu/osdep.h" > #include "qemu-common.h" > #include "exec/cpu-common.h" > -#include "tcg/tcg.h" > +#include "tcg.h" > > #if defined(CONFIG_TCG_INTERPRETER) > uintptr_t tci_tb_ptr; > diff --git a/tcg/tci.c b/tcg/tci.c > index 33edca1..2d11dc6 100644 > --- a/tcg/tci.c > +++ b/tcg/tci.c > @@ -28,7 +28,7 @@ > #endif > > #include "qemu-common.h" > -#include "tcg/tcg.h" /* MAX_OPC_PARAM_IARGS */ > +#include "tcg.h" /* MAX_OPC_PARAM_IARGS */ > #include "exec/cpu_ldst.h" > #include "tcg-op.h" > Reviewed-by: Marcel Apfelbaum<marcel.apfelbaum@gmail.com> Thanks, Marcel
diff --git a/include/exec/translator.h b/include/exec/translator.h index e2dc2a0..a915953 100644 --- a/include/exec/translator.h +++ b/include/exec/translator.h @@ -20,7 +20,7 @@ #include "exec/exec-all.h" -#include "tcg/tcg.h" +#include "tcg.h" /** diff --git a/trace/mem.h b/trace/mem.h index 9c88bcb..39a1e21 100644 --- a/trace/mem.h +++ b/trace/mem.h @@ -10,7 +10,7 @@ #ifndef TRACE__MEM_H #define TRACE__MEM_H -#include "tcg/tcg.h" +#include "tcg.h" /** diff --git a/accel/stubs/tcg-stub.c b/accel/stubs/tcg-stub.c index ee575a8..ab2a372b 100644 --- a/accel/stubs/tcg-stub.c +++ b/accel/stubs/tcg-stub.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "cpu.h" -#include "tcg/tcg.h" +#include "tcg.h" #include "exec/cpu-common.h" #include "exec/exec-all.h" diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 0543903..d295d14 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -27,7 +27,7 @@ #include "exec/cputlb.h" #include "exec/memory-internal.h" #include "exec/ram_addr.h" -#include "tcg/tcg.h" +#include "tcg.h" #include "qemu/error-report.h" #include "exec/log.h" #include "exec/helper-proto.h" diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index 23c6602..01480b9 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -11,7 +11,7 @@ #include "qemu-common.h" #include "qemu/error-report.h" #include "cpu.h" -#include "tcg/tcg.h" +#include "tcg.h" #include "tcg/tcg-op.h" #include "exec/exec-all.h" #include "exec/gen-icount.h" diff --git a/disas/tci.c b/disas/tci.c index 1cdf5ee..7408a56 100644 --- a/disas/tci.c +++ b/disas/tci.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "disas/bfd.h" -#include "tcg/tcg.h" +#include "tcg.h" /* Disassemble TCI bytecode. */ int print_insn_tci(bfd_vma addr, disassemble_info *info) diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index fc962c5..23aef34 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -18,7 +18,7 @@ #include "sysemu/kvm.h" #include "hw/i386/apic_internal.h" #include "hw/sysbus.h" -#include "tcg/tcg.h" +#include "tcg.h" #define VAPIC_IO_PORT 0x7e diff --git a/tcg/tcg-common.c b/tcg/tcg-common.c index 2f139de..d80cbec 100644 --- a/tcg/tcg-common.c +++ b/tcg/tcg-common.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "exec/cpu-common.h" -#include "tcg/tcg.h" +#include "tcg.h" #if defined(CONFIG_TCG_INTERPRETER) uintptr_t tci_tb_ptr; diff --git a/tcg/tci.c b/tcg/tci.c index 33edca1..2d11dc6 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -28,7 +28,7 @@ #endif #include "qemu-common.h" -#include "tcg/tcg.h" /* MAX_OPC_PARAM_IARGS */ +#include "tcg.h" /* MAX_OPC_PARAM_IARGS */ #include "exec/cpu_ldst.h" #include "tcg-op.h"
Some places include tcg.h, others tcg/tcg.h. Let's be consistent. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- include/exec/translator.h | 2 +- trace/mem.h | 2 +- accel/stubs/tcg-stub.c | 2 +- accel/tcg/cputlb.c | 2 +- accel/tcg/translator.c | 2 +- disas/tci.c | 2 +- hw/i386/kvmvapic.c | 2 +- tcg/tcg-common.c | 2 +- tcg/tci.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)