Re: [PATCH v7 00/14] s390x cleanup

[Cornelia Huck]

On Wed, Jul 07 2021, "Cho, Yu-Chen" <acho@suse.com> wrote:

> this is the next version of a cleanup series for s390x.
>
> v6 -> v7:
>
> * "hw/s390x: rename tod-qemu.c to tod-tcg.c" #2
>   - change the comment at the top of the file:
>     "TCG implementation" instead of "QEMU implementation"
>     (Thomas)
>
> * "hw/s390x: only build tod-tcg from the CONFIG_TCG build" #3
>   - swap the order of the patch 03 to 04 (Thomas)
>
> * "hw/s390x: tod: make explicit checks for accelerators when
>   initializing" #4
>   - swap the order of the patch 04 to 03 (Thomas)
>
> * "target/s390x: rename internal.h to s390x-internal.h"
>   - Separate from "target/s390x: start moving TCG-only code to tcg/"
>     (Thomas)
>
> * "target/s390x: start moving TCG-only code to tcg/" #6->#7
>   - remove the part of rename internal.h to s390x-internal.h
>   - remove s390_cpu_*() in s390x-internal.h to next patch
>     (Thomas)
>
> * "target/s390x: move sysemu-only code out to cpu-sysemu.c" #7->#8
>   - add s390_cpu_*() to s390x-internal.h (Thomas)
>
> * "target/s390x: split cpu-dump from helper.c" #8->#9
>   - move s390_cpu_set_psw and s390_cpu_get_psw_mask() to cpu.c
>     (Thomas)
>
> * "target/s390x: make helper.c sysemu-only" #9->#10
>   - fixed typo: s/systemu/sysemu/
>
> * "target/s390x: move kvm files into kvm/" #12->#13
>   - remove the include header change in target/s390x/kvm/kvm.c
>     (Thomas)
>
> v5 -> v6:
>
> * "target/s390x: start moving TCG-only code to tcg/"
>   - keep the old pattern in MAINTAINERS (Cornelia)
>
> * "target/s390x: make helper.c sysemu-only"
>   - fixed typo
>
> v4 -> v5:
> * "target/s390x: start moving TCG-only code to tcg/"
>   - add change to MAINTAINERS file
>
> * "target/s390x: move sysemu-only code out to cpu-sysemu.c"
>   - make use of SysemuCPUOps s390_sysemu_ops to handle
>
> * "target/s390x: split cpu-dump from helper.c"
>   - add description to explain why split cpu-dump from helper.c
>
> * "target/s390x: make helper.c sysemu-only"
>   - mention at the beginning of this file that this is sysemu only
>     (Cornelia)
>
> * "target/s390x: remove kvm-stub.c"
>   - add additional comment to explain the function can be
>     removed (Thomas)
>
> * "target/s390x: move kvm files into kvm/"
>    - add change to MAINTAINERS file
>
> * "target/s390x: split sysemu part of cpu models"
>    - add change to MAINTAINERS file
>
> * "MAINTAINERS: update s390x directories"
>   - removed, squash this in respectively:
>     #6 target/s390x: start moving TCG-only code to tcg/
>     #12 target/s390x: move kvm files into kvm/
>     #13 target/s390x: split sysemu part of cpu models
>
> v3 -> v4: take s390x part from Claudio and modify for the current master
>
> * "target/s390x: meson: add target_user_arch"
>   - new patch, add target_user_arch to avoid the proliferation of #ifdef
> in target code.
>
> v2 -> v3: minor changes
>
> * "hw/s390x: rename tod-qemu.c to tod-tcg.c": move to the front (David)
>
> * "hw/s390x: only build tod-qemu from the CONFIG_TCG build"
>   - move just after, use "tod-tcg" instead
>
> * "hw/s390x: tod: make explicit checks for accelerators when initializing"
>   - removed a line break in commit message
>
> * "target/s390x: start moving TCG-only code to tcg/"
>   - split the rename s390x-internal.h rename part, do it before the move
>
> * "target/s390x: move kvm files into kvm/"
>   - fix broken/missing move of trace events
>
> Cho, Yu-Chen (14):
>   target/s390x: meson: add target_user_arch
>   hw/s390x: rename tod-qemu.c to tod-tcg.c
>   hw/s390x: tod: make explicit checks for accelerators when initializing
>   hw/s390x: only build tod-tcg from the CONFIG_TCG build
>   target/s390x: remove tcg-stub.c
>   target/s390x: rename internal.h to s390x-internal.h
>   target/s390x: start moving TCG-only code to tcg/
>   target/s390x: move sysemu-only code out to cpu-sysemu.c
>   target/s390x: split cpu-dump from helper.c
>   target/s390x: make helper.c sysemu-only
>   target/s390x: use kvm_enabled() to wrap call to kvm_s390_get_hpage_1m
>   target/s390x: remove kvm-stub.c
>   target/s390x: move kvm files into kvm/
>   target/s390x: split sysemu part of cpu models
>
>  MAINTAINERS                                   |   6 +-
>  hw/intc/s390_flic_kvm.c                       |   2 +-
>  hw/s390x/meson.build                          |   4 +-
>  hw/s390x/s390-stattrib-kvm.c                  |   2 +-
>  hw/s390x/tod-kvm.c                            |   2 +-
>  hw/s390x/{tod-qemu.c => tod-tcg.c}            |   4 +-
>  hw/s390x/tod.c                                |   9 +-
>  hw/vfio/ap.c                                  |   2 +-
>  include/hw/s390x/tod.h                        |   2 +-
>  meson.build                                   |   1 +
>  target/s390x/arch_dump.c                      |   2 +-
>  target/s390x/cpu-dump.c                       | 134 ++++++
>  target/s390x/cpu-sysemu.c                     | 309 +++++++++++++
>  target/s390x/cpu.c                            | 332 +++-----------
>  target/s390x/cpu_models.c                     | 421 +----------------
>  target/s390x/cpu_models_sysemu.c              | 426 ++++++++++++++++++
>  target/s390x/cpu_models_user.c                |  20 +
>  target/s390x/diag.c                           |   7 +-
>  target/s390x/gdbstub.c                        |   2 +-
>  target/s390x/helper.c                         | 162 +------
>  target/s390x/interrupt.c                      |   6 +-
>  target/s390x/ioinst.c                         |   2 +-
>  target/s390x/kvm-stub.c                       | 121 -----
>  target/s390x/{ => kvm}/kvm.c                  |   2 +-
>  target/s390x/{ => kvm}/kvm_s390x.h            |   0
>  target/s390x/kvm/meson.build                  |  17 +
>  target/s390x/kvm/trace-events                 |   7 +
>  target/s390x/kvm/trace.h                      |   1 +
>  target/s390x/machine.c                        |   6 +-
>  target/s390x/meson.build                      |  42 +-
>  target/s390x/mmu_helper.c                     |   4 +-
>  target/s390x/{internal.h => s390x-internal.h} |   8 +
>  target/s390x/sigp.c                           |   2 +-
>  target/s390x/tcg-stub.c                       |  30 --
>  target/s390x/{ => tcg}/cc_helper.c            |   2 +-
>  target/s390x/{ => tcg}/crypto_helper.c        |   2 +-
>  target/s390x/{ => tcg}/excp_helper.c          |   2 +-
>  target/s390x/{ => tcg}/fpu_helper.c           |   2 +-
>  target/s390x/{ => tcg}/insn-data.def          |   0
>  target/s390x/{ => tcg}/insn-format.def        |   0
>  target/s390x/{ => tcg}/int_helper.c           |   2 +-
>  target/s390x/{ => tcg}/mem_helper.c           |   2 +-
>  target/s390x/tcg/meson.build                  |  14 +
>  target/s390x/{ => tcg}/misc_helper.c          |   2 +-
>  target/s390x/{ => tcg}/s390-tod.h             |   0
>  target/s390x/{ => tcg}/tcg_s390x.h            |   0
>  target/s390x/{ => tcg}/translate.c            |   2 +-
>  target/s390x/{ => tcg}/translate_vx.c.inc     |   0
>  target/s390x/{ => tcg}/vec.h                  |   0
>  target/s390x/{ => tcg}/vec_fpu_helper.c       |   2 +-
>  target/s390x/{ => tcg}/vec_helper.c           |   2 +-
>  target/s390x/{ => tcg}/vec_int_helper.c       |   0
>  target/s390x/{ => tcg}/vec_string_helper.c    |   2 +-
>  target/s390x/trace-events                     |   8 +-
>  54 files changed, 1058 insertions(+), 1083 deletions(-)
>  rename hw/s390x/{tod-qemu.c => tod-tcg.c} (96%)
>  create mode 100644 target/s390x/cpu-dump.c
>  create mode 100644 target/s390x/cpu-sysemu.c
>  create mode 100644 target/s390x/cpu_models_sysemu.c
>  create mode 100644 target/s390x/cpu_models_user.c
>  delete mode 100644 target/s390x/kvm-stub.c
>  rename target/s390x/{ => kvm}/kvm.c (99%)
>  rename target/s390x/{ => kvm}/kvm_s390x.h (100%)
>  create mode 100644 target/s390x/kvm/meson.build
>  create mode 100644 target/s390x/kvm/trace-events
>  create mode 100644 target/s390x/kvm/trace.h
>  rename target/s390x/{internal.h => s390x-internal.h} (97%)
>  delete mode 100644 target/s390x/tcg-stub.c
>  rename target/s390x/{ => tcg}/cc_helper.c (99%)
>  rename target/s390x/{ => tcg}/crypto_helper.c (98%)
>  rename target/s390x/{ => tcg}/excp_helper.c (99%)
>  rename target/s390x/{ => tcg}/fpu_helper.c (99%)
>  rename target/s390x/{ => tcg}/insn-data.def (100%)
>  rename target/s390x/{ => tcg}/insn-format.def (100%)
>  rename target/s390x/{ => tcg}/int_helper.c (99%)
>  rename target/s390x/{ => tcg}/mem_helper.c (99%)
>  create mode 100644 target/s390x/tcg/meson.build
>  rename target/s390x/{ => tcg}/misc_helper.c (99%)
>  rename target/s390x/{ => tcg}/s390-tod.h (100%)
>  rename target/s390x/{ => tcg}/tcg_s390x.h (100%)
>  rename target/s390x/{ => tcg}/translate.c (99%)
>  rename target/s390x/{ => tcg}/translate_vx.c.inc (100%)
>  rename target/s390x/{ => tcg}/vec.h (100%)
>  rename target/s390x/{ => tcg}/vec_fpu_helper.c (99%)
>  rename target/s390x/{ => tcg}/vec_helper.c (99%)
>  rename target/s390x/{ => tcg}/vec_int_helper.c (100%)
>  rename target/s390x/{ => tcg}/vec_string_helper.c (99%)

Thanks, applied.