[PATCH v11 00/25] i386 cleanup PART 1

Claudio Fontana posted 25 patches 3 years, 4 months ago
Test checkpatch failed
Failed in applying to current master (apply log)
There is a newer version of this series
meson.build                           |   1 +
accel/tcg/tcg-cpus-icount.h           |  17 +
accel/tcg/tcg-cpus-rr.h               |  21 +
accel/tcg/tcg-cpus.h                  |  12 +-
include/hw/core/cpu.h                 |  73 ++--
include/hw/core/tcg-cpu-ops.h         |  81 ++++
target/i386/cpu.h                     | 100 +----
target/i386/{ => hax}/hax-cpus.h      |   0
target/i386/{ => hax}/hax-i386.h      |   6 +-
target/i386/{ => hax}/hax-interface.h |   0
target/i386/{ => hax}/hax-posix.h     |   0
target/i386/{ => hax}/hax-windows.h   |   0
target/i386/{ => kvm}/hyperv-proto.h  |   0
target/i386/{ => kvm}/hyperv.h        |   0
target/i386/{ => kvm}/kvm_i386.h      |   0
target/i386/kvm/trace.h               |   1 +
target/i386/tcg/helper-tcg.h          | 112 ++++++
target/i386/tcg/tcg-cpu.h             |  15 +
target/i386/{ => whpx}/whp-dispatch.h |   0
target/i386/{ => whpx}/whpx-cpus.h    |   0
accel/tcg/cpu-exec.c                  |  70 +++-
accel/tcg/cputlb.c                    |   6 +-
accel/tcg/tcg-all.c                   |  13 +-
accel/tcg/tcg-cpus-icount.c           | 147 +++++++
accel/tcg/tcg-cpus-mttcg.c            | 140 +++++++
accel/tcg/tcg-cpus-rr.c               | 305 +++++++++++++++
accel/tcg/tcg-cpus.c                  | 504 +-----------------------
accel/tcg/user-exec.c                 |   6 +-
cpu.c                                 |  66 ++--
hw/core/cpu.c                         |  19 +-
hw/i386/fw_cfg.c                      |   2 +-
hw/i386/intel_iommu.c                 |   2 +-
hw/i386/kvm/apic.c                    |   2 +-
hw/i386/kvm/clock.c                   |   2 +-
hw/i386/microvm.c                     |   2 +-
hw/i386/pc.c                          |   2 +-
hw/i386/x86.c                         |   2 +-
hw/mips/jazz.c                        |   9 +-
softmmu/icount.c                      |   2 +-
target/alpha/cpu.c                    |  12 +-
target/arm/cpu.c                      |  22 +-
target/arm/cpu64.c                    |   5 +-
target/arm/cpu_tcg.c                  |  10 +-
target/arm/helper.c                   |   4 +
target/arm/kvm64.c                    |   6 +-
target/avr/cpu.c                      |  10 +-
target/avr/helper.c                   |   4 +-
target/cris/cpu.c                     |  28 +-
target/cris/helper.c                  |   4 +-
target/hppa/cpu.c                     |  14 +-
target/i386/cpu-dump.c                | 537 +++++++++++++++++++++++++
target/i386/cpu.c                     |  35 +-
target/i386/{ => hax}/hax-all.c       |   0
target/i386/{ => hax}/hax-cpus.c      |   0
target/i386/{ => hax}/hax-mem.c       |   0
target/i386/{ => hax}/hax-posix.c     |   0
target/i386/{ => hax}/hax-windows.c   |   0
target/i386/helper.c                  | 539 +-------------------------
target/i386/{ => kvm}/hyperv-stub.c   |   0
target/i386/{ => kvm}/hyperv.c        |   0
target/i386/{ => kvm}/kvm-stub.c      |   0
target/i386/{ => kvm}/kvm.c           |   0
target/i386/machine.c                 |   4 +-
target/i386/{ => tcg}/bpt_helper.c    |   1 +
target/i386/{ => tcg}/cc_helper.c     |   1 +
target/i386/{ => tcg}/excp_helper.c   |   1 +
target/i386/{ => tcg}/fpu_helper.c    |  33 +-
target/i386/{ => tcg}/int_helper.c    |   1 +
target/i386/{ => tcg}/mem_helper.c    |   1 +
target/i386/{ => tcg}/misc_helper.c   |   1 +
target/i386/{ => tcg}/mpx_helper.c    |   1 +
target/i386/{ => tcg}/seg_helper.c    |   1 +
target/i386/{ => tcg}/smm_helper.c    |   2 +
target/i386/{ => tcg}/svm_helper.c    |   1 +
target/i386/tcg/tcg-cpu.c             |  71 ++++
target/i386/{ => tcg}/tcg-stub.c      |   0
target/i386/{ => tcg}/translate.c     |   1 +
target/i386/{ => whpx}/whpx-all.c     |   0
target/i386/{ => whpx}/whpx-cpus.c    |   0
target/lm32/cpu.c                     |  10 +-
target/m68k/cpu.c                     |  10 +-
target/microblaze/cpu.c               |  14 +-
target/mips/cpu.c                     |  21 +-
target/moxie/cpu.c                    |   6 +-
target/nios2/cpu.c                    |  10 +-
target/openrisc/cpu.c                 |   8 +-
target/riscv/cpu.c                    |  17 +-
target/riscv/cpu_helper.c             |   2 +-
target/rx/cpu.c                       |  10 +-
target/s390x/cpu.c                    |  12 +-
target/s390x/excp_helper.c            |   2 +-
target/sh4/cpu.c                      |  12 +-
target/sparc/cpu.c                    |  14 +-
target/tilegx/cpu.c                   |   8 +-
target/tricore/cpu.c                  |   6 +-
target/unicore32/cpu.c                |   8 +-
target/xtensa/cpu.c                   |  14 +-
target/xtensa/helper.c                |   4 +-
MAINTAINERS                           |  11 +-
accel/tcg/meson.build                 |   9 +-
target/i386/hax/meson.build           |   7 +
target/i386/kvm/meson.build           |   3 +
target/i386/kvm/trace-events          |   7 +
target/i386/meson.build               |  32 +-
target/i386/tcg/meson.build           |  14 +
target/i386/trace-events              |   6 -
target/i386/whpx/meson.build          |   4 +
target/ppc/translate_init.c.inc       |  24 +-
108 files changed, 1901 insertions(+), 1494 deletions(-)
create mode 100644 accel/tcg/tcg-cpus-icount.h
create mode 100644 accel/tcg/tcg-cpus-rr.h
create mode 100644 include/hw/core/tcg-cpu-ops.h
rename target/i386/{ => hax}/hax-cpus.h (100%)
rename target/i386/{ => hax}/hax-i386.h (95%)
rename target/i386/{ => hax}/hax-interface.h (100%)
rename target/i386/{ => hax}/hax-posix.h (100%)
rename target/i386/{ => hax}/hax-windows.h (100%)
rename target/i386/{ => kvm}/hyperv-proto.h (100%)
rename target/i386/{ => kvm}/hyperv.h (100%)
rename target/i386/{ => kvm}/kvm_i386.h (100%)
create mode 100644 target/i386/kvm/trace.h
create mode 100644 target/i386/tcg/helper-tcg.h
create mode 100644 target/i386/tcg/tcg-cpu.h
rename target/i386/{ => whpx}/whp-dispatch.h (100%)
rename target/i386/{ => whpx}/whpx-cpus.h (100%)
create mode 100644 accel/tcg/tcg-cpus-icount.c
create mode 100644 accel/tcg/tcg-cpus-mttcg.c
create mode 100644 accel/tcg/tcg-cpus-rr.c
create mode 100644 target/i386/cpu-dump.c
rename target/i386/{ => hax}/hax-all.c (100%)
rename target/i386/{ => hax}/hax-cpus.c (100%)
rename target/i386/{ => hax}/hax-mem.c (100%)
rename target/i386/{ => hax}/hax-posix.c (100%)
rename target/i386/{ => hax}/hax-windows.c (100%)
rename target/i386/{ => kvm}/hyperv-stub.c (100%)
rename target/i386/{ => kvm}/hyperv.c (100%)
rename target/i386/{ => kvm}/kvm-stub.c (100%)
rename target/i386/{ => kvm}/kvm.c (100%)
rename target/i386/{ => tcg}/bpt_helper.c (99%)
rename target/i386/{ => tcg}/cc_helper.c (99%)
rename target/i386/{ => tcg}/excp_helper.c (99%)
rename target/i386/{ => tcg}/fpu_helper.c (99%)
rename target/i386/{ => tcg}/int_helper.c (99%)
rename target/i386/{ => tcg}/mem_helper.c (99%)
rename target/i386/{ => tcg}/misc_helper.c (99%)
rename target/i386/{ => tcg}/mpx_helper.c (99%)
rename target/i386/{ => tcg}/seg_helper.c (99%)
rename target/i386/{ => tcg}/smm_helper.c (99%)
rename target/i386/{ => tcg}/svm_helper.c (99%)
create mode 100644 target/i386/tcg/tcg-cpu.c
rename target/i386/{ => tcg}/tcg-stub.c (100%)
rename target/i386/{ => tcg}/translate.c (99%)
rename target/i386/{ => whpx}/whpx-all.c (100%)
rename target/i386/{ => whpx}/whpx-cpus.c (100%)
create mode 100644 target/i386/hax/meson.build
create mode 100644 target/i386/kvm/meson.build
create mode 100644 target/i386/kvm/trace-events
create mode 100644 target/i386/tcg/meson.build
create mode 100644 target/i386/whpx/meson.build
[PATCH v11 00/25] i386 cleanup PART 1
Posted by Claudio Fontana 3 years, 4 months ago
Hello, this is version 11 of the cleanup.

