[PATCH v12 00/23] i386 cleanup PART 1

Claudio Fontana posted 23 patches 3 years, 4 months ago
Test checkpatch failed
Failed in applying to current master (apply log)
meson.build                                |   1 +
include/hw/core/cpu.h                      |  73 +--
target/i386/cpu.h                          |  89 +---
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}/cc_helper_template.h |   0
target/i386/tcg/helper-tcg.h               |  95 ++++
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                         |   7 +-
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 +-
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         |  39 +-
target/i386/{ => tcg}/int_helper.c         |   1 +
target/i386/{ => tcg}/mem_helper.c         |   1 +
target/i386/{ => tcg}/misc_helper.c        |  14 +
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-apic.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                                |  12 +-
include/hw/core/tcg-cpu-ops.h.inc          |  77 +++
target/i386/hax/meson.build                |   7 +
target/i386/kvm/meson.build                |   3 +
target/i386/kvm/trace-events               |   7 +
target/i386/meson.build                    |  33 +-
target/i386/tcg/meson.build                |  14 +
target/i386/trace-events                   |   6 -
target/i386/whpx/meson.build               |   5 +
target/ppc/translate_init.c.inc            |  24 +-
100 files changed, 1227 insertions(+), 989 deletions(-)
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
rename target/i386/{ => tcg}/cc_helper_template.h (100%)
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 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 (97%)
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-apic.c (100%)
rename target/i386/{ => whpx}/whpx-cpus.c (100%)
create mode 100644 include/hw/core/tcg-cpu-ops.h.inc
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 v12 00/23] i386 cleanup PART 1
Posted by Claudio Fontana 3 years, 4 months ago
Hello, this is version 12 of the cleanup (PART 1)

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

v11 -> v12:

* "cpu: Move synchronize_from_tb() to tcg_ops":
  removed review tags, as there is currently a bunch of conflicting
  requirements (Eduardo, Richard, Philippe).

  in this iteration, tcg-cpu-ops.h is renamed to tcg-cpu-ops.h.inc,
  and it is not expected to be included standalone as a header file,
  instead it is just a split of cpu.h for the TCG-specific ops.

* "i386: move whpx accel files into whpx/" rebased on master
  (trivial change) -> added whpx/apic.c

* "i386: move kvm accel files into kvm/" rebased on master
  (trivial change) -> added some code and a default kvm parameter
  to kvm/kvm-cpu.c

* "i386: move TCG accel files into tcg/":
  (trivial change) -> moved cc_helper_template.h to tcg/ as well.

* "i386: move TCG cpu class initialization to tcg/":

  comment better the additional moves of TCG specific defines
  from cpu.h to helper-tcg.h.

  cpu.h: do not touch CC_SRC and friends,
  move FT0 and friends to tcg/fpu_helper.c.

  create a new patch
  "i386: tcg: remove inline from cpu_load_eflags".
  (Richard)

* "cpu: Move tlb_fill to tcg_ops":
  (trivial change) -> break line longer than 80 char

* "cpu: move cc->transaction_failed to tcg_ops:
  (trivial change) -> break line longer than 80 char


v10 -> v11: split off PART 2,

no further changes to PART 2 other than the split.

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 (14):
  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 to tcg/
  i386: tcg: remove inline from cpu_load_eflags
  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 +
 include/hw/core/cpu.h                      |  73 +--
 target/i386/cpu.h                          |  89 +---
 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}/cc_helper_template.h |   0
 target/i386/tcg/helper-tcg.h               |  95 ++++
 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                         |   7 +-
 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 +-
 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         |  39 +-
 target/i386/{ => tcg}/int_helper.c         |   1 +
 target/i386/{ => tcg}/mem_helper.c         |   1 +
 target/i386/{ => tcg}/misc_helper.c        |  14 +
 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-apic.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                                |  12 +-
 include/hw/core/tcg-cpu-ops.h.inc          |  77 +++
 target/i386/hax/meson.build                |   7 +
 target/i386/kvm/meson.build                |   3 +
 target/i386/kvm/trace-events               |   7 +
 target/i386/meson.build                    |  33 +-
 target/i386/tcg/meson.build                |  14 +
 target/i386/trace-events                   |   6 -
 target/i386/whpx/meson.build               |   5 +
 target/ppc/translate_init.c.inc            |  24 +-
 100 files changed, 1227 insertions(+), 989 deletions(-)
 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
 rename target/i386/{ => tcg}/cc_helper_template.h (100%)
 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 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 (97%)
 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-apic.c (100%)
 rename target/i386/{ => whpx}/whpx-cpus.c (100%)
 create mode 100644 include/hw/core/tcg-cpu-ops.h.inc
 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 v12 00/23] i386 cleanup PART 1
