| Message ID | 20250424011918.599958-15-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | accel/tcg: Compile tb-maint.c twice | expand |
On 24/4/25 03:19, Richard Henderson wrote: > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/exec/exec-all.h | 4 ---- > include/exec/translation-block.h | 4 ++++ > 2 files changed, 4 insertions(+), 4 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 24/4/25 03:19, Richard Henderson wrote: > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/exec/exec-all.h | 4 ---- > include/exec/translation-block.h | 4 ++++ > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h > index 24383b6aba..90986152df 100644 > --- a/include/exec/exec-all.h > +++ b/include/exec/exec-all.h > @@ -120,10 +120,6 @@ int probe_access_full_mmu(CPUArchState *env, vaddr addr, int size, > #endif /* !CONFIG_USER_ONLY */ > #endif /* CONFIG_TCG */ > > -/* TranslationBlock invalidate API */ > -void tb_invalidate_phys_range(CPUState *cpu, tb_page_addr_t start, > - tb_page_addr_t last); > - > #if !defined(CONFIG_USER_ONLY) We don't need to include "exec/translation-block.h" anymore, please remove it.
On 24/4/25 09:33, Philippe Mathieu-Daudé wrote: > On 24/4/25 03:19, Richard Henderson wrote: >> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> >> --- >> include/exec/exec-all.h | 4 ---- >> include/exec/translation-block.h | 4 ++++ >> 2 files changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h >> index 24383b6aba..90986152df 100644 >> --- a/include/exec/exec-all.h >> +++ b/include/exec/exec-all.h >> @@ -120,10 +120,6 @@ int probe_access_full_mmu(CPUArchState *env, >> vaddr addr, int size, >> #endif /* !CONFIG_USER_ONLY */ >> #endif /* CONFIG_TCG */ >> -/* TranslationBlock invalidate API */ >> -void tb_invalidate_phys_range(CPUState *cpu, tb_page_addr_t start, >> - tb_page_addr_t last); >> - >> #if !defined(CONFIG_USER_ONLY) > > We don't need to include "exec/translation-block.h" anymore, please > remove it. To squash: -- >8 -- diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 90986152df3..4c5ad98c6a9 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -22,4 +22,6 @@ +#include "exec/hwaddr.h" +#include "exec/memattrs.h" #include "exec/mmu-access-type.h" -#include "exec/translation-block.h" +#include "exec/vaddr.h" ---
On 24/4/25 09:36, Philippe Mathieu-Daudé wrote: > On 24/4/25 09:33, Philippe Mathieu-Daudé wrote: >> On 24/4/25 03:19, Richard Henderson wrote: >>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> >>> --- >>> include/exec/exec-all.h | 4 ---- >>> include/exec/translation-block.h | 4 ++++ >>> 2 files changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h >>> index 24383b6aba..90986152df 100644 >>> --- a/include/exec/exec-all.h >>> +++ b/include/exec/exec-all.h >>> @@ -120,10 +120,6 @@ int probe_access_full_mmu(CPUArchState *env, >>> vaddr addr, int size, >>> #endif /* !CONFIG_USER_ONLY */ >>> #endif /* CONFIG_TCG */ >>> -/* TranslationBlock invalidate API */ >>> -void tb_invalidate_phys_range(CPUState *cpu, tb_page_addr_t start, >>> - tb_page_addr_t last); >>> - >>> #if !defined(CONFIG_USER_ONLY) >> >> We don't need to include "exec/translation-block.h" anymore, please >> remove it. > > To squash: > > -- >8 -- > diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h > index 90986152df3..4c5ad98c6a9 100644 > --- a/include/exec/exec-all.h > +++ b/include/exec/exec-all.h > @@ -22,4 +22,6 @@ > > +#include "exec/hwaddr.h" > +#include "exec/memattrs.h" > #include "exec/mmu-access-type.h" > -#include "exec/translation-block.h" > +#include "exec/vaddr.h" > > --- > and because "exec/translation-block.h" includes "exec/cpu-common.h": -- >8 -- diff --git a/accel/stubs/tcg-stub.c b/accel/stubs/tcg-stub.c index b2b9881bdfb..3b76b8b17c1 100644 --- a/accel/stubs/tcg-stub.c +++ b/accel/stubs/tcg-stub.c @@ -13,4 +13,3 @@ #include "qemu/osdep.h" -#include "exec/tb-flush.h" -#include "exec/exec-all.h" +#include "exec/cpu-common.h" ---
On 24/4/25 09:48, Philippe Mathieu-Daudé wrote: > On 24/4/25 09:36, Philippe Mathieu-Daudé wrote: >> On 24/4/25 09:33, Philippe Mathieu-Daudé wrote: >>> On 24/4/25 03:19, Richard Henderson wrote: >>>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> >>>> --- >>>> include/exec/exec-all.h | 4 ---- >>>> include/exec/translation-block.h | 4 ++++ >>>> 2 files changed, 4 insertions(+), 4 deletions(-) >>>> >>>> diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h >>>> index 24383b6aba..90986152df 100644 >>>> --- a/include/exec/exec-all.h >>>> +++ b/include/exec/exec-all.h >>>> @@ -120,10 +120,6 @@ int probe_access_full_mmu(CPUArchState *env, >>>> vaddr addr, int size, >>>> #endif /* !CONFIG_USER_ONLY */ >>>> #endif /* CONFIG_TCG */ >>>> -/* TranslationBlock invalidate API */ >>>> -void tb_invalidate_phys_range(CPUState *cpu, tb_page_addr_t start, >>>> - tb_page_addr_t last); >>>> - >>>> #if !defined(CONFIG_USER_ONLY) >>> >>> We don't need to include "exec/translation-block.h" anymore, please >>> remove it. >> >> To squash: >> >> -- >8 -- >> diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h >> index 90986152df3..4c5ad98c6a9 100644 >> --- a/include/exec/exec-all.h >> +++ b/include/exec/exec-all.h >> @@ -22,4 +22,6 @@ >> >> +#include "exec/hwaddr.h" >> +#include "exec/memattrs.h" >> #include "exec/mmu-access-type.h" >> -#include "exec/translation-block.h" >> +#include "exec/vaddr.h" >> >> --- >> > > and because "exec/translation-block.h" includes "exec/cpu-common.h": > > -- >8 -- > diff --git a/accel/stubs/tcg-stub.c b/accel/stubs/tcg-stub.c > index b2b9881bdfb..3b76b8b17c1 100644 > --- a/accel/stubs/tcg-stub.c > +++ b/accel/stubs/tcg-stub.c > @@ -13,4 +13,3 @@ > #include "qemu/osdep.h" > -#include "exec/tb-flush.h" > -#include "exec/exec-all.h" > +#include "exec/cpu-common.h" > > --- FYI I'll repost this patch updated as v2.
On 4/23/25 18:19, Richard Henderson wrote: > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/exec/exec-all.h | 4 ---- > include/exec/translation-block.h | 4 ++++ > 2 files changed, 4 insertions(+), 4 deletions(-) Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 24383b6aba..90986152df 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -120,10 +120,6 @@ int probe_access_full_mmu(CPUArchState *env, vaddr addr, int size, #endif /* !CONFIG_USER_ONLY */ #endif /* CONFIG_TCG */ -/* TranslationBlock invalidate API */ -void tb_invalidate_phys_range(CPUState *cpu, tb_page_addr_t start, - tb_page_addr_t last); - #if !defined(CONFIG_USER_ONLY) /** diff --git a/include/exec/translation-block.h b/include/exec/translation-block.h index 8b8e730561..cdce399eba 100644 --- a/include/exec/translation-block.h +++ b/include/exec/translation-block.h @@ -207,4 +207,8 @@ static inline void tb_set_page_addr1(TranslationBlock *tb, #endif } +/* TranslationBlock invalidate API */ +void tb_invalidate_phys_range(CPUState *cpu, tb_page_addr_t start, + tb_page_addr_t last); + #endif /* EXEC_TRANSLATION_BLOCK_H */
Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- include/exec/exec-all.h | 4 ---- include/exec/translation-block.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-)