The series has been split into two separate parts,
and this is PART 1.

v10 -> v11: small tweaks for !CONFIG_USER_ONLY

* make transaction_failed and do_unaligned_access
  consistently !CONFIG_USER_ONLY.

* hw/mips/jazz: wrap mips_jazz_do_transaction_failed in
  CONFIG_TCG && !CONFIG_USER_ONLY

* arm: wrap arm_cpu_synchronize_from_tb in CONFIG_TCG
* arm: wrap arm_v7m_exec_interrupt in CONFIG_TCG
* mips: wrap mips_cpu_synchronize_from_tb in CONFIG_TCG
* mips: do not make mips_cpu_do_interrupt !CONFIG_USER_ONLY
* ppc: protect cpu_exec_enter/exit in CONFIG_TCG

v9 -> v10: minor tweaks and fixes

* in "i386: split cpu accelerators from cpu.c",

use kvm/kvm-cpu.c, hvf/hvf-cpu.c, tcg/tcg-cpu.c.
Easier to understand compared to editing multiple cpu.c files,
and matches the header files if needed (kvm-cpu.h).

* in "accel: replace struct CpusAccel with AccelOpsClass",

make it a bit more consistent, by naming the files defining
the AccelOpsClass types "...-accel-ops.c" instead of the old
naming "...-cpus.c".

