On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
Pierrick noticed [*] "exec/cpu-defs.h" isn't really used by
each target "cpu.h". However various source files rely on it
(or actually a small subset of it: "exec/target_long.h").

This series first includes the missing headers that were
indirectly pulled via "cpu.h" -> "exec/cpu-defs.h", then
remove it for each target "cpu.h".

As another cleanup we use the full path to target "cpu.h".

[*] v1: 
https://lore.kernel.org/qemu-devel/[email protected]/

Philippe Mathieu-Daudé (37):
   target/arm: Remove target_ulong use in hvf_handle_psci_call()
   target/ppc: Replace TARGET_PAGE_BITS -> qemu_target_page_bits()
   hw/s390x/vfio: Replace TARGET_PAGE_BITS -> qemu_target_page_bits()
   monitor/hmp: : Include missing 'exec/target_long.h' header
   target-info: Include 'exec/cpu-defs.h' explicitly
   target/xtensa: Restrict inclusion of 'exec/cpu-defs.h' header
   target/hexagon: Include missing 'exec/target_long.h' header
   target/hppa: Include missing 'exec/target_long.h' header
   target/i386: Include missing 'exec/target_long.h' header
   target/m68k: Include missing 'exec/target_long.h' header
   target/mips: Include missing 'exec/target_long.h' header
   target/ppc: Include missing 'exec/target_long.h' header
   target/riscv: Include missing 'exec/target_long.h' header
   target/sparc: Include missing 'exec/target_long.h' header
   system/kvm_xen: Include missing 'exec/target_page.h' header
   hw/misc/cpc: Include missing 'hw/core/cpu.h' header
   target/s390x/tcg: Include missing '*cpu.h' headers
   exec/helper-head: Include missing 'exec/target_long.h' header
   target/cpu: Do not include 'exec/cpu-defs.h' anymore
   hw/alpha: Include full path to target 'cpu.h' header
   hw/arm: Include full path to target 'cpu.h' header
   hw/avr: Include full path to target 'cpu.h' header
   hw/hppa: Include full path to target 'cpu.h' header
   hw/i386: Include full path to target 'cpu.h' header
   hw/m68k: Include full path to target 'cpu.h' header
   hw/microblaze: Include full path to target 'cpu.h' header
   hw/mips: Include full path to target 'cpu.h' header
   hw/or1k: Include full path to target 'cpu.h' header
   hw/ppc: Include full path to target 'cpu.h' header
   hw/riscv: Include full path to target 'cpu.h' header
   hw/s390x: Include full path to target 'cpu.h' header
   hw/sh4: Include full path to target 'cpu.h' header
   hw/sparc: Include full path to target 'cpu.h' header
   hw/tricore: Include full path to target 'cpu.h' header
   hw/xtensa: Include full path to target 'cpu.h' header
   hw/avr: Build as common unit files
   hw/misc: Build 'mac_via' as common unit file

