On 3/7/25 10:56, Richard Henderson wrote:
> All that is required is to avoid including exec-all.h.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> accel/tcg/tcg-accel-ops-icount.c | 2 +-
> accel/tcg/meson.build | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/accel/tcg/tcg-accel-ops-icount.c b/accel/tcg/tcg-accel-ops-icount.c
> index d6b472a0b0..27cf1044c7 100644
> --- a/accel/tcg/tcg-accel-ops-icount.c
> +++ b/accel/tcg/tcg-accel-ops-icount.c
> @@ -28,7 +28,7 @@
> #include "system/cpu-timers.h"
> #include "qemu/main-loop.h"
> #include "qemu/guest-random.h"
> -#include "exec/exec-all.h"
> +#include "hw/core/cpu.h"
>
> #include "tcg-accel-ops.h"
> #include "tcg-accel-ops-icount.h"
> diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build
> index 70ada21f42..891b724eb6 100644
> --- a/accel/tcg/meson.build
> +++ b/accel/tcg/meson.build
> @@ -21,7 +21,6 @@ specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss)
> specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
> 'cputlb.c',
> 'tcg-accel-ops-mttcg.c',
> - 'tcg-accel-ops-icount.c',
> 'tcg-accel-ops-rr.c',
> ))
>
> @@ -29,5 +28,6 @@ system_ss.add(when: ['CONFIG_TCG'], if_true: files(
> 'icount-common.c',
> 'monitor.c',
> 'tcg-accel-ops.c',
> + 'tcg-accel-ops-icount.c',
> 'watchpoint.c',
> ))
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>