* in "cpu: move cc->transaction_failed to tcg_ops",

protect with CONFIG_TCG the use of tcg_ops for hw/misc/jazz.c,

 #include "exec/memattrs.h" (Philippe, Eduardo)

* in "cpu: Move synchronize_from_tb() to tcg_ops",

 #include "hw/core/cpu.h" (Philippe, Eduardo)

do not remove the comment about struct TcgCpuOperations (Philippe)

* in "accel/tcg: split TCG-only code from cpu_exec_realizefn",

invert tcg_target_initialized set order (Alex)

* in "i386: move TCG cpu class initialization out of helper.c",

extract helper-tcg.h, tcg-cpu.c, and tcg-cpu.h directly into
tcg/, avoiding the extra move later to tcg/ (Alex)



v8 -> v9: move additional methods to CPUClass->tcg_ops

do_unaligned_access, transaction_failed and do_interrupt.

do_interrupt is a bit tricky, as the same code is reused
(albeit not usually directly) for KVM under certain odd conditions.

Change arm, as the only user of do_interrupt callback for KVM,
to instead call the target function directly arm_do_interrupt.

v7 -> v8: add missing CONFIG_TCGs, fix bugs

* add the prerequisite patches for "3 tcg" at the beginning of the
  series for convenience (already reviewed, queued by RH).

* add CONFIG_TCG to TCGCpuOperations and tcg_ops variable use

* reduce the scope of the realizefn refactoring, do not
  introduce a separate cpu_accel_realize, and instead use the
  existing cpu_exec_realizefn, there is not enough benefit
  to introduce a new function.

* fix bugs in user mode due to attempt to move the tcg_region_init()
  early, so it could be done just once in tcg_init() for both
  softmmu and user mode. Unfortunately it needs to remain deferred
  for user mode, as it needs to be done after prologue init and
  after the GUEST_BASE has been set.

v6 -> v7: integrate TCGCpuOperations, refactored cpu_exec_realizefn

* integrate TCGCpuOperations (Eduardo)

Taken some refactoring from Eduardo for Tcg-only operations on
CPUClass.

* refactored cpu_exec_realizefn

The other main change is a refactoring of cpu_exec_realizefn,
directly linked to the effort of making many cpu_exec operations
TCG-only (Eduardo series above):

cpu_exec_realizefn is actually a TCG-only thing, with the
exception of a couple things that can be done in base cpu code.

This changes all targets realizefn, so I guess I have to Cc:
the Multiverse? (Universe was already CCed for all accelerators).


v5 -> v6: remove MODULE_INIT_ACCEL_CPU


instead, use a call to accel_init_interfaces().

* The class lookups are now general and performed in accel/

  new AccelCPUClass for new archs are supported as new
  ones appear in the class hierarchy, no need for stubs.

* Split the code a bit better


v4 -> v5: centralized and simplified initializations

I put in Cc: Emilio G. Cota, specifically because in patch 8
I (re)moved for user-mode the call to tcg_regions_init().

The call happens now inside the tcg AccelClass machine_init,
(so earlier). This seems to work fine, but thought to get the
author opinion on this.

Rebased on "tcg-cpus: split into 3 tcg variants" series
(queued by Richard), to avoid some code churn:


https://lists.gnu.org/archive/html/qemu-devel/2020-10/msg04356.html


* Extended AccelClass to user-mode.

user-mode now does not call tcg_exec_init directly,
instead it uses the tcg accel class, and its init_machine method.

Since user-mode does not define or use a machine state,
the machine is just passed as NULL.

The immediate advantage is that now we can call current_accel()
from both user mode and softmmu, so we can work out the correct
class to use for accelerator initializations.

* QOMification of CpusAccelOps

simple QOMification of CpusAccelOps abstract class.

* Centralized all accel_cpu_init, so only one per cpu-arch,
  plus one for all accels will remain.

  So we can expect accel_cpu_init() to be limited to:
  
  softmmu/cpus.c - initializes the chosen softmmu accel ops for the cpus module.
  target/ARCH/cpu.c - initializes the chosen arch-specific cpu accelerator.
  
These changes are meant to address concerns/issues (Paolo):

1) the use of if (tcg_enabled()) and similar in the module_init call path

2) the excessive number of accel_cpu_init() to hunt down in the codebase.