Posted by no-reply@patchew.org 3 years, 4 months ago
Patchew URL: https://patchew.org/QEMU/20201212155530.23098-1-cfontana@suse.de/



Hi,

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

Type: series
Message-id: 20201212155530.23098-1-cfontana@suse.de
Subject: [PATCH v12 00/23] 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
   a4b307b..ad717e6  master     -> master
 - [tag update]      patchew/20201210134752.780923-1-marcandre.lureau@redhat.com -> patchew/20201210134752.780923-1-marcandre.lureau@redhat.com
 - [tag update]      patchew/20201211152426.350966-1-thuth@redhat.com -> patchew/20201211152426.350966-1-thuth@redhat.com
 * [new tag]         patchew/20201212155530.23098-1-cfontana@suse.de -> patchew/20201212155530.23098-1-cfontana@suse.de
Switched to a new branch 'test'
c993002 cpu: move do_unaligned_access to tcg_ops
1fcfced cpu: move cc->transaction_failed to tcg_ops
cee04d2 cpu: move cc->do_interrupt to tcg_ops
958a66b target/arm: do not use cc->do_interrupt for KVM directly
d6f1e88 cpu: Move debug_excp_handler to tcg_ops
6bd0b6d cpu: Move tlb_fill to tcg_ops
dceed35 cpu: Move cpu_exec_* to tcg_ops
a26bcc5 cpu: Move synchronize_from_tb() to tcg_ops
d2b9509 accel/tcg: split TCG-only code from cpu_exec_realizefn
f9929c6 target/riscv: remove CONFIG_TCG, as it is always TCG
69f0499 cpu: Introduce TCGCpuOperations struct
8b288bd cpu: Remove unnecessary noop methods
a661f58 tcg: Make CPUClass.debug_excp_handler optional
fd59765 tcg: make CPUClass.cpu_exec_* optional
df0bced tcg: cpu_exec_{enter,exit} helpers
302f7ca i386: tcg: remove inline from cpu_load_eflags
c043739 i386: move TCG cpu class initialization to tcg/
cdaa57f i386: move cpu dump out of helper.c into cpu-dump.c
b0ec6c2 i386: move TCG accel files into tcg/
7157bb9 i386: hvf: remove stale MAINTAINERS entry for old hvf stubs
e35e8ed i386: move hax accel files into hax/
8f492a2 i386: move whpx accel files into whpx/
6af631f i386: move kvm accel files into kvm/

=== OUTPUT BEGIN ===
1/23 Checking commit 6af631fd810a (i386: move kvm accel files into kvm/)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#169: 
rename from target/i386/hyperv-proto.h

total: 0 errors, 1 warnings, 150 lines checked

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

total: 0 errors, 1 warnings, 35 lines checked

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

total: 0 errors, 1 warnings, 47 lines checked

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

total: 0 errors, 1 warnings, 39 lines checked

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