Pierrick Bouvier (1):
   hw/misc/allwinner-cpucfg.c: make compilation unit common

  hw/avr/boot.h                            |  2 +-
  hw/s390x/ipl.h                           |  2 +-
  hw/s390x/s390-hypercall.h                |  2 +-
  hw/xtensa/xtensa_memory.h                |  2 +-
  include/hw/arm/digic.h                   |  2 +-
  include/hw/arm/fsl-imx6.h                |  2 +-
  include/hw/arm/fsl-imx6ul.h              |  2 +-
  include/hw/arm/fsl-imx7.h                |  2 +-
  include/hw/arm/fsl-imx8mp.h              |  2 +-
  include/hw/i386/apic_internal.h          |  2 +-
  include/hw/intc/mips_gic.h               |  2 +-
  include/hw/ppc/pnv.h                     |  2 +-
  include/hw/ppc/spapr_fadump.h            |  2 +-
  include/hw/ppc/spapr_ovec.h              |  2 +-
  include/monitor/hmp-target.h             |  2 +-
  include/system/kvm_xen.h                 |  2 ++
  target/alpha/cpu.h                       |  1 -
  target/arm/cpu.h                         |  1 -
  target/avr/cpu.h                         |  1 -
  target/hexagon/cpu.h                     |  3 ++-
  target/hexagon/mmvec/mmvec.h             |  3 +++
  target/hppa/cpu.h                        |  2 +-
  target/i386/cpu.h                        |  2 +-
  target/loongarch/cpu.h                   |  1 -
  target/m68k/cpu.h                        |  1 -
  target/microblaze/cpu.h                  |  1 -
  target/mips/cpu.h                        |  2 +-
  target/or1k/cpu.h                        |  1 -
  target/ppc/cpu.h                         |  2 +-
  target/riscv/cpu.h                       |  2 +-
  target/riscv/debug.h                     |  1 +
  target/riscv/pmp.h                       |  1 +
  target/rx/cpu.h                          |  1 -
  target/s390x/cpu.h                       |  1 -
  target/s390x/tcg/tcg_s390x.h             |  3 +++
  target/sh4/cpu.h                         |  1 -
  target/sparc/cpu.h                       |  2 +-
  target/tricore/cpu.h                     |  1 -
  target/xtensa/cpu.h                      |  1 -
  include/exec/helper-head.h.inc           | 15 +++++++--------
  hw/alpha/dp264.c                         |  2 +-
  hw/alpha/typhoon.c                       |  2 +-
  hw/arm/boot.c                            |  2 +-
  hw/arm/exynos4210.c                      |  2 +-
  hw/arm/mps3r.c                           |  2 +-
  hw/arm/omap1.c                           |  2 +-
  hw/arm/realview.c                        |  2 +-
  hw/arm/smmuv3.c                          |  2 +-
  hw/hppa/machine.c                        |  2 +-
  hw/i386/multiboot.c                      |  2 +-
  hw/i386/pc_sysfw_ovmf.c                  |  2 +-
  hw/i386/vmmouse.c                        |  2 +-
  hw/intc/arm_gicv3_cpuif.c                |  2 +-
  hw/intc/arm_gicv3_cpuif_common.c         |  2 +-
  hw/intc/m68k_irqc.c                      |  2 +-
  hw/intc/sh_intc.c                        |  2 +-
  hw/isa/lpc_ich9.c                        |  2 +-
  hw/m68k/an5206.c                         |  2 +-
  hw/m68k/mcf5206.c                        |  2 +-
  hw/m68k/mcf5208.c                        |  2 +-
  hw/m68k/mcf_intc.c                       |  2 +-
  hw/m68k/q800-glue.c                      |  2 +-
  hw/m68k/q800.c                           |  2 +-
  hw/m68k/virt.c                           |  2 +-
  hw/microblaze/boot.c                     |  2 +-
  hw/microblaze/petalogix_ml605_mmu.c      |  2 +-
  hw/microblaze/petalogix_s3adsp1800_mmu.c |  2 +-
  hw/microblaze/xlnx-zynqmp-pmu.c          |  2 +-
  hw/mips/bootloader.c                     |  2 +-
  hw/mips/fuloong2e.c                      |  2 +-
  hw/mips/jazz.c                           |  2 +-
  hw/mips/malta.c                          |  2 +-
  hw/misc/mips_cpc.c                       |  3 ++-
  hw/misc/riscv_cmgcr.c                    |  3 ++-
  hw/misc/riscv_cpc.c                      |  3 ++-
  hw/or1k/boot.c                           |  2 +-
  hw/or1k/cputimer.c                       |  2 +-
  hw/or1k/or1k-sim.c                       |  2 +-
  hw/or1k/virt.c                           |  2 +-
  hw/ppc/mpc8544_guts.c                    |  2 +-
  hw/ppc/mpc8544ds.c                       |  2 +-
  hw/ppc/ppc440_uc.c                       |  2 +-
  hw/ppc/ppc4xx_devs.c                     |  2 +-
  hw/ppc/ppc_booke.c                       |  2 +-
  hw/ppc/prep_systemio.c                   |  2 +-
  hw/ppc/spapr_vhyp_mmu.c                  |  2 +-
  hw/ppc/virtex_ml507.c                    |  2 +-
  hw/riscv/microblaze-v-generic.c          |  2 +-
  hw/s390x/ap-bridge.c                     |  2 +-
  hw/s390x/s390-hypercall.c                |  2 +-
  hw/s390x/s390-pci-vfio.c                 |  3 ++-
  hw/s390x/s390-stattrib.c                 |  2 +-
  hw/s390x/tod-tcg.c                       |  2 +-
  hw/sh4/r2d.c                             |  2 +-
  hw/sparc/leon3.c                         |  2 +-
  hw/sparc/sun4m.c                         |  2 +-
  hw/sparc64/niagara.c                     |  2 +-
  hw/sparc64/sparc64.c                     |  2 +-
  hw/sparc64/sun4u.c                       |  2 +-
  hw/tricore/tricore_testboard.c           |  2 +-
  hw/xtensa/pic_cpu.c                      |  2 +-
  hw/xtensa/xtfpga.c                       |  2 +-
  target-info-stub.c                       |  1 +
  target/arm/hvf/hvf.c                     |  2 +-
  target/m68k/m68k-semi.c                  |  2 +-
  target/ppc/mmu-booke.c                   |  3 ++-
  target/ppc/mmu-hash64.c                  |  3 ++-
  target/ppc/mmu-radix64.c                 |  3 ++-
  target/xtensa/cpu.c                      |  1 +
  hw/misc/meson.build                      |  6 +++---
  hw/timer/meson.build                     |  2 +-
  111 files changed, 120 insertions(+), 113 deletions(-)


Since this series only fixes include, and passes full CI in all configurations, I would invite you to pull it for this release, to reduce risk of conflicts.

Regards,
Pierrick

Reply via email to