* Fixed wrong use of host_cpu_class_init (Eduardo)


v3 -> v4: QOMification of X86CPUAccelClass


In this version I basically QOMified X86CPUAccel, taking the
suggestions from Eduardo as the starting point,
but stopping just short of making it an actual QOM interface,
using a plain abstract class, and then subclasses for the
actual objects.

Initialization is still using the existing qemu initialization
framework (module_call_init), which is I still think is better
than the alternatives proposed, in the current state.

Possibly some improvements could be developed in the future here.
In this case, effort should be put in keeping things extendible,
in order not to be blocked once accelerators also become modules.

Motivation and higher level steps:

https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg04628.html

Looking forward to your comments on this proposal,

Ciao,

Claudio


Claudio Fontana (16):
  accel/tcg: split CpusAccel into three TCG variants
  accel/tcg: split tcg_start_vcpu_thread
  accel/tcg: rename tcg-cpus functions to match module name
  i386: move kvm accel files into kvm/
  i386: move whpx accel files into whpx/
  i386: move hax accel files into hax/
  i386: hvf: remove stale MAINTAINERS entry for old hvf stubs
  i386: move TCG accel files into tcg/
  i386: move cpu dump out of helper.c into cpu-dump.c
  i386: move TCG cpu class initialization out of helper.c
  target/riscv: remove CONFIG_TCG, as it is always TCG
  accel/tcg: split TCG-only code from cpu_exec_realizefn
  target/arm: do not use cc->do_interrupt for KVM directly
  cpu: move cc->do_interrupt to tcg_ops
  cpu: move cc->transaction_failed to tcg_ops
  cpu: move do_unaligned_access to tcg_ops