ERROR: braces {} are necessary for all arms of this statement
#130: 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
#174: FILE: target/i386/cpu-dump.c:157:
+/* ARRAY_SIZE check is not required because

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

ERROR: line over 90 characters
#375: 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
#376: 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
#377: 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
#378: 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
#379: 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 '('
#438: FILE: target/i386/cpu-dump.c:421:
+    for(i = 0; i < 6; i++) {

WARNING: line over 80 characters
#450: 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 '('
#455: FILE: target/i386/cpu-dump.c:438:
+        for(i = 0; i < 4; i++)

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

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

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

WARNING: line over 80 characters
#479: 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 '('
#499: FILE: target/i386/cpu-dump.c:482:
+        for(i = 0; i < 8; i++) {

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

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

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

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

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

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

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

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

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

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

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

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

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

total: 25 errors, 5 warnings, 1077 lines checked

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

7/23 Checking commit c0437394ad3a (i386: move TCG cpu class initialization to tcg/)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#416: 
new file mode 100644

total: 0 errors, 1 warnings, 596 lines checked

Patch 7/23 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
8/23 Checking commit 302f7ca47f5f (i386: tcg: remove inline from cpu_load_eflags)
9/23 Checking commit df0bced0380b (tcg: cpu_exec_{enter,exit} helpers)
10/23 Checking commit fd5976575069 (tcg: make CPUClass.cpu_exec_* optional)
11/23 Checking commit a661f58cc91c (tcg: Make CPUClass.debug_excp_handler optional)
12/23 Checking commit 8b288bd57129 (cpu: Remove unnecessary noop methods)
13/23 Checking commit 69f0499d618c (cpu: Introduce TCGCpuOperations struct)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#94: 
new file mode 100644

total: 0 errors, 1 warnings, 301 lines checked

Patch 13/23 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
14/23 Checking commit f9929c61a623 (target/riscv: remove CONFIG_TCG, as it is always TCG)
15/23 Checking commit d2b950994b26 (accel/tcg: split TCG-only code from cpu_exec_realizefn)
16/23 Checking commit a26bcc5ec783 (cpu: Move synchronize_from_tb() to tcg_ops)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#76: 
rename from include/hw/core/tcg-cpu-ops.h

total: 0 errors, 1 warnings, 182 lines checked

Patch 16/23 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
17/23 Checking commit dceed35dc50d (cpu: Move cpu_exec_* to tcg_ops)
18/23 Checking commit 6bd0b6d27c75 (cpu: Move tlb_fill to tcg_ops)
19/23 Checking commit d6f1e8860230 (cpu: Move debug_excp_handler to tcg_ops)
20/23 Checking commit 958a66b1d37b (target/arm: do not use cc->do_interrupt for KVM directly)
21/23 Checking commit cee04d26e38b (cpu: move cc->do_interrupt to tcg_ops)
22/23 Checking commit 1fcfced0d53f (cpu: move cc->transaction_failed to tcg_ops)
23/23 Checking commit c993002c8e6e (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/20201212155530.23098-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 v12 00/23] i386 cleanup PART 1
Posted by Eduardo Habkost 3 years, 4 months ago
On Sat, 12 Dec 2020 16:55:07 +0100, Claudio Fontana wrote:
> The series has been split into two separate parts,
> and this is PART 1.
> 
> v11 -> v12:
> 
> * "cpu: Move synchronize_from_tb() to tcg_ops":
>   removed review tags, as there is currently a bunch of conflicting
>   requirements (Eduardo, Richard, Philippe).
> 
> [...]

Queued the following:

[01/23] i386: move kvm accel files into kvm/
[02/23] i386: move whpx accel files into whpx/
[03/23] i386: move hax accel files into hax/
[04/23] i386: hvf: remove stale MAINTAINERS entry for old hvf stubs
[05/23] i386: move TCG accel files into tcg/
[06/23] i386: move cpu dump out of helper.c into cpu-dump.c
[07/23] i386: move TCG cpu class initialization to tcg/
[08/23] i386: tcg: remove inline from cpu_load_eflags
[09/23] tcg: cpu_exec_{enter,exit} helpers
[10/23] tcg: make CPUClass.cpu_exec_* optional
[11/23] tcg: Make CPUClass.debug_excp_handler optional
[12/23] cpu: Remove unnecessary noop methods

Thanks!

-- 
Eduardo


Re: [PATCH v12 00/23] i386 cleanup PART 1
Posted by Eduardo Habkost 3 years, 4 months ago
On Sat, Dec 12, 2020 at 04:55:07PM +0100, Claudio Fontana wrote:
[...]
> Claudio Fontana (14):
>   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

I'm queueing patches 01-06 on x86-next.  Thanks!

-- 
Eduardo