Re: [RFC v4 09/14] target/s390x: make helper.c sysemu-only

[Cornelia Huck]

On Mon, May 24 2021, "Cho, Yu-Chen" <acho@suse.com> wrote:

> Now that we have moved cpu-dump functionality out of helper.c,
> we can make the module sysemu-only.
>
> Signed-off-by: Claudio Fontana <cfontana@suse.de>
> Signed-off-by: Cho, Yu-Chen <acho@suse.com>
> ---
>  target/s390x/helper.c    | 4 ----
>  target/s390x/meson.build | 2 +-
>  2 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/target/s390x/helper.c b/target/s390x/helper.c
> index 41ccc83d11..f246bec353 100644
> --- a/target/s390x/helper.c
> +++ b/target/s390x/helper.c

Maybe mention at the beginning of this file that this is sysemu only?

> @@ -27,11 +27,8 @@
>  #include "hw/s390x/pv.h"
>  #include "sysemu/hw_accel.h"
>  #include "sysemu/runstate.h"
> -#ifndef CONFIG_USER_ONLY
>  #include "sysemu/tcg.h"
> -#endif
>  
> -#ifndef CONFIG_USER_ONLY
>  void s390x_tod_timer(void *opaque)
>  {
>      cpu_inject_clock_comparator((S390CPU *) opaque);
> @@ -322,4 +319,3 @@ int s390_store_adtl_status(S390CPU *cpu, hwaddr addr, 
> hwaddr len)
>      cpu_physical_memory_unmap(sa, len, 1, len);
>      return 0;
>  }
> -#endif /* CONFIG_USER_ONLY */

Acked-by: Cornelia Huck <cohuck@redhat.com>