Eduardo Habkost (9):
  tcg: cpu_exec_{enter,exit} helpers
  tcg: make CPUClass.cpu_exec_* optional
  tcg: Make CPUClass.debug_excp_handler optional
  cpu: Remove unnecessary noop methods
  cpu: Introduce TCGCpuOperations struct
  cpu: Move synchronize_from_tb() to tcg_ops
  cpu: Move cpu_exec_* to tcg_ops
  cpu: Move tlb_fill to tcg_ops
  cpu: Move debug_excp_handler to tcg_ops

 meson.build                           |   1 +
 accel/tcg/tcg-cpus-icount.h           |  17 +
 accel/tcg/tcg-cpus-rr.h               |  21 +
 accel/tcg/tcg-cpus.h                  |  12 +-
 include/hw/core/cpu.h                 |  73 ++--
 include/hw/core/tcg-cpu-ops.h         |  81 ++++
 target/i386/cpu.h                     | 100 +----
 target/i386/{ => hax}/hax-cpus.h      |   0
 target/i386/{ => hax}/hax-i386.h      |   6 +-
 target/i386/{ => hax}/hax-interface.h |   0
 target/i386/{ => hax}/hax-posix.h     |   0
 target/i386/{ => hax}/hax-windows.h   |   0
 target/i386/{ => kvm}/hyperv-proto.h  |   0
 target/i386/{ => kvm}/hyperv.h        |   0
 target/i386/{ => kvm}/kvm_i386.h      |   0
 target/i386/kvm/trace.h               |   1 +
 target/i386/tcg/helper-tcg.h          | 112 ++++++
 target/i386/tcg/tcg-cpu.h             |  15 +
 target/i386/{ => whpx}/whp-dispatch.h |   0
 target/i386/{ => whpx}/whpx-cpus.h    |   0
 accel/tcg/cpu-exec.c                  |  70 +++-
 accel/tcg/cputlb.c                    |   6 +-
 accel/tcg/tcg-all.c                   |  13 +-
 accel/tcg/tcg-cpus-icount.c           | 147 +++++++
 accel/tcg/tcg-cpus-mttcg.c            | 140 +++++++
 accel/tcg/tcg-cpus-rr.c               | 305 +++++++++++++++
 accel/tcg/tcg-cpus.c                  | 504 +-----------------------
 accel/tcg/user-exec.c                 |   6 +-
 cpu.c                                 |  66 ++--
 hw/core/cpu.c                         |  19 +-
 hw/i386/fw_cfg.c                      |   2 +-
 hw/i386/intel_iommu.c                 |   2 +-
 hw/i386/kvm/apic.c                    |   2 +-
 hw/i386/kvm/clock.c                   |   2 +-
 hw/i386/microvm.c                     |   2 +-
 hw/i386/pc.c                          |   2 +-
 hw/i386/x86.c                         |   2 +-
 hw/mips/jazz.c                        |   9 +-
 softmmu/icount.c                      |   2 +-
 target/alpha/cpu.c                    |  12 +-
 target/arm/cpu.c                      |  22 +-
 target/arm/cpu64.c                    |   5 +-
 target/arm/cpu_tcg.c                  |  10 +-
 target/arm/helper.c                   |   4 +
 target/arm/kvm64.c                    |   6 +-
 target/avr/cpu.c                      |  10 +-
 target/avr/helper.c                   |   4 +-
 target/cris/cpu.c                     |  28 +-
 target/cris/helper.c                  |   4 +-
 target/hppa/cpu.c                     |  14 +-
 target/i386/cpu-dump.c                | 537 +++++++++++++++++++++++++
 target/i386/cpu.c                     |  35 +-
 target/i386/{ => hax}/hax-all.c       |   0
 target/i386/{ => hax}/hax-cpus.c      |   0
 target/i386/{ => hax}/hax-mem.c       |   0
 target/i386/{ => hax}/hax-posix.c     |   0
 target/i386/{ => hax}/hax-windows.c   |   0
 target/i386/helper.c                  | 539 +-------------------------
 target/i386/{ => kvm}/hyperv-stub.c   |   0
 target/i386/{ => kvm}/hyperv.c        |   0
 target/i386/{ => kvm}/kvm-stub.c      |   0
 target/i386/{ => kvm}/kvm.c           |   0
 target/i386/machine.c                 |   4 +-
 target/i386/{ => tcg}/bpt_helper.c    |   1 +
 target/i386/{ => tcg}/cc_helper.c     |   1 +
 target/i386/{ => tcg}/excp_helper.c   |   1 +
 target/i386/{ => tcg}/fpu_helper.c    |  33 +-
 target/i386/{ => tcg}/int_helper.c    |   1 +
 target/i386/{ => tcg}/mem_helper.c    |   1 +
 target/i386/{ => tcg}/misc_helper.c   |   1 +
 target/i386/{ => tcg}/mpx_helper.c    |   1 +
 target/i386/{ => tcg}/seg_helper.c    |   1 +
 target/i386/{ => tcg}/smm_helper.c    |   2 +
 target/i386/{ => tcg}/svm_helper.c    |   1 +
 target/i386/tcg/tcg-cpu.c             |  71 ++++
 target/i386/{ => tcg}/tcg-stub.c      |   0
 target/i386/{ => tcg}/translate.c     |   1 +
 target/i386/{ => whpx}/whpx-all.c     |   0
 target/i386/{ => whpx}/whpx-cpus.c    |   0
 target/lm32/cpu.c                     |  10 +-
 target/m68k/cpu.c                     |  10 +-
 target/microblaze/cpu.c               |  14 +-
 target/mips/cpu.c                     |  21 +-
 target/moxie/cpu.c                    |   6 +-
 target/nios2/cpu.c                    |  10 +-
 target/openrisc/cpu.c                 |   8 +-
 target/riscv/cpu.c                    |  17 +-
 target/riscv/cpu_helper.c             |   2 +-
 target/rx/cpu.c                       |  10 +-
 target/s390x/cpu.c                    |  12 +-
 target/s390x/excp_helper.c            |   2 +-
 target/sh4/cpu.c                      |  12 +-
 target/sparc/cpu.c                    |  14 +-
 target/tilegx/cpu.c                   |   8 +-
 target/tricore/cpu.c                  |   6 +-
 target/unicore32/cpu.c                |   8 +-
 target/xtensa/cpu.c                   |  14 +-
 target/xtensa/helper.c                |   4 +-
 MAINTAINERS                           |  11 +-
 accel/tcg/meson.build                 |   9 +-
 target/i386/hax/meson.build           |   7 +
 target/i386/kvm/meson.build           |   3 +
 target/i386/kvm/trace-events          |   7 +
 target/i386/meson.build               |  32 +-
 target/i386/tcg/meson.build           |  14 +
 target/i386/trace-events              |   6 -
 target/i386/whpx/meson.build          |   4 +
 target/ppc/translate_init.c.inc       |  24 +-
 108 files changed, 1901 insertions(+), 1494 deletions(-)
 create mode 100644 accel/tcg/tcg-cpus-icount.h
 create mode 100644 accel/tcg/tcg-cpus-rr.h
 create mode 100644 include/hw/core/tcg-cpu-ops.h
 rename target/i386/{ => hax}/hax-cpus.h (100%)
 rename target/i386/{ => hax}/hax-i386.h (95%)
 rename target/i386/{ => hax}/hax-interface.h (100%)
 rename target/i386/{ => hax}/hax-posix.h (100%)
 rename target/i386/{ => hax}/hax-windows.h (100%)
 rename target/i386/{ => kvm}/hyperv-proto.h (100%)
 rename target/i386/{ => kvm}/hyperv.h (100%)
 rename target/i386/{ => kvm}/kvm_i386.h (100%)
 create mode 100644 target/i386/kvm/trace.h
 create mode 100644 target/i386/tcg/helper-tcg.h
 create mode 100644 target/i386/tcg/tcg-cpu.h
 rename target/i386/{ => whpx}/whp-dispatch.h (100%)
 rename target/i386/{ => whpx}/whpx-cpus.h (100%)
 create mode 100644 accel/tcg/tcg-cpus-icount.c
 create mode 100644 accel/tcg/tcg-cpus-mttcg.c
 create mode 100644 accel/tcg/tcg-cpus-rr.c
 create mode 100644 target/i386/cpu-dump.c
 rename target/i386/{ => hax}/hax-all.c (100%)
 rename target/i386/{ => hax}/hax-cpus.c (100%)
 rename target/i386/{ => hax}/hax-mem.c (100%)
 rename target/i386/{ => hax}/hax-posix.c (100%)
 rename target/i386/{ => hax}/hax-windows.c (100%)
 rename target/i386/{ => kvm}/hyperv-stub.c (100%)
 rename target/i386/{ => kvm}/hyperv.c (100%)
 rename target/i386/{ => kvm}/kvm-stub.c (100%)
 rename target/i386/{ => kvm}/kvm.c (100%)
 rename target/i386/{ => tcg}/bpt_helper.c (99%)
 rename target/i386/{ => tcg}/cc_helper.c (99%)
 rename target/i386/{ => tcg}/excp_helper.c (99%)
 rename target/i386/{ => tcg}/fpu_helper.c (99%)
 rename target/i386/{ => tcg}/int_helper.c (99%)
 rename target/i386/{ => tcg}/mem_helper.c (99%)
 rename target/i386/{ => tcg}/misc_helper.c (99%)
 rename target/i386/{ => tcg}/mpx_helper.c (99%)
 rename target/i386/{ => tcg}/seg_helper.c (99%)
 rename target/i386/{ => tcg}/smm_helper.c (99%)
 rename target/i386/{ => tcg}/svm_helper.c (99%)
 create mode 100644 target/i386/tcg/tcg-cpu.c
 rename target/i386/{ => tcg}/tcg-stub.c (100%)
 rename target/i386/{ => tcg}/translate.c (99%)
 rename target/i386/{ => whpx}/whpx-all.c (100%)
 rename target/i386/{ => whpx}/whpx-cpus.c (100%)
 create mode 100644 target/i386/hax/meson.build
 create mode 100644 target/i386/kvm/meson.build
 create mode 100644 target/i386/kvm/trace-events
 create mode 100644 target/i386/tcg/meson.build
 create mode 100644 target/i386/whpx/meson.build

