Re: [PATCH v7 07/14] target/s390x: start moving TCG-only code to tcg/

[Thomas Huth]

On 07/07/2021 12.53, Cho, Yu-Chen wrote:
> move everything related to translate, as well as HELPER code in tcg/
>
> mmu_helper.c stays put for now, as it contains both TCG and KVM code.
>
> After the reshuffling, update MAINTAINERS accordingly.
> Make use of the new directory:
>
> target/s390x/tcg/
>
> Signed-off-by: Claudio Fontana <cfontana@suse.de>
> Signed-off-by: Cho, Yu-Chen <acho@suse.com>
> Acked-by: David Hildenbrand <david@redhat.com>
> Acked-by: Cornelia Huck <cohuck@redhat.com>
> ---
>   MAINTAINERS                                |  1 +
>   hw/s390x/tod-tcg.c                         |  2 +-
>   include/hw/s390x/tod.h                     |  2 +-
>   target/s390x/interrupt.c                   |  2 +-
>   target/s390x/machine.c                     |  2 +-
>   target/s390x/meson.build                   | 17 ++---------------
>   target/s390x/{ => tcg}/cc_helper.c         |  0
>   target/s390x/{ => tcg}/crypto_helper.c     |  0
>   target/s390x/{ => tcg}/excp_helper.c       |  0
>   target/s390x/{ => tcg}/fpu_helper.c        |  0
>   target/s390x/{ => tcg}/insn-data.def       |  0
>   target/s390x/{ => tcg}/insn-format.def     |  0
>   target/s390x/{ => tcg}/int_helper.c        |  0
>   target/s390x/{ => tcg}/mem_helper.c        |  0
>   target/s390x/tcg/meson.build               | 14 ++++++++++++++
>   target/s390x/{ => tcg}/misc_helper.c       |  0
>   target/s390x/{ => tcg}/s390-tod.h          |  0
>   target/s390x/{ => tcg}/tcg_s390x.h         |  0
>   target/s390x/{ => tcg}/translate.c         |  0
>   target/s390x/{ => tcg}/translate_vx.c.inc  |  0
>   target/s390x/{ => tcg}/vec.h               |  0
>   target/s390x/{ => tcg}/vec_fpu_helper.c    |  0
>   target/s390x/{ => tcg}/vec_helper.c        |  0
>   target/s390x/{ => tcg}/vec_int_helper.c    |  0
>   target/s390x/{ => tcg}/vec_string_helper.c |  0
>   25 files changed, 21 insertions(+), 19 deletions(-)
>   rename target/s390x/{ => tcg}/cc_helper.c (100%)
>   rename target/s390x/{ => tcg}/crypto_helper.c (100%)
>   rename target/s390x/{ => tcg}/excp_helper.c (100%)
>   rename target/s390x/{ => tcg}/fpu_helper.c (100%)
>   rename target/s390x/{ => tcg}/insn-data.def (100%)
>   rename target/s390x/{ => tcg}/insn-format.def (100%)
>   rename target/s390x/{ => tcg}/int_helper.c (100%)
>   rename target/s390x/{ => tcg}/mem_helper.c (100%)
>   create mode 100644 target/s390x/tcg/meson.build
>   rename target/s390x/{ => tcg}/misc_helper.c (100%)
>   rename target/s390x/{ => tcg}/s390-tod.h (100%)
[...]
> diff --git a/include/hw/s390x/tod.h b/include/hw/s390x/tod.h
> index ff3195a4bf..0935e85089 100644
> --- a/include/hw/s390x/tod.h
> +++ b/include/hw/s390x/tod.h
> @@ -12,7 +12,7 @@
>   #define HW_S390_TOD_H
>   
>   #include "hw/qdev-core.h"
> -#include "target/s390x/s390-tod.h"
> +#include "tcg/s390-tod.h"

Technically, s390-tod.h is not specific to tcg, so I'm not sure whether we 
really want to move it ... maybe it would even be possible to merge its 
contents into include/hw/s390x/tod.h instead .... but we can still clean 
that up later, so FWIW:

Reviewed-by: Thomas Huth <thuth@redhat.com>