-- 
2.26.2


Re: [PATCH v11 00/25] i386 cleanup PART 1
Posted by no-reply@patchew.org 3 years, 4 months ago
Patchew URL: https://patchew.org/QEMU/20201211083143.14350-1-cfontana@suse.de/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Type: series
Message-id: 20201211083143.14350-1-cfontana@suse.de
Subject: [PATCH v11 00/25] i386 cleanup PART 1

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 - [tag update]      patchew/20201210190417.31673-1-alex.bennee@linaro.org -> patchew/20201210190417.31673-1-alex.bennee@linaro.org
 - [tag update]      patchew/20201210223506.263709-1-philmd@redhat.com -> patchew/20201210223506.263709-1-philmd@redhat.com
 * [new tag]         patchew/20201211083143.14350-1-cfontana@suse.de -> patchew/20201211083143.14350-1-cfontana@suse.de
Switched to a new branch 'test'
a3c83d9 cpu: move do_unaligned_access to tcg_ops
0aecd32 cpu: move cc->transaction_failed to tcg_ops
f569b71 cpu: move cc->do_interrupt to tcg_ops
d72487e target/arm: do not use cc->do_interrupt for KVM directly
32ccc60 cpu: Move debug_excp_handler to tcg_ops
7bb4177 cpu: Move tlb_fill to tcg_ops
79fab44 cpu: Move cpu_exec_* to tcg_ops
cb83174 cpu: Move synchronize_from_tb() to tcg_ops
ecfd44d accel/tcg: split TCG-only code from cpu_exec_realizefn
de4c296 target/riscv: remove CONFIG_TCG, as it is always TCG
c279736 cpu: Introduce TCGCpuOperations struct
bd1deaa cpu: Remove unnecessary noop methods
07018b9 tcg: Make CPUClass.debug_excp_handler optional
e331244 tcg: make CPUClass.cpu_exec_* optional
b26f65d tcg: cpu_exec_{enter,exit} helpers
d7314ca i386: move TCG cpu class initialization out of helper.c
658aed7 i386: move cpu dump out of helper.c into cpu-dump.c
4afbc49 i386: move TCG accel files into tcg/
5904058 i386: hvf: remove stale MAINTAINERS entry for old hvf stubs
ddfe357 i386: move hax accel files into hax/
01e7019 i386: move whpx accel files into whpx/
5f8a34a i386: move kvm accel files into kvm/
1811a42 accel/tcg: rename tcg-cpus functions to match module name
b20ad72 accel/tcg: split tcg_start_vcpu_thread
93622c5 accel/tcg: split CpusAccel into three TCG variants

=== OUTPUT BEGIN ===
1/25 Checking commit 93622c51d180 (accel/tcg: split CpusAccel into three TCG variants)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#57: 
new file mode 100644

total: 0 errors, 1 warnings, 1156 lines checked

Patch 1/25 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
2/25 Checking commit b20ad7218d38 (accel/tcg: split tcg_start_vcpu_thread)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#103: 
deleted file mode 100644

total: 0 errors, 1 warnings, 201 lines checked

Patch 2/25 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
3/25 Checking commit 1811a42dd7b5 (accel/tcg: rename tcg-cpus functions to match module name)
4/25 Checking commit 5f8a34a38c95 (i386: move kvm accel files into kvm/)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#168: 
rename from target/i386/hyperv-proto.h

total: 0 errors, 1 warnings, 150 lines checked

Patch 4/25 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/25 Checking commit 01e70198abda (i386: move whpx accel files into whpx/)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#51: 
new file mode 100644

total: 0 errors, 1 warnings, 32 lines checked

Patch 5/25 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
6/25 Checking commit ddfe3572963a (i386: move hax accel files into hax/)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#26: 
rename from target/i386/hax-all.c

total: 0 errors, 1 warnings, 47 lines checked

Patch 6/25 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
7/25 Checking commit 59040585f5e0 (i386: hvf: remove stale MAINTAINERS entry for old hvf stubs)
8/25 Checking commit 4afbc49cc900 (i386: move TCG accel files into tcg/)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#45: 
rename from target/i386/bpt_helper.c

total: 0 errors, 1 warnings, 39 lines checked

Patch 8/25 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
9/25 Checking commit 658aed78b5fa (i386: move cpu dump out of helper.c into cpu-dump.c)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#12: 
new file mode 100644

ERROR: braces {} are necessary for all arms of this statement
#129: FILE: target/i386/cpu-dump.c:113:
+    if (!(env->hflags & HF_PE_MASK) || !(sc->flags & DESC_P_MASK))
[...]

WARNING: Block comments use a leading /* on a separate line
#173: FILE: target/i386/cpu-dump.c:157:
+/* ARRAY_SIZE check is not required because

WARNING: Block comments use a leading /* on a separate line
#212: FILE: target/i386/cpu-dump.c:196:
+/* ARRAY_SIZE check is not required because

ERROR: line over 90 characters
#374: FILE: target/i386/cpu-dump.c:358:
+        qemu_fprintf(f, "RAX=%016" PRIx64 " RBX=%016" PRIx64 " RCX=%016" PRIx64 " RDX=%016" PRIx64 "\n"

ERROR: line over 90 characters
#375: FILE: target/i386/cpu-dump.c:359:
+                     "RSI=%016" PRIx64 " RDI=%016" PRIx64 " RBP=%016" PRIx64 " RSP=%016" PRIx64 "\n"

ERROR: line over 90 characters
#376: FILE: target/i386/cpu-dump.c:360:
+                     "R8 =%016" PRIx64 " R9 =%016" PRIx64 " R10=%016" PRIx64 " R11=%016" PRIx64 "\n"

ERROR: line over 90 characters
#377: FILE: target/i386/cpu-dump.c:361:
+                     "R12=%016" PRIx64 " R13=%016" PRIx64 " R14=%016" PRIx64 " R15=%016" PRIx64 "\n"

ERROR: line over 90 characters
#378: FILE: target/i386/cpu-dump.c:362:
+                     "RIP=%016" PRIx64 " RFL=%08x [%c%c%c%c%c%c%c] CPL=%d II=%d A20=%d SMM=%d HLT=%d\n",

ERROR: space required before the open parenthesis '('
#437: FILE: target/i386/cpu-dump.c:421:
+    for(i = 0; i < 6; i++) {

WARNING: line over 80 characters
#449: FILE: target/i386/cpu-dump.c:433:
+        qemu_fprintf(f, "CR0=%08x CR2=%016" PRIx64 " CR3=%016" PRIx64 " CR4=%08x\n",

ERROR: space required before the open parenthesis '('
#454: FILE: target/i386/cpu-dump.c:438:
+        for(i = 0; i < 4; i++)

ERROR: braces {} are necessary for all arms of this statement
#454: FILE: target/i386/cpu-dump.c:438:
+        for(i = 0; i < 4; i++)
[...]

ERROR: space required before the open parenthesis '('
#470: FILE: target/i386/cpu-dump.c:454:
+        for(i = 0; i < 4; i++) {

ERROR: braces {} are necessary for all arms of this statement
#477: FILE: target/i386/cpu-dump.c:461:
+        if ((unsigned)env->cc_op < CC_OP_NB)
[...]
+        else
[...]

WARNING: line over 80 characters
#478: FILE: target/i386/cpu-dump.c:462:
+            snprintf(cc_op_name, sizeof(cc_op_name), "%s", cc_op_str[env->cc_op]);

ERROR: space required before the open parenthesis '('
#498: FILE: target/i386/cpu-dump.c:482:
+        for(i = 0; i < 8; i++) {

ERROR: spaces required around that '=' (ctx:VxV)
#508: FILE: target/i386/cpu-dump.c:492:
+        for(i=0;i<8;i++) {
              ^

ERROR: space required after that ';' (ctx:VxV)
#508: FILE: target/i386/cpu-dump.c:492:
+        for(i=0;i<8;i++) {
                ^

ERROR: spaces required around that '<' (ctx:VxV)
#508: FILE: target/i386/cpu-dump.c:492:
+        for(i=0;i<8;i++) {
                  ^

ERROR: space required after that ';' (ctx:VxV)
#508: FILE: target/i386/cpu-dump.c:492:
+        for(i=0;i<8;i++) {
                    ^

ERROR: space required before the open parenthesis '('
#508: FILE: target/i386/cpu-dump.c:492:
+        for(i=0;i<8;i++) {

ERROR: braces {} are necessary for all arms of this statement
#513: FILE: target/i386/cpu-dump.c:497:
+            if ((i & 1) == 1)
[...]
+            else
[...]

ERROR: braces {} are necessary for all arms of this statement
#518: FILE: target/i386/cpu-dump.c:502:
+        if (env->hflags & HF_CS64_MASK)
[...]
+        else
[...]

ERROR: spaces required around that '=' (ctx:VxV)
#522: FILE: target/i386/cpu-dump.c:506:
+        for(i=0;i<nb;i++) {
              ^

ERROR: space required after that ';' (ctx:VxV)
#522: FILE: target/i386/cpu-dump.c:506:
+        for(i=0;i<nb;i++) {
                ^

ERROR: spaces required around that '<' (ctx:VxV)
#522: FILE: target/i386/cpu-dump.c:506:
+        for(i=0;i<nb;i++) {
                  ^

ERROR: space required after that ';' (ctx:VxV)
#522: FILE: target/i386/cpu-dump.c:506:
+        for(i=0;i<nb;i++) {
                     ^

ERROR: space required before the open parenthesis '('
#522: FILE: target/i386/cpu-dump.c:506:
+        for(i=0;i<nb;i++) {

ERROR: braces {} are necessary for all arms of this statement
#529: FILE: target/i386/cpu-dump.c:513:
+            if ((i & 1) == 1)
[...]
+            else
[...]

total: 25 errors, 5 warnings, 1077 lines checked

Patch 9/25 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

10/25 Checking commit d7314cab76a0 (i386: move TCG cpu class initialization out of helper.c)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#412: 
new file mode 100644

total: 0 errors, 1 warnings, 608 lines checked

Patch 10/25 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
11/25 Checking commit b26f65d8444f (tcg: cpu_exec_{enter,exit} helpers)
12/25 Checking commit e33124412d9d (tcg: make CPUClass.cpu_exec_* optional)
13/25 Checking commit 07018b947480 (tcg: Make CPUClass.debug_excp_handler optional)
14/25 Checking commit bd1deaa726fc (cpu: Remove unnecessary noop methods)
15/25 Checking commit c27973682908 (cpu: Introduce TCGCpuOperations struct)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#93: 
new file mode 100644

total: 0 errors, 1 warnings, 301 lines checked

Patch 15/25 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
16/25 Checking commit de4c29651b51 (target/riscv: remove CONFIG_TCG, as it is always TCG)
17/25 Checking commit ecfd44dde593 (accel/tcg: split TCG-only code from cpu_exec_realizefn)
18/25 Checking commit cb8317496f91 (cpu: Move synchronize_from_tb() to tcg_ops)
19/25 Checking commit 79fab444bec5 (cpu: Move cpu_exec_* to tcg_ops)
20/25 Checking commit 7bb4177e62f9 (cpu: Move tlb_fill to tcg_ops)
WARNING: line over 80 characters
#23: FILE: accel/tcg/cputlb.c:1289:
+    ok = cc->tcg_ops.tlb_fill(cpu, addr, size, access_type, mmu_idx, false, retaddr);

total: 0 errors, 1 warnings, 259 lines checked

Patch 20/25 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
21/25 Checking commit 32ccc60a6d38 (cpu: Move debug_excp_handler to tcg_ops)
22/25 Checking commit d72487ea4fa7 (target/arm: do not use cc->do_interrupt for KVM directly)
23/25 Checking commit f569b716427c (cpu: move cc->do_interrupt to tcg_ops)
24/25 Checking commit 0aecd322182a (cpu: move cc->transaction_failed to tcg_ops)
WARNING: line over 80 characters
#87: FILE: include/hw/core/cpu.h:857:
+        cc->tcg_ops.do_transaction_failed(cpu, physaddr, addr, size, access_type,

total: 0 errors, 1 warnings, 195 lines checked

Patch 24/25 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
25/25 Checking commit a3c83d9f6296 (cpu: move do_unaligned_access to tcg_ops)
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20201211083143.14350-1-cfontana@suse.de/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
Re: [PATCH v11 00/25] i386 cleanup PART 1
Posted by Philippe Mathieu-Daudé 3 years, 4 months ago
On 12/11/20 9:31 AM, Claudio Fontana wrote:
> Hello, this is version 11 of the cleanup.
> 
> The series has been split into two separate parts,
> and this is PART 1.

One single patch misses review:

#10 "i386: move TCG cpu class initialization out of helper.c"

> 
> v10 -> v11: small tweaks for !CONFIG_USER_ONLY
> 
> * make transaction_failed and do_unaligned_access
>   consistently !CONFIG_USER_ONLY.
> 
> * hw/mips/jazz: wrap mips_jazz_do_transaction_failed in
>   CONFIG_TCG && !CONFIG_USER_ONLY
> 
> * arm: wrap arm_cpu_synchronize_from_tb in CONFIG_TCG
> * arm: wrap arm_v7m_exec_interrupt in CONFIG_TCG
> * mips: wrap mips_cpu_synchronize_from_tb in CONFIG_TCG
> * mips: do not make mips_cpu_do_interrupt !CONFIG_USER_ONLY
> * ppc: protect cpu_exec_enter/exit in CONFIG_TCG