[PATCH v2 00/38] target/cpu: Do not include 'exec/cpu-defs.h' anymore

[PATCH v2 00/38] target/cpu: Do not include 'exec/cpu-defs.h' anymore

[Philippe Mathieu-Daudé]

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/20260312224702.1608408-2-pierrick.bouvier@linaro.org/

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(-)

-- 
2.53.0

[PATCH v2 01/38] target/arm: Remove target_ulong use in hvf_handle_psci_call()

[Philippe Mathieu-Daudé]

Similarly to commit 3580aa03547 ("target/arm/tcg/psci.c: make
compilation unit common") which replaced the target_ulong use in
arm_handle_psci_call(), replace the one in hvf_handle_psci_call.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/arm/hvf/hvf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
index 5fc8f6bbbd9..678afe5c8e1 100644
--- a/target/arm/hvf/hvf.c
+++ b/target/arm/hvf/hvf.c
@@ -1418,7 +1418,7 @@ static bool hvf_handle_psci_call(CPUState *cpu, int *excp_ret)
     bool target_aarch64 = true;
     CPUState *target_cpu_state;
     ARMCPU *target_cpu;
-    target_ulong entry;
+    uint64_t entry;
     int target_el = 1;
     int32_t ret = 0;
 
-- 
2.53.0

[PATCH v2 02/38] target/ppc: Replace TARGET_PAGE_BITS -> qemu_target_page_bits()

[Philippe Mathieu-Daudé]

Get the target page bits at runtime.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/ppc/mmu-booke.c   | 3 ++-
 target/ppc/mmu-hash64.c  | 3 ++-
 target/ppc/mmu-radix64.c | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/target/ppc/mmu-booke.c b/target/ppc/mmu-booke.c
index 55e5dd7c6b0..9cc66c613b7 100644
--- a/target/ppc/mmu-booke.c
+++ b/target/ppc/mmu-booke.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "exec/page-protection.h"
+#include "exec/target_page.h"
 #include "exec/log.h"
 #include "cpu.h"
 #include "internal.h"
@@ -492,7 +493,7 @@ bool ppc_booke_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType access_type,
     if (ret == 0) {
         *raddrp = raddr;
         *protp = prot;
-        *psizep = TARGET_PAGE_BITS;
+        *psizep = qemu_target_page_bits();
         return true;
     } else if (!guest_visible) {
         return false;
diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c
index d026abadd11..2c33d98001d 100644
--- a/target/ppc/mmu-hash64.c
+++ b/target/ppc/mmu-hash64.c
@@ -21,6 +21,7 @@
 #include "qemu/units.h"
 #include "cpu.h"
 #include "exec/page-protection.h"
+#include "exec/target_page.h"
 #include "qemu/error-report.h"
 #include "qemu/qemu-print.h"
 #include "system/hw_accel.h"
@@ -1065,7 +1066,7 @@ bool ppc_hash64_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType access_type,
 
         *raddrp = raddr;
         *protp = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
-        *psizep = TARGET_PAGE_BITS;
+        *psizep = qemu_target_page_bits();
         return true;
     }
 
diff --git a/target/ppc/mmu-radix64.c b/target/ppc/mmu-radix64.c
index 33ac3412901..a09ba2b8d1a 100644
--- a/target/ppc/mmu-radix64.c
+++ b/target/ppc/mmu-radix64.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/page-protection.h"
+#include "exec/target_page.h"
 #include "qemu/error-report.h"
 #include "system/kvm.h"
 #include "system/memory.h"
@@ -717,7 +718,7 @@ static bool ppc_radix64_xlate_impl(PowerPCCPU *cpu, vaddr eaddr,
            }
         }
         *protp = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
-        *psizep = TARGET_PAGE_BITS;
+        *psizep = qemu_target_page_bits();
         return true;
     }
 
-- 
2.53.0

[PATCH v2 03/38] hw/s390x/vfio: Replace TARGET_PAGE_BITS -> qemu_target_page_bits()

[Philippe Mathieu-Daudé]

Get the target page bits at runtime.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/s390x/s390-pci-vfio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c
index 8ce44dbecce..7c754b656da 100644
--- a/hw/s390x/s390-pci-vfio.c
+++ b/hw/s390x/s390-pci-vfio.c
@@ -22,6 +22,7 @@
 #include "hw/vfio/pci.h"
 #include "hw/vfio/vfio-container-legacy.h"
 #include "hw/vfio/vfio-helpers.h"
+#include "exec/target_page.h"
 
 /*
  * Get the current DMA available count from vfio.  Returns true if vfio is
@@ -150,7 +151,7 @@ static void s390_pci_read_base(S390PCIBusDevice *pbdev,
      * to request that the guest free DMA mappings as necessary.
      */
     if (!pbdev->rtr_avail) {
-        vfio_size = pbdev->iommu->max_dma_limit << TARGET_PAGE_BITS;
+        vfio_size = pbdev->iommu->max_dma_limit << qemu_target_page_bits();
         if (vfio_size > 0 && vfio_size < cap->end_dma - cap->start_dma + 1) {
             pbdev->zpci_fn.edma = cap->start_dma + vfio_size - 1;
         }
-- 
2.53.0

[PATCH v2 04/38] monitor/hmp: : Include missing 'exec/target_long.h' header

[Philippe Mathieu-Daudé]

The "exec/target_long.h" header is indirectly included, pulled
via "cpu.h" -> "exec/cpu-defs.h". Include it explicitly otherwise
we'd get when removing the latter:

  monitor/hmp-target.h:35:5: error: type name requires a specifier or qualifier
     35 |     target_long (*get_value)(Monitor *mon, const struct MonitorDef *md,
        |     ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/monitor/hmp-target.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h
index 5167d17d41d..898473b3ed0 100644
--- a/include/monitor/hmp-target.h
+++ b/include/monitor/hmp-target.h
@@ -28,7 +28,7 @@
 typedef struct MonitorDef MonitorDef;
 
 #ifdef COMPILING_PER_TARGET
-#include "cpu.h"
+#include "exec/target_long.h"
 struct MonitorDef {
     const char *name;
     int offset;
-- 
2.53.0

[PATCH v2 05/38] target-info: Include 'exec/cpu-defs.h' explicitly

[Philippe Mathieu-Daudé]

The "exec/target_long.h" header is indirectly included, pulled
via "cpu.h" -> "exec/cpu-defs.h". Include it explicitly otherwise
we'd get when removing the latter:

  ../target-info-stub.c:39:23: error: use of undeclared identifier 'TARGET_PAGE_BITS'
     39 |     .page_bits_init = TARGET_PAGE_BITS,
        |                       ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target-info-stub.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target-info-stub.c b/target-info-stub.c
index f5896a72621..07d8647ed8e 100644
--- a/target-info-stub.c
+++ b/target-info-stub.c
@@ -11,6 +11,7 @@
 #include "qemu/target-info-impl.h"
 #include "hw/core/boards.h"
 #include "cpu.h"
+#include "exec/cpu-defs.h"
 #include "exec/page-vary.h"
 
 /* Validate correct placement of CPUArchState. */
-- 
2.53.0

[PATCH v2 06/38] target/xtensa: Restrict inclusion of 'exec/cpu-defs.h' header

[Philippe Mathieu-Daudé]

Not all files including "target/xtensa/cpu.h" require the
"exec/cpu-defs.h": only 'cpu.c'. Restrict to it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/xtensa/cpu.h | 1 -
 target/xtensa/cpu.c | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h
index 22192924841..dfd2ceab7cf 100644
--- a/target/xtensa/cpu.h
+++ b/target/xtensa/cpu.h
@@ -31,7 +31,6 @@
 #include "cpu-qom.h"
 #include "qemu/cpu-float.h"
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "hw/core/clock.h"
 #include "xtensa-isa.h"
diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c
index 86ec899a67c..dcf3cd84c84 100644
--- a/target/xtensa/cpu.c
+++ b/target/xtensa/cpu.c
@@ -30,6 +30,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "exec/cpu-defs.h"
 #include "cpu.h"
 #include "fpu/softfloat.h"
 #include "qemu/module.h"
-- 
2.53.0

[PATCH v2 07/38] target/hexagon: Include missing 'exec/target_long.h' header

[Philippe Mathieu-Daudé]

The "exec/target_long.h" header is indirectly included, pulled
via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
when removing the latter:

  ../target/hexagon/cpu.h:76:5: error: unknown type name ‘target_ulong’
     76 |     target_ulong gpr[TOTAL_PER_THREAD_REGS];
        |     ^~~~~~~~~~~~
  ../target/hexagon/mmvec/mmvec.h:69:5: error: unknown type name ‘target_ulong’
     69 |     target_ulong va[MAX_VEC_SIZE_BYTES];
        |     ^~~~~~~~~~~~

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/hexagon/cpu.h         | 2 ++
 target/hexagon/mmvec/mmvec.h | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h
index 85afd592778..7a91399fe02 100644
--- a/target/hexagon/cpu.h
+++ b/target/hexagon/cpu.h
@@ -23,9 +23,11 @@
 #include "cpu-qom.h"
 #include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
+#include "exec/target_long.h"
 #include "hex_regs.h"
 #include "mmvec/mmvec.h"
 #include "hw/core/registerfields.h"
+#include "qemu/bitmap.h"
 
 #ifndef CONFIG_USER_ONLY
 #error "Hexagon does not support system emulation"
diff --git a/target/hexagon/mmvec/mmvec.h b/target/hexagon/mmvec/mmvec.h
index 52d470709c0..4a4f6cc9805 100644
--- a/target/hexagon/mmvec/mmvec.h
+++ b/target/hexagon/mmvec/mmvec.h
@@ -18,6 +18,9 @@
 #ifndef HEXAGON_MMVEC_H
 #define HEXAGON_MMVEC_H
 
+#include "exec/target_long.h"
+#include "qemu/bitmap.h"
+
 #define MAX_VEC_SIZE_LOGBYTES 7
 #define MAX_VEC_SIZE_BYTES  (1 << MAX_VEC_SIZE_LOGBYTES)
 
-- 
2.53.0

[PATCH v2 08/38] target/hppa: Include missing 'exec/target_long.h' header

[Philippe Mathieu-Daudé]

The "exec/target_long.h" header is indirectly included, pulled
via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
when removing the latter:

  target/hppa/cpu.h:375:1: error: unknown type name 'target_ulong'
    375 | target_ulong cpu_hppa_get_psw(CPUHPPAState *env);
        | ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/hppa/cpu.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h
index 7d47afe8efa..6ea4c9b6826 100644
--- a/target/hppa/cpu.h
+++ b/target/hppa/cpu.h
@@ -24,6 +24,7 @@
 #include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
+#include "exec/target_long.h"
 #include "system/memory.h"
 #include "qemu/cpu-float.h"
 #include "qemu/interval-tree.h"
-- 
2.53.0

[PATCH v2 09/38] target/i386: Include missing 'exec/target_long.h' header

[Philippe Mathieu-Daudé]

The "exec/target_long.h" header is indirectly included, pulled
via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
when removing the latter:

  ../target/i386/cpu.h:2777:43: error: unknown type name 'target_ulong'
   2777 | void cpu_x86_update_cr3(CPUX86State *env, target_ulong new_cr3);
        |                                           ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/i386/cpu.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 0b539155c40..6fad9571e25 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -26,6 +26,7 @@
 #include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
+#include "exec/target_long.h"
 #include "exec/memop.h"
 #include "hw/i386/apic.h"
 #include "hw/i386/topology.h"
-- 
2.53.0

[PATCH v2 10/38] target/m68k: Include missing 'exec/target_long.h' header

[Philippe Mathieu-Daudé]

The "exec/target_long.h" header is indirectly included, pulled
via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
when removing the latter:

  ../target/m68k/m68k-semi.c:53:5: error: use of undeclared identifier 'target_ulong'
     53 |     target_ulong args = env->dregs[1];
        |     ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/m68k/m68k-semi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index bdc798a28cb..d2a071ea677 100644
--- a/target/m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
@@ -22,7 +22,7 @@
  */
 
 #include "qemu/osdep.h"
-
+#include "exec/target_long.h"
 #include "cpu.h"
 #include "gdbstub/syscalls.h"
 #include "gdbstub/helpers.h"
-- 
2.53.0

[PATCH v2 11/38] target/mips: Include missing 'exec/target_long.h' header

[Philippe Mathieu-Daudé]

The "exec/target_long.h" header is indirectly included, pulled
via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
when removing the latter:

  target/mips/cpu.h:462:5: error: unknown type name 'target_ulong'
    462 |     target_ulong gpr[32];
        |     ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/mips/cpu.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/mips/cpu.h b/target/mips/cpu.h
index ed662135cb0..3517d2d42cf 100644
--- a/target/mips/cpu.h
+++ b/target/mips/cpu.h
@@ -5,6 +5,7 @@
 #include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
+#include "exec/target_long.h"
 #ifndef CONFIG_USER_ONLY
 #include "system/memory.h"
 #endif
-- 
2.53.0

[PATCH v2 12/38] target/ppc: Include missing 'exec/target_long.h' header

[Philippe Mathieu-Daudé]

The "exec/target_long.h" header is indirectly included, pulled
via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
when removing the latter:

  target/ppc/cpu.h:1281:5: error: unknown type name 'target_ulong'
   1281 |     target_ulong gpr[32];  /* general purpose registers */
        |     ^
  hw/ppc/spapr_ovec.h:76:44: error: unknown type name 'target_ulong'
         76 | SpaprOptionVector *spapr_ovec_parse_vector(target_ulong table_addr, int vector);
            |                                            ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/ppc/spapr_ovec.h | 2 +-
 target/ppc/cpu.h            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/hw/ppc/spapr_ovec.h b/include/hw/ppc/spapr_ovec.h
index c3e8b98e7e2..8d67f492d02 100644
--- a/include/hw/ppc/spapr_ovec.h
+++ b/include/hw/ppc/spapr_ovec.h
@@ -37,7 +37,7 @@
 #ifndef SPAPR_OVEC_H
 #define SPAPR_OVEC_H
 
-#include "cpu.h"
+#include "exec/target_long.h"
 
 typedef struct SpaprOptionVector SpaprOptionVector;
 
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index d637a50798f..a0df7a467ed 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -25,6 +25,7 @@
 #include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
+#include "exec/target_long.h"
 #include "cpu-qom.h"
 #include "qom/object.h"
 #include "hw/core/registerfields.h"
-- 
2.53.0

[PATCH v2 13/38] target/riscv: Include missing 'exec/target_long.h' header

[Philippe Mathieu-Daudé]

The "exec/target_long.h" header is indirectly included, pulled
via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
when removing the latter:

  ../target/riscv/cpu.h:605:1: error: unknown type name ‘target_ulong’
    605 | target_ulong riscv_cpu_get_geilen(CPURISCVState *env);
        | ^~~~~~~~~~~~
  ../target/riscv/pmp.h:73:1: error: unknown type name 'target_ulong'
     73 | target_ulong mseccfg_csr_read(CPURISCVState *env);
        | ^
  ../target/riscv/debug.h:139:1: error: unknown type name 'target_ulong'
    139 | target_ulong tselect_csr_read(CPURISCVState *env);
        | ^
  ../hw/misc/riscv_cmgcr.c:112:15: error: unknown type name 'target_ulong'
    112 | static inline target_ulong get_exception_base(RISCVGCRVPState *vps)
        |               ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/riscv/cpu.h    | 1 +
 target/riscv/debug.h  | 1 +
 target/riscv/pmp.h    | 1 +
 hw/misc/riscv_cmgcr.c | 1 +
 4 files changed, 4 insertions(+)

diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index 35d1f6362ca..f30d3006166 100644
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -27,6 +27,7 @@
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "exec/gdbstub.h"
+#include "exec/target_long.h"
 #include "qemu/cpu-float.h"
 #include "qom/object.h"
 #include "qemu/int128.h"
diff --git a/target/riscv/debug.h b/target/riscv/debug.h
index f76b8f944a2..066e9c585f1 100644
--- a/target/riscv/debug.h
+++ b/target/riscv/debug.h
@@ -23,6 +23,7 @@
 #define RISCV_DEBUG_H
 
 #include "exec/breakpoint.h"
+#include "exec/target_long.h"
 
 #define RV_MAX_TRIGGERS         2
 
diff --git a/target/riscv/pmp.h b/target/riscv/pmp.h
index 271cf241699..97ceddc0013 100644
--- a/target/riscv/pmp.h
+++ b/target/riscv/pmp.h
@@ -22,6 +22,7 @@
 #ifndef RISCV_PMP_H
 #define RISCV_PMP_H
 
+#include "exec/target_long.h"
 #include "cpu.h"
 
 typedef enum {
diff --git a/hw/misc/riscv_cmgcr.c b/hw/misc/riscv_cmgcr.c
index b0294e76635..a4d56e3b308 100644
--- a/hw/misc/riscv_cmgcr.c
+++ b/hw/misc/riscv_cmgcr.c
@@ -19,6 +19,7 @@
 #include "migration/vmstate.h"
 #include "hw/misc/riscv_cmgcr.h"
 #include "hw/core/qdev-properties.h"
+#include "exec/target_page.h"
 
 #include "cpu.h"
 
-- 
2.53.0

[PATCH v2 14/38] target/sparc: Include missing 'exec/target_long.h' header

[Philippe Mathieu-Daudé]

The "exec/target_long.h" header is indirectly included, pulled
via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
when removing the latter:

  ../target/sparc/cpu.h:615:1: error: unknown type name 'target_ulong'
    615 | target_ulong cpu_get_fsr(CPUSPARCState *);
        | ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/sparc/cpu.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h
index 0139732e4cc..155aa8ec637 100644
--- a/target/sparc/cpu.h
+++ b/target/sparc/cpu.h
@@ -5,6 +5,7 @@
 #include "cpu-qom.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
+#include "exec/target_long.h"
 #include "qemu/cpu-float.h"
 
 #if !defined(TARGET_SPARC64)
-- 
2.53.0

[PATCH v2 15/38] system/kvm_xen: Include missing 'exec/target_page.h' header

[Philippe Mathieu-Daudé]

The "exec/target_page.h" header is indirectly included. Include
it explicitly otherwise we get when refactoring unrelated headers:

  include/system/kvm_xen.h:41:55: error: ‘TARGET_PAGE_BITS’ undeclared (first use in this function)
     41 | #define XEN_SPECIAL_PFN(x) ((XEN_SPECIAL_AREA_ADDR >> TARGET_PAGE_BITS) + \
        |                                                       ^~~~~~~~~~~~~~~~

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/system/kvm_xen.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/system/kvm_xen.h b/include/system/kvm_xen.h
index 7d0e69f1334..ed8c357193c 100644
--- a/include/system/kvm_xen.h
+++ b/include/system/kvm_xen.h
@@ -12,6 +12,8 @@
 #ifndef QEMU_SYSTEM_KVM_XEN_H
 #define QEMU_SYSTEM_KVM_XEN_H
 
+#include "exec/target_page.h"
+
 /* The KVM API uses these to indicate "no GPA" or "no GFN" */
 #define INVALID_GPA UINT64_MAX
 #define INVALID_GFN UINT64_MAX
-- 
2.53.0

[PATCH v2 16/38] hw/misc/cpc: Include missing 'hw/core/cpu.h' header

[Philippe Mathieu-Daudé]

The "hw/core/cpu.h" header is indirectly included. Include it
explicitly otherwise we get when refactoring unrelated headers:

  ../hw/misc/mips_cpc.c:36:53: error: unknown type name 'run_on_cpu_data'
     36 | static void mips_cpu_reset_async_work(CPUState *cs, run_on_cpu_data data)
        |                                                     ^
  ../hw/misc/mips_cpc.c:40:5: error: call to undeclared function 'cpu_reset'
       40 |     cpu_reset(cs);
          |     ^
  ../hw/misc/riscv_cpc.c:34:54: error: unknown type name 'run_on_cpu_data'
     34 | static void riscv_cpu_reset_async_work(CPUState *cs, run_on_cpu_data data)
        |                                                      ^
  ../hw/misc/riscv_cpc.c:39:5: error: call to undeclared function 'cpu_reset'
     39 |     cpu_reset(cs);
        |     ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/misc/mips_cpc.c  | 1 +
 hw/misc/riscv_cpc.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c
index 924de855ee2..d092f76f44d 100644
--- a/hw/misc/mips_cpc.c
+++ b/hw/misc/mips_cpc.c
@@ -22,6 +22,7 @@
 #include "cpu.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
+#include "hw/core/cpu.h"
 #include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 
diff --git a/hw/misc/riscv_cpc.c b/hw/misc/riscv_cpc.c
index 4bf2fd8db16..e04ccdf54fa 100644
--- a/hw/misc/riscv_cpc.c
+++ b/hw/misc/riscv_cpc.c
@@ -18,6 +18,7 @@
 #include "qemu/module.h"
 #include "qemu/timer.h"
 #include "qemu/bitops.h"
+#include "hw/core/cpu.h"
 #include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 
-- 
2.53.0

[PATCH v2 17/38] target/s390x/tcg: Include missing '*cpu.h' headers

[Philippe Mathieu-Daudé]

The "hw/core/cpu.h" header (declaring run_on_cpu_data) and
"target/s390x/cpu.h" are indirectly included. Include them
explicitly otherwise we get when refactoring unrelated headers:

  ../target/s390x/tcg/tcg_s390x.h:17:44: error: unknown type name 'CPUS390XState'; did you mean 'CPUSH4State'?
     17 | G_NORETURN void tcg_s390_program_interrupt(CPUS390XState *env,
        |                                            ^~~~~~~~~~~~~
        |                                            CPUSH4State

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/s390x/tcg/tcg_s390x.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/target/s390x/tcg/tcg_s390x.h b/target/s390x/tcg/tcg_s390x.h
index 7c8aede80d2..975f60085ac 100644
--- a/target/s390x/tcg/tcg_s390x.h
+++ b/target/s390x/tcg/tcg_s390x.h
@@ -13,6 +13,9 @@
 #ifndef TCG_S390X_H
 #define TCG_S390X_H
 
+#include "target/s390x/cpu.h"
+#include "hw/core/cpu.h"
+
 void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque);
 G_NORETURN void tcg_s390_program_interrupt(CPUS390XState *env,
                                            uint32_t code, uintptr_t ra);
-- 
2.53.0

[PATCH v2 18/38] exec/helper-head: Include missing 'exec/target_long.h' header

[Philippe Mathieu-Daudé]

TARGET_LONG_BITS is defined in "exec/target_long.h" (which
is currently included implicitly by various headers).

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/exec/helper-head.h.inc | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/include/exec/helper-head.h.inc b/include/exec/helper-head.h.inc
index 5b248fd7138..7dec5f5b067 100644
--- a/include/exec/helper-head.h.inc
+++ b/include/exec/helper-head.h.inc
@@ -46,14 +46,13 @@
 #define dh_ctype(t) dh_ctype_##t
 
 #ifdef COMPILING_PER_TARGET
-# ifdef TARGET_LONG_BITS
-#  if TARGET_LONG_BITS == 32
-#   define dh_alias_tl i32
-#   define dh_typecode_tl dh_typecode_i32
-#  else
-#   define dh_alias_tl i64
-#   define dh_typecode_tl dh_typecode_i64
-#  endif
+# include "exec/target_long.h"
+# if TARGET_LONG_BITS == 32
+#  define dh_alias_tl i32
+#  define dh_typecode_tl dh_typecode_i32
+# else
+#  define dh_alias_tl i64
+#  define dh_typecode_tl dh_typecode_i64
 # endif
 # define dh_ctype_tl target_ulong
 #endif /* COMPILING_PER_TARGET */
-- 
2.53.0

[PATCH v2 19/38] target/cpu: Do not include 'exec/cpu-defs.h' anymore

[Philippe Mathieu-Daudé]

Nothing in all our target "cpu.h" directly uses definitions
from "exec/cpu-defs.h": no need to include it there. This
remove a lot of target-specificities, simplifying inclusion
of target "cpu.h" by common code.

Inspired-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/alpha/cpu.h      | 1 -
 target/arm/cpu.h        | 1 -
 target/avr/cpu.h        | 1 -
 target/hexagon/cpu.h    | 1 -
 target/hppa/cpu.h       | 1 -
 target/i386/cpu.h       | 1 -
 target/loongarch/cpu.h  | 1 -
 target/m68k/cpu.h       | 1 -
 target/microblaze/cpu.h | 1 -
 target/mips/cpu.h       | 1 -
 target/or1k/cpu.h       | 1 -
 target/ppc/cpu.h        | 1 -
 target/riscv/cpu.h      | 1 -
 target/rx/cpu.h         | 1 -
 target/s390x/cpu.h      | 1 -
 target/sh4/cpu.h        | 1 -
 target/sparc/cpu.h      | 1 -
 target/tricore/cpu.h    | 1 -
 18 files changed, 18 deletions(-)

diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h
index 45944e46b54..bffa1da7ee6 100644
--- a/target/alpha/cpu.h
+++ b/target/alpha/cpu.h
@@ -22,7 +22,6 @@
 
 #include "cpu-qom.h"
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "qemu/cpu-float.h"
 
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 657ff4ab20b..445d5a8a31d 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -25,7 +25,6 @@
 #include "hw/core/registerfields.h"
 #include "cpu-qom.h"
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "exec/gdbstub.h"
 #include "exec/page-protection.h"
diff --git a/target/avr/cpu.h b/target/avr/cpu.h
index 518e243d812..3da885c7ccb 100644
--- a/target/avr/cpu.h
+++ b/target/avr/cpu.h
@@ -23,7 +23,6 @@
 
 #include "cpu-qom.h"
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "system/memory.h"
 
diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h
index 7a91399fe02..800ef6305e6 100644
--- a/target/hexagon/cpu.h
+++ b/target/hexagon/cpu.h
@@ -22,7 +22,6 @@
 
 #include "cpu-qom.h"
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "exec/target_long.h"
 #include "hex_regs.h"
 #include "mmvec/mmvec.h"
diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h
index 6ea4c9b6826..85f39401423 100644
--- a/target/hppa/cpu.h
+++ b/target/hppa/cpu.h
@@ -22,7 +22,6 @@
 
 #include "cpu-qom.h"
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "exec/target_long.h"
 #include "system/memory.h"
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 6fad9571e25..e5ae29f8af1 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -24,7 +24,6 @@
 #include "cpu-qom.h"
 #include "kvm/hyperv-proto.h"
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "exec/target_long.h"
 #include "exec/memop.h"
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
index 4d333806ed8..096d7789285 100644
--- a/target/loongarch/cpu.h
+++ b/target/loongarch/cpu.h
@@ -10,7 +10,6 @@
 
 #include "qemu/int128.h"
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "fpu/softfloat-types.h"
 #include "hw/core/registerfields.h"
diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h
index 7911ab9de30..d7f508a9e80 100644
--- a/target/m68k/cpu.h
+++ b/target/m68k/cpu.h
@@ -22,7 +22,6 @@
 #define M68K_CPU_H
 
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "qemu/cpu-float.h"
 #include "cpu-qom.h"
diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h
index d26b933b6d0..7e7b024bd1e 100644
--- a/target/microblaze/cpu.h
+++ b/target/microblaze/cpu.h
@@ -22,7 +22,6 @@
 
 #include "cpu-qom.h"
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "qemu/cpu-float.h"
 #include "exec/cpu-interrupt.h"
 
diff --git a/target/mips/cpu.h b/target/mips/cpu.h
index 3517d2d42cf..17e9f6039ec 100644
--- a/target/mips/cpu.h
+++ b/target/mips/cpu.h
@@ -3,7 +3,6 @@
 
 #include "cpu-qom.h"
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "exec/target_long.h"
 #ifndef CONFIG_USER_ONLY
diff --git a/target/or1k/cpu.h b/target/or1k/cpu.h
index c8e2827930b..5bb39b67519 100644
--- a/target/or1k/cpu.h
+++ b/target/or1k/cpu.h
@@ -22,7 +22,6 @@
 
 #include "cpu-qom.h"
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "fpu/softfloat-types.h"
 
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index a0df7a467ed..aba8109bbba 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -23,7 +23,6 @@
 #include "qemu/int128.h"
 #include "qemu/cpu-float.h"
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "exec/target_long.h"
 #include "cpu-qom.h"
diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index f30d3006166..633d5301f30 100644
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -24,7 +24,6 @@
 #include "hw/core/registerfields.h"
 #include "hw/core/qdev-properties.h"
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "exec/gdbstub.h"
 #include "exec/target_long.h"
diff --git a/target/rx/cpu.h b/target/rx/cpu.h
index b3b1ecff5af..b500b7a2474 100644
--- a/target/rx/cpu.h
+++ b/target/rx/cpu.h
@@ -24,7 +24,6 @@
 #include "cpu-qom.h"
 
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "qemu/cpu-float.h"
 
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index 40bc1f0741d..3acbe83f0fc 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -28,7 +28,6 @@
 #include "cpu-qom.h"
 #include "cpu_models.h"
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "qemu/cpu-float.h"
 #include "qapi/qapi-types-machine-common.h"
diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h
index b0759010c47..e36268b4256 100644
--- a/target/sh4/cpu.h
+++ b/target/sh4/cpu.h
@@ -22,7 +22,6 @@
 
 #include "cpu-qom.h"
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "qemu/cpu-float.h"
 
diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h
index 155aa8ec637..ac0eb9f0faa 100644
--- a/target/sparc/cpu.h
+++ b/target/sparc/cpu.h
@@ -3,7 +3,6 @@
 
 #include "qemu/bswap.h"
 #include "cpu-qom.h"
-#include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "exec/target_long.h"
 #include "qemu/cpu-float.h"
diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h
index ab46192e261..604fb7792c6 100644
--- a/target/tricore/cpu.h
+++ b/target/tricore/cpu.h
@@ -23,7 +23,6 @@
 #include "cpu-qom.h"
 #include "hw/core/registerfields.h"
 #include "exec/cpu-common.h"
-#include "exec/cpu-defs.h"
 #include "qemu/cpu-float.h"
 #include "tricore-defs.h"
 
-- 
2.53.0

[PATCH v2 20/38] hw/alpha: Include full path to target 'cpu.h' header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/alpha/dp264.c   | 2 +-
 hw/alpha/typhoon.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index 98219f04569..86be3ff129b 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -7,7 +7,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "cpu.h"
+#include "target/alpha/cpu.h"
 #include "exec/target_page.h"
 #include "elf.h"
 #include "hw/core/loader.h"
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 7722d4fd009..e32fed86f9f 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -12,7 +12,7 @@
 #include "exec/cpu-interrupt.h"
 #include "qapi/error.h"
 #include "hw/pci/pci_host.h"
-#include "cpu.h"
+#include "target/alpha/cpu.h"
 #include "hw/core/irq.h"
 #include "alpha_sys.h"
 
-- 
2.53.0

[PATCH v2 21/38] hw/arm: Include full path to target 'cpu.h' header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 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 +-
 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/intc/arm_gicv3_cpuif.c        | 2 +-
 hw/intc/arm_gicv3_cpuif_common.c | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/hw/arm/digic.h b/include/hw/arm/digic.h
index 8f2735c284f..646802806e0 100644
--- a/include/hw/arm/digic.h
+++ b/include/hw/arm/digic.h
@@ -18,7 +18,7 @@
 #ifndef HW_ARM_DIGIC_H
 #define HW_ARM_DIGIC_H
 
-#include "cpu.h"
+#include "target/arm/cpu.h"
 #include "hw/timer/digic-timer.h"
 #include "hw/char/digic-uart.h"
 #include "qom/object.h"
diff --git a/include/hw/arm/fsl-imx6.h b/include/hw/arm/fsl-imx6.h
index bb866994dff..cddd100dd6e 100644
--- a/include/hw/arm/fsl-imx6.h
+++ b/include/hw/arm/fsl-imx6.h
@@ -35,7 +35,7 @@
 #include "hw/pci-host/designware.h"
 #include "hw/core/or-irq.h"
 #include "system/memory.h"
-#include "cpu.h"
+#include "target/arm/cpu.h"
 #include "qom/object.h"
 
 #define TYPE_FSL_IMX6 "fsl-imx6"
diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h
index 4e3209b25b2..f8f9c249a23 100644
--- a/include/hw/arm/fsl-imx6ul.h
+++ b/include/hw/arm/fsl-imx6ul.h
@@ -34,7 +34,7 @@
 #include "hw/usb/chipidea.h"
 #include "hw/usb/imx-usb-phy.h"
 #include "system/memory.h"
-#include "cpu.h"
+#include "target/arm/cpu.h"
 #include "qom/object.h"
 #include "qemu/units.h"
 
diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h
index 710831c8bf5..a573e0dd4f8 100644
--- a/include/hw/arm/fsl-imx7.h
+++ b/include/hw/arm/fsl-imx7.h
@@ -37,7 +37,7 @@
 #include "hw/pci-host/designware.h"
 #include "hw/usb/chipidea.h"
 #include "hw/core/or-irq.h"
-#include "cpu.h"
+#include "target/arm/cpu.h"
 #include "qom/object.h"
 #include "qemu/units.h"
 
diff --git a/include/hw/arm/fsl-imx8mp.h b/include/hw/arm/fsl-imx8mp.h
index 4b367b754c6..3b6183ed1d6 100644
--- a/include/hw/arm/fsl-imx8mp.h
+++ b/include/hw/arm/fsl-imx8mp.h
@@ -9,7 +9,7 @@
 #ifndef FSL_IMX8MP_H
 #define FSL_IMX8MP_H
 
-#include "cpu.h"
+#include "target/arm/cpu.h"
 #include "hw/char/imx_serial.h"
 #include "hw/gpio/imx_gpio.h"
 #include "hw/i2c/imx_i2c.h"
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index c97d4c4e118..780b6be6371 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -14,7 +14,7 @@
 #include <libfdt.h>
 #include "hw/arm/boot.h"
 #include "hw/arm/linux-boot-if.h"
-#include "cpu.h"
+#include "target/arm/cpu.h"
 #include "exec/tswap.h"
 #include "exec/target_page.h"
 #include "system/kvm.h"
diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
index 25c385ba1f5..5efe95030c0 100644
--- a/hw/arm/exynos4210.c
+++ b/hw/arm/exynos4210.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "exec/tswap.h"
-#include "cpu.h"
+#include "target/arm/cpu.h"
 #include "hw/cpu/a9mpcore.h"
 #include "hw/core/irq.h"
 #include "system/blockdev.h"
diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c
index 2d64a198c42..caad820d3bc 100644
--- a/hw/arm/mps3r.c
+++ b/hw/arm/mps3r.c
@@ -29,7 +29,7 @@
 #include "qapi/error.h"
 #include "qobject/qlist.h"
 #include "system/address-spaces.h"
-#include "cpu.h"
+#include "target/arm/cpu.h"
 #include "system/system.h"
 #include "hw/core/boards.h"
 #include "hw/core/or-irq.h"
diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index 47d0f0d7362..980959166d3 100644
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -22,7 +22,7 @@
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "qapi/error.h"
-#include "cpu.h"
+#include "target/arm/cpu.h"
 #include "system/address-spaces.h"
 #include "exec/cpu-common.h"
 #include "hw/core/hw-error.h"
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index c9558be4d45..7e8acd34acd 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "cpu.h"
+#include "target/arm/cpu.h"
 #include "hw/core/sysbus.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/primecell.h"
diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
index 068108e49b8..b83e3c99ea5 100644
--- a/hw/arm/smmuv3.c
+++ b/hw/arm/smmuv3.c
@@ -25,7 +25,7 @@
 #include "hw/core/qdev-properties.h"
 #include "hw/core/qdev.h"
 #include "hw/pci/pci.h"
-#include "cpu.h"
+#include "target/arm/cpu.h"
 #include "exec/target_page.h"
 #include "trace.h"
 #include "qemu/log.h"
diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c
index eaf1e512ede..fcb3922fa0f 100644
--- a/hw/intc/arm_gicv3_cpuif.c
+++ b/hw/intc/arm_gicv3_cpuif.c
@@ -19,7 +19,7 @@
 #include "trace.h"
 #include "gicv3_internal.h"
 #include "hw/core/irq.h"
-#include "cpu.h"
+#include "target/arm/cpu.h"
 #include "target/arm/cpregs.h"
 #include "target/arm/cpu-features.h"
 #include "target/arm/internals.h"
diff --git a/hw/intc/arm_gicv3_cpuif_common.c b/hw/intc/arm_gicv3_cpuif_common.c
index ff1239f65db..e03085592e4 100644
--- a/hw/intc/arm_gicv3_cpuif_common.c
+++ b/hw/intc/arm_gicv3_cpuif_common.c
@@ -11,7 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "gicv3_internal.h"
-#include "cpu.h"
+#include "target/arm/cpu.h"
 
 void gicv3_set_gicv3state(CPUState *cpu, GICv3CPUState *s)
 {
-- 
2.53.0

[PATCH v2 22/38] hw/avr: Include full path to target 'cpu.h' header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/avr/boot.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/avr/boot.h b/hw/avr/boot.h
index 9eed2055591..c5efa54d98c 100644
--- a/hw/avr/boot.h
+++ b/hw/avr/boot.h
@@ -12,7 +12,7 @@
 #define HW_AVR_BOOT_H
 
 #include "hw/core/boards.h"
-#include "cpu.h"
+#include "target/avr/cpu.h"
 
 /**
  * avr_load_firmware:   load an image into a memory region
-- 
2.53.0

[PATCH v2 23/38] hw/hppa: Include full path to target 'cpu.h' header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/hppa/machine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index ec63dc12979..3a96ba00cfb 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -7,7 +7,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/datadir.h"
-#include "cpu.h"
+#include "target/hppa/cpu.h"
 #include "elf.h"
 #include "hw/core/loader.h"
 #include "qemu/error-report.h"
-- 
2.53.0

[PATCH v2 24/38] hw/i386: Include full path to target 'cpu.h' header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/i386/apic_internal.h | 2 +-
 hw/i386/multiboot.c             | 2 +-
 hw/i386/pc_sysfw_ovmf.c         | 2 +-
 hw/i386/vmmouse.c               | 2 +-
 hw/isa/lpc_ich9.c               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h
index 0cb06bbc76c..a26d53bb9d9 100644
--- a/include/hw/i386/apic_internal.h
+++ b/include/hw/i386/apic_internal.h
@@ -21,7 +21,7 @@
 #ifndef QEMU_APIC_INTERNAL_H
 #define QEMU_APIC_INTERNAL_H
 
-#include "cpu.h"
+#include "target/i386/cpu.h"
 #include "hw/i386/apic.h"
 #include "system/memory.h"
 #include "qemu/timer.h"
diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
index 0e960a15dda..d544b62afbd 100644
--- a/hw/i386/multiboot.c
+++ b/hw/i386/multiboot.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/option.h"
-#include "cpu.h"
+#include "target/i386/cpu.h"
 #include "hw/nvram/fw_cfg.h"
 #include "multiboot.h"
 #include "hw/core/loader.h"
diff --git a/hw/i386/pc_sysfw_ovmf.c b/hw/i386/pc_sysfw_ovmf.c
index da947c3ca41..196eb0c83ed 100644
--- a/hw/i386/pc_sysfw_ovmf.c
+++ b/hw/i386/pc_sysfw_ovmf.c
@@ -27,7 +27,7 @@
 #include "qemu/error-report.h"
 #include "hw/i386/pc.h"
 #include "exec/target_page.h"
-#include "cpu.h"
+#include "target/i386/cpu.h"
 
 #define OVMF_TABLE_FOOTER_GUID "96b582de-1fb2-45f7-baea-a366c55a082d"
 
diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
index c1aeeca0c9a..20ebb0dbbf6 100644
--- a/hw/i386/vmmouse.c
+++ b/hw/i386/vmmouse.c
@@ -29,7 +29,7 @@
 #include "hw/input/i8042.h"
 #include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
-#include "cpu.h"
+#include "target/i386/cpu.h"
 #include "qom/object.h"
 
 #include "trace.h"
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index 51dc680029d..9cec18a378c 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -30,7 +30,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "cpu.h"
+#include "target/i386/cpu.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "qemu/range.h"
-- 
2.53.0

[PATCH v2 25/38] hw/m68k: Include full path to target 'cpu.h' header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/intc/m68k_irqc.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 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hw/intc/m68k_irqc.c b/hw/intc/m68k_irqc.c
index c652bf143f0..68ddb5351be 100644
--- a/hw/intc/m68k_irqc.c
+++ b/hw/intc/m68k_irqc.c
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "cpu.h"
+#include "target/m68k/cpu.h"
 #include "migration/vmstate.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/nmi.h"
diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index f92a5d6a339..1acd2fbdfb3 100644
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "cpu.h"
+#include "target/m68k/cpu.h"
 #include "hw/m68k/mcf.h"
 #include "hw/core/boards.h"
 #include "hw/core/loader.h"
diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
index c5befa02eb5..9f373b99b12 100644
--- a/hw/m68k/mcf5206.c
+++ b/hw/m68k/mcf5206.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"
-#include "cpu.h"
+#include "target/m68k/cpu.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/boards.h"
 #include "hw/core/irq.h"
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index 0e07aa45e9d..a8068c91f24 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -20,7 +20,7 @@
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "qemu/datadir.h"
-#include "cpu.h"
+#include "target/m68k/cpu.h"
 #include "hw/core/irq.h"
 #include "hw/m68k/mcf.h"
 #include "hw/m68k/mcf_fec.h"
diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c
index 1014fe6fa57..e8d3bd937de 100644
--- a/hw/m68k/mcf_intc.c
+++ b/hw/m68k/mcf_intc.c
@@ -10,7 +10,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "qemu/log.h"
-#include "cpu.h"
+#include "target/m68k/cpu.h"
 #include "hw/core/irq.h"
 #include "hw/core/sysbus.h"
 #include "hw/m68k/mcf.h"
diff --git a/hw/m68k/q800-glue.c b/hw/m68k/q800-glue.c
index 24fccab9666..ac9062c6488 100644
--- a/hw/m68k/q800-glue.c
+++ b/hw/m68k/q800-glue.c
@@ -21,7 +21,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "cpu.h"
+#include "target/m68k/cpu.h"
 #include "hw/m68k/q800-glue.h"
 #include "hw/core/boards.h"
 #include "hw/core/irq.h"
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index ded531394e6..bcd1f99df81 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -26,7 +26,7 @@
 #include "qemu/guest-random.h"
 #include "exec/target_page.h"
 #include "system/system.h"
-#include "cpu.h"
+#include "target/m68k/cpu.h"
 #include "hw/core/boards.h"
 #include "hw/core/or-irq.h"
 #include "elf.h"
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index e67900c727d..f25ba64d835 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -12,7 +12,7 @@
 #include "qemu/guest-random.h"
 #include "exec/target_page.h"
 #include "system/system.h"
-#include "cpu.h"
+#include "target/m68k/cpu.h"
 #include "hw/core/boards.h"
 #include "hw/core/qdev-properties.h"
 #include "elf.h"
-- 
2.53.0

[PATCH v2 26/38] hw/microblaze: Include full path to target 'cpu.h' header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 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 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index a6f9ebab90c..b4a80b042b8 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -26,7 +26,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/datadir.h"
-#include "cpu.h"
+#include "target/microblaze/cpu.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index b3bdc4d65f2..8f9f54ff1e2 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -28,7 +28,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "cpu.h"
+#include "target/microblaze/cpu.h"
 #include "hw/core/sysbus.h"
 #include "net/net.h"
 #include "hw/block/flash.h"
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index 0c9a6bf2529..c5f64319009 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -27,7 +27,7 @@
 #include "qemu/target-info.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "cpu.h"
+#include "target/microblaze/cpu.h"
 #include "hw/core/sysbus.h"
 #include "net/net.h"
 #include "hw/block/flash.h"
diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c
index f4c55589b7f..00154236bf8 100644
--- a/hw/microblaze/xlnx-zynqmp-pmu.c
+++ b/hw/microblaze/xlnx-zynqmp-pmu.c
@@ -19,7 +19,7 @@
 #include "qapi/error.h"
 #include "system/address-spaces.h"
 #include "hw/core/boards.h"
-#include "cpu.h"
+#include "target/microblaze/cpu.h"
 #include "boot.h"
 
 #include "hw/intc/xlnx-zynqmp-ipi.h"
-- 
2.53.0

[PATCH v2 27/38] hw/mips: Include full path to target 'cpu.h' header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/intc/mips_gic.h | 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         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/hw/intc/mips_gic.h b/include/hw/intc/mips_gic.h
index e2e6f0a168c..b3b64fec855 100644
--- a/include/hw/intc/mips_gic.h
+++ b/include/hw/intc/mips_gic.h
@@ -14,7 +14,7 @@
 #include "qemu/units.h"
 #include "hw/timer/mips_gictimer.h"
 #include "hw/core/sysbus.h"
-#include "cpu.h"
+#include "target/mips/cpu.h"
 #include "qom/object.h"
 /*
  * GIC Specific definitions
diff --git a/hw/mips/bootloader.c b/hw/mips/bootloader.c
index 1dd6ef20968..aa4abcf4c36 100644
--- a/hw/mips/bootloader.c
+++ b/hw/mips/bootloader.c
@@ -11,7 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/bitops.h"
-#include "cpu.h"
+#include "target/mips/cpu.h"
 #include "hw/mips/bootloader.h"
 
 typedef enum bl_reg {
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index d0efe36f7ce..1297dc967e4 100644
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -22,7 +22,7 @@
 #include "qemu/datadir.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "cpu.h"
+#include "target/mips/cpu.h"
 #include "hw/core/clock.h"
 #include "net/net.h"
 #include "hw/core/boards.h"
diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index e0adb96c548..bec534d38b0 100644
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -52,7 +52,7 @@
 #ifdef CONFIG_TCG
 #include "accel/tcg/cpu-ops.h"
 #endif /* CONFIG_TCG */
-#include "cpu.h"
+#include "target/mips/cpu.h"
 
 enum jazz_model_e {
     JAZZ_MAGNUM,
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index 812ff64d831..0cbe9956e74 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -61,7 +61,7 @@
 #include "hw/core/qdev-clock.h"
 #include "target/mips/internal.h"
 #include "trace.h"
-#include "cpu.h"
+#include "target/mips/cpu.h"
 
 #define ENVP_PADDR          0x2000
 #define ENVP_VADDR          cpu_mips_phys_to_kseg0(NULL, ENVP_PADDR)
diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c
index d092f76f44d..9d9c8bf6ec8 100644
--- a/hw/misc/mips_cpc.c
+++ b/hw/misc/mips_cpc.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "cpu.h"
+#include "target/mips/cpu.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/core/cpu.h"
-- 
2.53.0

[PATCH v2 28/38] hw/or1k: Include full path to target 'cpu.h' header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/or1k/boot.c     | 2 +-
 hw/or1k/cputimer.c | 2 +-
 hw/or1k/or1k-sim.c | 2 +-
 hw/or1k/virt.c     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/or1k/boot.c b/hw/or1k/boot.c
index c18f4a6a9fc..714634b5f3f 100644
--- a/hw/or1k/boot.c
+++ b/hw/or1k/boot.c
@@ -7,7 +7,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "cpu.h"
+#include "target/or1k/cpu.h"
 #include "exec/cpu-defs.h"
 #include "exec/target_page.h"
 #include "elf.h"
diff --git a/hw/or1k/cputimer.c b/hw/or1k/cputimer.c
index 51da226fcde..b35411aa1e1 100644
--- a/hw/or1k/cputimer.c
+++ b/hw/or1k/cputimer.c
@@ -19,7 +19,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "cpu.h"
+#include "target/or1k/cpu.h"
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
 #include "system/reset.h"
diff --git a/hw/or1k/or1k-sim.c b/hw/or1k/or1k-sim.c
index f1b1f63274b..b55105cd148 100644
--- a/hw/or1k/or1k-sim.c
+++ b/hw/or1k/or1k-sim.c
@@ -21,7 +21,7 @@
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "cpu.h"
+#include "target/or1k/cpu.h"
 #include "hw/core/irq.h"
 #include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
diff --git a/hw/or1k/virt.c b/hw/or1k/virt.c
index 39f54058ab3..2ff5c084a2b 100644
--- a/hw/or1k/virt.c
+++ b/hw/or1k/virt.c
@@ -10,7 +10,7 @@
 #include "qemu/error-report.h"
 #include "qemu/guest-random.h"
 #include "qapi/error.h"
-#include "cpu.h"
+#include "target/or1k/cpu.h"
 #include "system/address-spaces.h"
 #include "hw/core/irq.h"
 #include "hw/core/boards.h"
-- 
2.53.0

[PATCH v2 29/38] hw/ppc: Include full path to target 'cpu.h' header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/ppc/pnv.h          | 2 +-
 include/hw/ppc/spapr_fadump.h | 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 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h
index 24f8843a409..5581ba0f683 100644
--- a/include/hw/ppc/pnv.h
+++ b/include/hw/ppc/pnv.h
@@ -20,7 +20,7 @@
 #ifndef PPC_PNV_H
 #define PPC_PNV_H
 
-#include "cpu.h"
+#include "target/ppc/cpu.h"
 #include "hw/core/boards.h"
 #include "hw/core/sysbus.h"
 #include "hw/ipmi/ipmi.h"
diff --git a/include/hw/ppc/spapr_fadump.h b/include/hw/ppc/spapr_fadump.h
index 82681fb9a6a..778981bc95e 100644
--- a/include/hw/ppc/spapr_fadump.h
+++ b/include/hw/ppc/spapr_fadump.h
@@ -6,7 +6,7 @@
 #ifndef PPC_SPAPR_FADUMP_H
 #define PPC_SPAPR_FADUMP_H
 
-#include "cpu.h"
+#include "target/ppc/cpu.h"
 
 /* Fadump commands */
 #define FADUMP_CMD_REGISTER            1
diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c
index 88ae573d1e8..3f2bbc0a511 100644
--- a/hw/ppc/mpc8544_guts.c
+++ b/hw/ppc/mpc8544_guts.c
@@ -20,7 +20,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "system/runstate.h"
-#include "cpu.h"
+#include "target/ppc/cpu.h"
 #include "hw/core/sysbus.h"
 #include "qom/object.h"
 
diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c
index 582698559d2..6a5d3edc490 100644
--- a/hw/ppc/mpc8544ds.c
+++ b/hw/ppc/mpc8544ds.c
@@ -15,7 +15,7 @@
 #include "hw/ppc/openpic.h"
 #include "qemu/error-report.h"
 #include "qemu/units.h"
-#include "cpu.h"
+#include "target/ppc/cpu.h"
 
 static void mpc8544ds_fixup_devtree(void *fdt)
 {
diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
index 0f28a7937fb..634046506e8 100644
--- a/hw/ppc/ppc440_uc.c
+++ b/hw/ppc/ppc440_uc.c
@@ -19,7 +19,7 @@
 #include "hw/pci/pci.h"
 #include "exec/cpu-common.h"
 #include "system/reset.h"
-#include "cpu.h"
+#include "target/ppc/cpu.h"
 #include "ppc440.h"
 
 /*****************************************************************************/
diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c
index 1e6b6fec5da..ae1ac4f4672 100644
--- a/hw/ppc/ppc4xx_devs.c
+++ b/hw/ppc/ppc4xx_devs.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "cpu.h"
+#include "target/ppc/cpu.h"
 #include "hw/ppc/ppc4xx.h"
 #include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
diff --git a/hw/ppc/ppc_booke.c b/hw/ppc/ppc_booke.c
index 7c6e5df9fde..052c8c931ae 100644
--- a/hw/ppc/ppc_booke.c
+++ b/hw/ppc/ppc_booke.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "cpu.h"
+#include "target/ppc/cpu.h"
 #include "exec/target_page.h"
 #include "hw/ppc/ppc.h"
 #include "qemu/timer.h"
diff --git a/hw/ppc/prep_systemio.c b/hw/ppc/prep_systemio.c
index bc8b0964e75..5cd18a9e123 100644
--- a/hw/ppc/prep_systemio.c
+++ b/hw/ppc/prep_systemio.c
@@ -33,7 +33,7 @@
 #include "qemu/error-report.h" /* for error_report() */
 #include "qemu/module.h"
 #include "system/runstate.h"
-#include "cpu.h"
+#include "target/ppc/cpu.h"
 #include "trace.h"
 
 #define TYPE_PREP_SYSTEMIO "prep-systemio"
diff --git a/hw/ppc/spapr_vhyp_mmu.c b/hw/ppc/spapr_vhyp_mmu.c
index 2d41d7f77b7..9cc3aeb2a29 100644
--- a/hw/ppc/spapr_vhyp_mmu.c
+++ b/hw/ppc/spapr_vhyp_mmu.c
@@ -11,7 +11,7 @@
 #include "qemu/cutils.h"
 #include "qemu/memalign.h"
 #include "qemu/error-report.h"
-#include "cpu.h"
+#include "target/ppc/cpu.h"
 #include "helper_regs.h"
 #include "hw/ppc/spapr.h"
 #include "mmu-hash64.h"
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 51b3d7d7121..d10d9135890 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -26,7 +26,7 @@
 #include "qemu/datadir.h"
 #include "qemu/units.h"
 #include "exec/page-protection.h"
-#include "cpu.h"
+#include "target/ppc/cpu.h"
 #include "hw/core/sysbus.h"
 #include "hw/char/serial-mm.h"
 #include "hw/block/flash.h"
-- 
2.53.0

[PATCH v2 30/38] hw/riscv: Include full path to target 'cpu.h' header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/misc/riscv_cmgcr.c           | 2 +-
 hw/misc/riscv_cpc.c             | 2 +-
 hw/riscv/microblaze-v-generic.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/misc/riscv_cmgcr.c b/hw/misc/riscv_cmgcr.c
index a4d56e3b308..0390996f78b 100644
--- a/hw/misc/riscv_cmgcr.c
+++ b/hw/misc/riscv_cmgcr.c
@@ -21,7 +21,7 @@
 #include "hw/core/qdev-properties.h"
 #include "exec/target_page.h"
 
-#include "cpu.h"
+#include "target/riscv/cpu.h"
 
 #define CM_RESET_VEC 0x1FC00000
 #define GCR_ADDRSPACE_SZ        0x8000
diff --git a/hw/misc/riscv_cpc.c b/hw/misc/riscv_cpc.c
index e04ccdf54fa..37fdd0b39ba 100644
--- a/hw/misc/riscv_cpc.c
+++ b/hw/misc/riscv_cpc.c
@@ -13,7 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "cpu.h"
+#include "target/riscv/cpu.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"
diff --git a/hw/riscv/microblaze-v-generic.c b/hw/riscv/microblaze-v-generic.c
index d56b64792d7..b0494b1ac50 100644
--- a/hw/riscv/microblaze-v-generic.c
+++ b/hw/riscv/microblaze-v-generic.c
@@ -16,7 +16,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "cpu.h"
+#include "target/riscv/cpu.h"
 #include "hw/core/sysbus.h"
 #include "system/system.h"
 #include "net/net.h"
-- 
2.53.0

[PATCH v2 31/38] hw/s390x: Include full path to target 'cpu.h' header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/s390x/ipl.h            | 2 +-
 hw/s390x/s390-hypercall.h | 2 +-
 hw/s390x/ap-bridge.c      | 2 +-
 hw/s390x/s390-hypercall.c | 2 +-
 hw/s390x/s390-stattrib.c  | 2 +-
 hw/s390x/tod-tcg.c        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
index 403cd08450d..fac30763df2 100644
--- a/hw/s390x/ipl.h
+++ b/hw/s390x/ipl.h
@@ -13,7 +13,7 @@
 #ifndef HW_S390_IPL_H
 #define HW_S390_IPL_H
 
-#include "cpu.h"
+#include "target/s390x/cpu.h"
 #include "exec/target_page.h"
 #include "system/address-spaces.h"
 #include "system/memory.h"
diff --git a/hw/s390x/s390-hypercall.h b/hw/s390x/s390-hypercall.h
index 4f07209128c..c5a2b17e858 100644
--- a/hw/s390x/s390-hypercall.h
+++ b/hw/s390x/s390-hypercall.h
@@ -12,7 +12,7 @@
 #ifndef HW_S390_HYPERCALL_H
 #define HW_S390_HYPERCALL_H
 
-#include "cpu.h"
+#include "target/s390x/cpu.h"
 
 #define DIAG500_VIRTIO_NOTIFY           0 /* legacy, implemented as a NOP */
 #define DIAG500_VIRTIO_RESET            1 /* legacy */
diff --git a/hw/s390x/ap-bridge.c b/hw/s390x/ap-bridge.c
index 5cdbf098074..c7e49d966ba 100644
--- a/hw/s390x/ap-bridge.c
+++ b/hw/s390x/ap-bridge.c
@@ -14,7 +14,7 @@
 #include "qemu/bitops.h"
 #include "qemu/module.h"
 #include "hw/s390x/ap-bridge.h"
-#include "cpu.h"
+#include "target/s390x/cpu.h"
 
 static char *ap_bus_get_dev_path(DeviceState *dev)
 {
diff --git a/hw/s390x/s390-hypercall.c b/hw/s390x/s390-hypercall.c
index 508dd97ca0d..71dc717d08a 100644
--- a/hw/s390x/s390-hypercall.c
+++ b/hw/s390x/s390-hypercall.c
@@ -11,7 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "cpu.h"
+#include "target/s390x/cpu.h"
 #include "hw/s390x/s390-virtio-ccw.h"
 #include "hw/s390x/s390-hypercall.h"
 #include "hw/s390x/ioinst.h"
diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c
index d808ece3b92..2e83aa211cd 100644
--- a/hw/s390x/s390-stattrib.c
+++ b/hw/s390x/s390-stattrib.c
@@ -20,7 +20,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qobject/qdict.h"
-#include "cpu.h"
+#include "target/s390x/cpu.h"
 
 /* 512KiB cover 2GB of guest memory */
 #define CMMA_BLOCK_SIZE  (512 * KiB)
diff --git a/hw/s390x/tod-tcg.c b/hw/s390x/tod-tcg.c
index 0cc96624e1b..448b531b2ea 100644
--- a/hw/s390x/tod-tcg.c
+++ b/hw/s390x/tod-tcg.c
@@ -14,7 +14,7 @@
 #include "qemu/timer.h"
 #include "qemu/cutils.h"
 #include "qemu/module.h"
-#include "cpu.h"
+#include "target/s390x/cpu.h"
 #include "tcg/tcg_s390x.h"
 #include "system/rtc.h"
 
-- 
2.53.0

[PATCH v2 32/38] hw/sh4: Include full path to target 'cpu.h' header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/intc/sh_intc.c | 2 +-
 hw/sh4/r2d.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c
index 16e4b619d6d..0da82f9d5e0 100644
--- a/hw/intc/sh_intc.c
+++ b/hw/intc/sh_intc.c
@@ -10,7 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "cpu.h"
+#include "target/sh4/cpu.h"
 #include "hw/sh4/sh_intc.h"
 #include "hw/core/irq.h"
 #include "hw/sh4/sh.h"
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index acb3fe75a8b..99afe3618e8 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -27,7 +27,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "cpu.h"
+#include "target/sh4/cpu.h"
 #include "hw/core/sysbus.h"
 #include "hw/sh4/sh.h"
 #include "system/reset.h"
-- 
2.53.0

[PATCH v2 33/38] hw/sparc: Include full path to target 'cpu.h' header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 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 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 9147d56bd4e..d4a6e917598 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -30,7 +30,7 @@
 #include "qapi/error.h"
 #include "qemu/datadir.h"
 #include "exec/cpu-common.h"
-#include "cpu.h"
+#include "target/sparc/cpu.h"
 #include "hw/core/irq.h"
 #include "qemu/timer.h"
 #include "hw/core/ptimer.h"
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 46fcbdda97e..550acdff6d4 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -26,7 +26,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "qemu/datadir.h"
-#include "cpu.h"
+#include "target/sparc/cpu.h"
 #include "exec/target_page.h"
 #include "hw/core/sysbus.h"
 #include "qemu/error-report.h"
diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
index 209be380473..1211ecb82d4 100644
--- a/hw/sparc64/niagara.c
+++ b/hw/sparc64/niagara.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "block/block_int-common.h"
 #include "qemu/units.h"
-#include "cpu.h"
+#include "target/sparc/cpu.h"
 #include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "hw/misc/unimp.h"
diff --git a/hw/sparc64/sparc64.c b/hw/sparc64/sparc64.c
index ce7eded143b..16f4aa052bc 100644
--- a/hw/sparc64/sparc64.c
+++ b/hw/sparc64/sparc64.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "cpu.h"
+#include "target/sparc/cpu.h"
 #include "hw/core/boards.h"
 #include "hw/sparc/sparc64.h"
 #include "qemu/timer.h"
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 2e41785b783..d69ed9a81ac 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -27,7 +27,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qemu/datadir.h"
-#include "cpu.h"
+#include "target/sparc/cpu.h"
 #include "exec/target_page.h"
 #include "hw/core/irq.h"
 #include "hw/pci/pci.h"
-- 
2.53.0

[PATCH v2 34/38] hw/tricore: Include full path to target 'cpu.h' header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/tricore/tricore_testboard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index 60772d4f1d7..d5d796c8eec 100644
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -21,7 +21,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "cpu.h"
+#include "target/tricore/cpu.h"
 #include "net/net.h"
 #include "hw/core/boards.h"
 #include "hw/core/loader.h"
-- 
2.53.0

[PATCH v2 35/38] hw/xtensa: Include full path to target 'cpu.h' header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/xtensa/xtensa_memory.h | 2 +-
 hw/xtensa/pic_cpu.c       | 2 +-
 hw/xtensa/xtfpga.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/xtensa/xtensa_memory.h b/hw/xtensa/xtensa_memory.h
index af7e8025e3c..c86ad06685a 100644
--- a/hw/xtensa/xtensa_memory.h
+++ b/hw/xtensa/xtensa_memory.h
@@ -28,7 +28,7 @@
 #ifndef XTENSA_MEMORY_H
 #define XTENSA_MEMORY_H
 
-#include "cpu.h"
+#include "target/xtensa/cpu.h"
 
 void xtensa_create_memory_regions(const XtensaMemory *memory,
                                   const char *name,
diff --git a/hw/xtensa/pic_cpu.c b/hw/xtensa/pic_cpu.c
index c00167859a2..370a353f1e3 100644
--- a/hw/xtensa/pic_cpu.c
+++ b/hw/xtensa/pic_cpu.c
@@ -26,7 +26,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "cpu.h"
+#include "target/xtensa/cpu.h"
 #include "exec/cpu-interrupt.h"
 #include "hw/core/irq.h"
 #include "qemu/log.h"
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index ed24720f94a..5e509216df8 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -28,7 +28,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "cpu.h"
+#include "target/xtensa/cpu.h"
 #include "system/system.h"
 #include "hw/core/boards.h"
 #include "hw/core/loader.h"
-- 
2.53.0

[PATCH v2 36/38] hw/misc/allwinner-cpucfg.c: make compilation unit common

[Philippe Mathieu-Daudé]

From: Pierrick Bouvier <pierrick.bouvier@linaro.org>

include "target/arm/cpu.h" is needed because of:
bool target_aa64 = arm_feature(cpu_env(target_cpu), ARM_FEATURE_AARCH64);

This file is reused between various allwinner boards, including 32 and
64 bits cpus.

Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/misc/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/misc/meson.build b/hw/misc/meson.build
index 96b6705b7d0..392d30b1423 100644
--- a/hw/misc/meson.build
+++ b/hw/misc/meson.build
@@ -46,7 +46,7 @@ system_ss.add(when: 'CONFIG_ALLWINNER_SRAMC', if_true: files('allwinner-sramc.c'
 system_ss.add(when: 'CONFIG_ALLWINNER_A10_CCM', if_true: files('allwinner-a10-ccm.c'))
 system_ss.add(when: 'CONFIG_ALLWINNER_A10_DRAMC', if_true: files('allwinner-a10-dramc.c'))
 system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-ccu.c'))
-specific_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-cpucfg.c'))
+system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-cpucfg.c'))
 system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-dramc.c'))
 system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-sysctrl.c'))
 system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sid.c'))
-- 
2.53.0

[PATCH v2 37/38] hw/avr: Build as common unit files

[Philippe Mathieu-Daudé]

Nothing there is target-specific anymore.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/misc/meson.build  | 2 +-
 hw/timer/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/misc/meson.build b/hw/misc/meson.build
index 392d30b1423..a2601e1c433 100644
--- a/hw/misc/meson.build
+++ b/hw/misc/meson.build
@@ -152,7 +152,7 @@ system_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_ahb_apb_pnp.c'))
 
 system_ss.add(when: 'CONFIG_I2C_ECHO', if_true: files('i2c-echo.c'))
 
-specific_ss.add(when: 'CONFIG_AVR_POWER', if_true: files('avr_power.c'))
+system_ss.add(when: 'CONFIG_AVR_POWER', if_true: files('avr_power.c'))
 
 specific_ss.add(when: 'CONFIG_MAC_VIA', if_true: files('mac_via.c'))
 
diff --git a/hw/timer/meson.build b/hw/timer/meson.build
index 178321c029c..201b5d8316d 100644
--- a/hw/timer/meson.build
+++ b/hw/timer/meson.build
@@ -33,4 +33,4 @@ system_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_timer.c'))
 specific_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_timer.c'))
 system_ss.add(when: 'CONFIG_SIFIVE_PWM', if_true: files('sifive_pwm.c'))
 
-specific_ss.add(when: 'CONFIG_AVR_TIMER16', if_true: files('avr_timer16.c'))
+system_ss.add(when: 'CONFIG_AVR_TIMER16', if_true: files('avr_timer16.c'))
-- 
2.53.0

[PATCH v2 38/38] hw/misc: Build 'mac_via' as common unit file

[Philippe Mathieu-Daudé]

Nothing there is target-specific anymore.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/misc/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/misc/meson.build b/hw/misc/meson.build
index a2601e1c433..cd084a19363 100644
--- a/hw/misc/meson.build
+++ b/hw/misc/meson.build
@@ -154,7 +154,7 @@ system_ss.add(when: 'CONFIG_I2C_ECHO', if_true: files('i2c-echo.c'))
 
 system_ss.add(when: 'CONFIG_AVR_POWER', if_true: files('avr_power.c'))
 
-specific_ss.add(when: 'CONFIG_MAC_VIA', if_true: files('mac_via.c'))
+system_ss.add(when: 'CONFIG_MAC_VIA', if_true: files('mac_via.c'))
 
 specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_cmgcr.c', 'mips_cpc.c'))
 specific_ss.add(when: 'CONFIG_MIPS_ITU', if_true: files('mips_itu.c'))
-- 
2.53.0

Re: [PATCH v2 03/38] hw/s390x/vfio: Replace TARGET_PAGE_BITS -> qemu_target_page_bits()

[Thomas Huth]

On 13/03/2026 07.20, Philippe Mathieu-Daudé wrote:
> Get the target page bits at runtime.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/s390x/s390-pci-vfio.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c
> index 8ce44dbecce..7c754b656da 100644
> --- a/hw/s390x/s390-pci-vfio.c
> +++ b/hw/s390x/s390-pci-vfio.c
> @@ -22,6 +22,7 @@
>   #include "hw/vfio/pci.h"
>   #include "hw/vfio/vfio-container-legacy.h"
>   #include "hw/vfio/vfio-helpers.h"
> +#include "exec/target_page.h"
>   
>   /*
>    * Get the current DMA available count from vfio.  Returns true if vfio is
> @@ -150,7 +151,7 @@ static void s390_pci_read_base(S390PCIBusDevice *pbdev,
>        * to request that the guest free DMA mappings as necessary.
>        */
>       if (!pbdev->rtr_avail) {
> -        vfio_size = pbdev->iommu->max_dma_limit << TARGET_PAGE_BITS;
> +        vfio_size = pbdev->iommu->max_dma_limit << qemu_target_page_bits();
>           if (vfio_size > 0 && vfio_size < cap->end_dma - cap->start_dma + 1) {
>               pbdev->zpci_fn.edma = cap->start_dma + vfio_size - 1;
>           }

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

Re: [PATCH v2 04/38] monitor/hmp: : Include missing 'exec/target_long.h' header

[Thomas Huth]

On 13/03/2026 07.20, Philippe Mathieu-Daudé wrote:
> The "exec/target_long.h" header is indirectly included, pulled
> via "cpu.h" -> "exec/cpu-defs.h". Include it explicitly otherwise
> we'd get when removing the latter:
> 
>    monitor/hmp-target.h:35:5: error: type name requires a specifier or qualifier
>       35 |     target_long (*get_value)(Monitor *mon, const struct MonitorDef *md,
>          |     ^
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/monitor/hmp-target.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h
> index 5167d17d41d..898473b3ed0 100644
> --- a/include/monitor/hmp-target.h
> +++ b/include/monitor/hmp-target.h
> @@ -28,7 +28,7 @@
>   typedef struct MonitorDef MonitorDef;
>   
>   #ifdef COMPILING_PER_TARGET
> -#include "cpu.h"
> +#include "exec/target_long.h"
>   struct MonitorDef {
>       const char *name;
>       int offset;

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

Re: [PATCH v2 17/38] target/s390x/tcg: Include missing '*cpu.h' headers

[Thomas Huth]

On 13/03/2026 07.20, Philippe Mathieu-Daudé wrote:
> The "hw/core/cpu.h" header (declaring run_on_cpu_data) and
> "target/s390x/cpu.h" are indirectly included. Include them
> explicitly otherwise we get when refactoring unrelated headers:
> 
>    ../target/s390x/tcg/tcg_s390x.h:17:44: error: unknown type name 'CPUS390XState'; did you mean 'CPUSH4State'?
>       17 | G_NORETURN void tcg_s390_program_interrupt(CPUS390XState *env,
>          |                                            ^~~~~~~~~~~~~
>          |                                            CPUSH4State
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/s390x/tcg/tcg_s390x.h | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/target/s390x/tcg/tcg_s390x.h b/target/s390x/tcg/tcg_s390x.h
> index 7c8aede80d2..975f60085ac 100644
> --- a/target/s390x/tcg/tcg_s390x.h
> +++ b/target/s390x/tcg/tcg_s390x.h
> @@ -13,6 +13,9 @@
>   #ifndef TCG_S390X_H
>   #define TCG_S390X_H
>   
> +#include "target/s390x/cpu.h"
> +#include "hw/core/cpu.h"
> +
>   void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque);
>   G_NORETURN void tcg_s390_program_interrupt(CPUS390XState *env,
>                                              uint32_t code, uintptr_t ra);

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

Re: [PATCH v2 25/38] hw/m68k: Include full path to target 'cpu.h' header

[Thomas Huth]

On 13/03/2026 07.20, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/intc/m68k_irqc.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 +-
>   8 files changed, 8 insertions(+), 8 deletions(-)

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

Re: [PATCH v2 31/38] hw/s390x: Include full path to target 'cpu.h' header

[Thomas Huth]

On 13/03/2026 07.20, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/s390x/ipl.h            | 2 +-
>   hw/s390x/s390-hypercall.h | 2 +-
>   hw/s390x/ap-bridge.c      | 2 +-
>   hw/s390x/s390-hypercall.c | 2 +-
>   hw/s390x/s390-stattrib.c  | 2 +-
>   hw/s390x/tod-tcg.c        | 2 +-
>   6 files changed, 6 insertions(+), 6 deletions(-)

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

Re: [PATCH v2 38/38] hw/misc: Build 'mac_via' as common unit file

[Thomas Huth]

On 13/03/2026 07.20, Philippe Mathieu-Daudé wrote:
> Nothing there is target-specific anymore.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/misc/meson.build | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/misc/meson.build b/hw/misc/meson.build
> index a2601e1c433..cd084a19363 100644
> --- a/hw/misc/meson.build
> +++ b/hw/misc/meson.build
> @@ -154,7 +154,7 @@ system_ss.add(when: 'CONFIG_I2C_ECHO', if_true: files('i2c-echo.c'))
>   
>   system_ss.add(when: 'CONFIG_AVR_POWER', if_true: files('avr_power.c'))
>   
> -specific_ss.add(when: 'CONFIG_MAC_VIA', if_true: files('mac_via.c'))
> +system_ss.add(when: 'CONFIG_MAC_VIA', if_true: files('mac_via.c'))
>   
>   specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_cmgcr.c', 'mips_cpc.c'))
>   specific_ss.add(when: 'CONFIG_MIPS_ITU', if_true: files('mips_itu.c'))

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

Re: [PATCH v2 10/38] target/m68k: Include missing 'exec/target_long.h' header

[Thomas Huth]

On 13/03/2026 07.20, Philippe Mathieu-Daudé wrote:
> The "exec/target_long.h" header is indirectly included, pulled
> via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
> when removing the latter:
> 
>    ../target/m68k/m68k-semi.c:53:5: error: use of undeclared identifier 'target_ulong'
>       53 |     target_ulong args = env->dregs[1];
>          |     ^
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/m68k/m68k-semi.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
> index bdc798a28cb..d2a071ea677 100644
> --- a/target/m68k/m68k-semi.c
> +++ b/target/m68k/m68k-semi.c
> @@ -22,7 +22,7 @@
>    */
>   
>   #include "qemu/osdep.h"
> -
> +#include "exec/target_long.h"
>   #include "cpu.h"
>   #include "gdbstub/syscalls.h"
>   #include "gdbstub/helpers.h"

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

Re: [PATCH v2 16/38] hw/misc/cpc: Include missing 'hw/core/cpu.h' header

[Thomas Huth]

On 13/03/2026 07.20, Philippe Mathieu-Daudé wrote:
> The "hw/core/cpu.h" header is indirectly included. Include it
> explicitly otherwise we get when refactoring unrelated headers:
> 
>    ../hw/misc/mips_cpc.c:36:53: error: unknown type name 'run_on_cpu_data'
>       36 | static void mips_cpu_reset_async_work(CPUState *cs, run_on_cpu_data data)
>          |                                                     ^
>    ../hw/misc/mips_cpc.c:40:5: error: call to undeclared function 'cpu_reset'
>         40 |     cpu_reset(cs);
>            |     ^
>    ../hw/misc/riscv_cpc.c:34:54: error: unknown type name 'run_on_cpu_data'
>       34 | static void riscv_cpu_reset_async_work(CPUState *cs, run_on_cpu_data data)
>          |                                                      ^
>    ../hw/misc/riscv_cpc.c:39:5: error: call to undeclared function 'cpu_reset'
>       39 |     cpu_reset(cs);
>          |     ^
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/misc/mips_cpc.c  | 1 +
>   hw/misc/riscv_cpc.c | 1 +
>   2 files changed, 2 insertions(+)
> 
> diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c
> index 924de855ee2..d092f76f44d 100644
> --- a/hw/misc/mips_cpc.c
> +++ b/hw/misc/mips_cpc.c
> @@ -22,6 +22,7 @@
>   #include "cpu.h"
>   #include "qemu/log.h"
>   #include "qemu/module.h"
> +#include "hw/core/cpu.h"
>   #include "hw/core/sysbus.h"
>   #include "migration/vmstate.h"
>   
> diff --git a/hw/misc/riscv_cpc.c b/hw/misc/riscv_cpc.c
> index 4bf2fd8db16..e04ccdf54fa 100644
> --- a/hw/misc/riscv_cpc.c
> +++ b/hw/misc/riscv_cpc.c
> @@ -18,6 +18,7 @@
>   #include "qemu/module.h"
>   #include "qemu/timer.h"
>   #include "qemu/bitops.h"
> +#include "hw/core/cpu.h"
>   #include "hw/core/sysbus.h"
>   #include "migration/vmstate.h"
>   

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

Re: [PATCH v2 03/38] hw/s390x/vfio: Replace TARGET_PAGE_BITS -> qemu_target_page_bits()

[Cédric Le Goater]

On 3/13/26 11:25, Thomas Huth wrote:
> On 13/03/2026 07.20, Philippe Mathieu-Daudé wrote:
>> Get the target page bits at runtime.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> ---
>>   hw/s390x/s390-pci-vfio.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c
>> index 8ce44dbecce..7c754b656da 100644
>> --- a/hw/s390x/s390-pci-vfio.c
>> +++ b/hw/s390x/s390-pci-vfio.c
>> @@ -22,6 +22,7 @@
>>   #include "hw/vfio/pci.h"
>>   #include "hw/vfio/vfio-container-legacy.h"
>>   #include "hw/vfio/vfio-helpers.h"
>> +#include "exec/target_page.h"
>>   /*
>>    * Get the current DMA available count from vfio.  Returns true if vfio is
>> @@ -150,7 +151,7 @@ static void s390_pci_read_base(S390PCIBusDevice *pbdev,
>>        * to request that the guest free DMA mappings as necessary.
>>        */
>>       if (!pbdev->rtr_avail) {
>> -        vfio_size = pbdev->iommu->max_dma_limit << TARGET_PAGE_BITS;
>> +        vfio_size = pbdev->iommu->max_dma_limit << qemu_target_page_bits();
>>           if (vfio_size > 0 && vfio_size < cap->end_dma - cap->start_dma + 1) {
>>               pbdev->zpci_fn.edma = cap->start_dma + vfio_size - 1;
>>           }
> 
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> 

Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.

Re: [PATCH v2 07/38] target/hexagon: Include missing 'exec/target_long.h' header

[Brian Cain]

[-- Attachment #1: Type: text/plain, Size: 1831 bytes --]

On Fri, Mar 13, 2026 at 1:21 AM Philippe Mathieu-Daudé <philmd@linaro.org>
wrote:

> The "exec/target_long.h" header is indirectly included, pulled
> via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
> when removing the latter:
>
>   ../target/hexagon/cpu.h:76:5: error: unknown type name ‘target_ulong’
>      76 |     target_ulong gpr[TOTAL_PER_THREAD_REGS];
>         |     ^~~~~~~~~~~~
>   ../target/hexagon/mmvec/mmvec.h:69:5: error: unknown type name
> ‘target_ulong’
>      69 |     target_ulong va[MAX_VEC_SIZE_BYTES];
>         |     ^~~~~~~~~~~~
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>

Reviewed-by: Brian Cain <brian.cain@oss.qualcomm.com>

 target/hexagon/cpu.h         | 2 ++
>  target/hexagon/mmvec/mmvec.h | 3 +++
>  2 files changed, 5 insertions(+)
>
> diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h
> index 85afd592778..7a91399fe02 100644
> --- a/target/hexagon/cpu.h
> +++ b/target/hexagon/cpu.h
> @@ -23,9 +23,11 @@
>  #include "cpu-qom.h"
>  #include "exec/cpu-common.h"
>  #include "exec/cpu-defs.h"
> +#include "exec/target_long.h"
>  #include "hex_regs.h"
>  #include "mmvec/mmvec.h"
>  #include "hw/core/registerfields.h"
> +#include "qemu/bitmap.h"
>
>  #ifndef CONFIG_USER_ONLY
>  #error "Hexagon does not support system emulation"
> diff --git a/target/hexagon/mmvec/mmvec.h b/target/hexagon/mmvec/mmvec.h
> index 52d470709c0..4a4f6cc9805 100644
> --- a/target/hexagon/mmvec/mmvec.h
> +++ b/target/hexagon/mmvec/mmvec.h
> @@ -18,6 +18,9 @@
>  #ifndef HEXAGON_MMVEC_H
>  #define HEXAGON_MMVEC_H
>
> +#include "exec/target_long.h"
> +#include "qemu/bitmap.h"
> +
>  #define MAX_VEC_SIZE_LOGBYTES 7
>  #define MAX_VEC_SIZE_BYTES  (1 << MAX_VEC_SIZE_LOGBYTES)
>
> --
> 2.53.0
>
>
>

[-- Attachment #2: Type: text/html, Size: 2899 bytes --]

Re: [PATCH v2 01/38] target/arm: Remove target_ulong use in hvf_handle_psci_call()

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Similarly to commit 3580aa03547 ("target/arm/tcg/psci.c: make
> compilation unit common") which replaced the target_ulong use in
> arm_handle_psci_call(), replace the one in hvf_handle_psci_call.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/arm/hvf/hvf.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 02/38] target/ppc: Replace TARGET_PAGE_BITS -> qemu_target_page_bits()

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Get the target page bits at runtime.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/ppc/mmu-booke.c   | 3 ++-
>   target/ppc/mmu-hash64.c  | 3 ++-
>   target/ppc/mmu-radix64.c | 3 ++-
>   3 files changed, 6 insertions(+), 3 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 03/38] hw/s390x/vfio: Replace TARGET_PAGE_BITS -> qemu_target_page_bits()

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Get the target page bits at runtime.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/s390x/s390-pci-vfio.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 04/38] monitor/hmp: : Include missing 'exec/target_long.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> The "exec/target_long.h" header is indirectly included, pulled
> via "cpu.h" -> "exec/cpu-defs.h". Include it explicitly otherwise
> we'd get when removing the latter:
> 
>    monitor/hmp-target.h:35:5: error: type name requires a specifier or qualifier
>       35 |     target_long (*get_value)(Monitor *mon, const struct MonitorDef *md,
>          |     ^
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/monitor/hmp-target.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 05/38] target-info: Include 'exec/cpu-defs.h' explicitly

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> The "exec/target_long.h" header is indirectly included, pulled
> via "cpu.h" -> "exec/cpu-defs.h". Include it explicitly otherwise
> we'd get when removing the latter:
> 
>    ../target-info-stub.c:39:23: error: use of undeclared identifier 'TARGET_PAGE_BITS'
>       39 |     .page_bits_init = TARGET_PAGE_BITS,
>          |                       ^
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target-info-stub.c | 1 +
>   1 file changed, 1 insertion(+)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 06/38] target/xtensa: Restrict inclusion of 'exec/cpu-defs.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Not all files including "target/xtensa/cpu.h" require the
> "exec/cpu-defs.h": only 'cpu.c'. Restrict to it.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/xtensa/cpu.h | 1 -
>   target/xtensa/cpu.c | 1 +
>   2 files changed, 1 insertion(+), 1 deletion(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 07/38] target/hexagon: Include missing 'exec/target_long.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> The "exec/target_long.h" header is indirectly included, pulled
> via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
> when removing the latter:
> 
>    ../target/hexagon/cpu.h:76:5: error: unknown type name ‘target_ulong’
>       76 |     target_ulong gpr[TOTAL_PER_THREAD_REGS];
>          |     ^~~~~~~~~~~~
>    ../target/hexagon/mmvec/mmvec.h:69:5: error: unknown type name ‘target_ulong’
>       69 |     target_ulong va[MAX_VEC_SIZE_BYTES];
>          |     ^~~~~~~~~~~~
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/hexagon/cpu.h         | 2 ++
>   target/hexagon/mmvec/mmvec.h | 3 +++
>   2 files changed, 5 insertions(+)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 08/38] target/hppa: Include missing 'exec/target_long.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> The "exec/target_long.h" header is indirectly included, pulled
> via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
> when removing the latter:
> 
>    target/hppa/cpu.h:375:1: error: unknown type name 'target_ulong'
>      375 | target_ulong cpu_hppa_get_psw(CPUHPPAState *env);
>          | ^
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/hppa/cpu.h | 1 +
>   1 file changed, 1 insertion(+)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 09/38] target/i386: Include missing 'exec/target_long.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> The "exec/target_long.h" header is indirectly included, pulled
> via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
> when removing the latter:
> 
>    ../target/i386/cpu.h:2777:43: error: unknown type name 'target_ulong'
>     2777 | void cpu_x86_update_cr3(CPUX86State *env, target_ulong new_cr3);
>          |                                           ^
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/i386/cpu.h | 1 +
>   1 file changed, 1 insertion(+)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 10/38] target/m68k: Include missing 'exec/target_long.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> The "exec/target_long.h" header is indirectly included, pulled
> via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
> when removing the latter:
> 
>    ../target/m68k/m68k-semi.c:53:5: error: use of undeclared identifier 'target_ulong'
>       53 |     target_ulong args = env->dregs[1];
>          |     ^
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/m68k/m68k-semi.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 11/38] target/mips: Include missing 'exec/target_long.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> The "exec/target_long.h" header is indirectly included, pulled
> via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
> when removing the latter:
> 
>    target/mips/cpu.h:462:5: error: unknown type name 'target_ulong'
>      462 |     target_ulong gpr[32];
>          |     ^
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/mips/cpu.h | 1 +
>   1 file changed, 1 insertion(+)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 12/38] target/ppc: Include missing 'exec/target_long.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> The "exec/target_long.h" header is indirectly included, pulled
> via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
> when removing the latter:
> 
>    target/ppc/cpu.h:1281:5: error: unknown type name 'target_ulong'
>     1281 |     target_ulong gpr[32];  /* general purpose registers */
>          |     ^
>    hw/ppc/spapr_ovec.h:76:44: error: unknown type name 'target_ulong'
>           76 | SpaprOptionVector *spapr_ovec_parse_vector(target_ulong table_addr, int vector);
>              |                                            ^
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/hw/ppc/spapr_ovec.h | 2 +-
>   target/ppc/cpu.h            | 1 +
>   2 files changed, 2 insertions(+), 1 deletion(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 13/38] target/riscv: Include missing 'exec/target_long.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> The "exec/target_long.h" header is indirectly included, pulled
> via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
> when removing the latter:
> 
>    ../target/riscv/cpu.h:605:1: error: unknown type name ‘target_ulong’
>      605 | target_ulong riscv_cpu_get_geilen(CPURISCVState *env);
>          | ^~~~~~~~~~~~
>    ../target/riscv/pmp.h:73:1: error: unknown type name 'target_ulong'
>       73 | target_ulong mseccfg_csr_read(CPURISCVState *env);
>          | ^
>    ../target/riscv/debug.h:139:1: error: unknown type name 'target_ulong'
>      139 | target_ulong tselect_csr_read(CPURISCVState *env);
>          | ^
>    ../hw/misc/riscv_cmgcr.c:112:15: error: unknown type name 'target_ulong'
>      112 | static inline target_ulong get_exception_base(RISCVGCRVPState *vps)
>          |               ^
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/riscv/cpu.h    | 1 +
>   target/riscv/debug.h  | 1 +
>   target/riscv/pmp.h    | 1 +
>   hw/misc/riscv_cmgcr.c | 1 +
>   4 files changed, 4 insertions(+)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 14/38] target/sparc: Include missing 'exec/target_long.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> The "exec/target_long.h" header is indirectly included, pulled
> via "exec/cpu-defs.h". Include it explicitly otherwise we'd get
> when removing the latter:
> 
>    ../target/sparc/cpu.h:615:1: error: unknown type name 'target_ulong'
>      615 | target_ulong cpu_get_fsr(CPUSPARCState *);
>          | ^
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/sparc/cpu.h | 1 +
>   1 file changed, 1 insertion(+)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 15/38] system/kvm_xen: Include missing 'exec/target_page.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> The "exec/target_page.h" header is indirectly included. Include
> it explicitly otherwise we get when refactoring unrelated headers:
> 
>    include/system/kvm_xen.h:41:55: error: ‘TARGET_PAGE_BITS’ undeclared (first use in this function)
>       41 | #define XEN_SPECIAL_PFN(x) ((XEN_SPECIAL_AREA_ADDR >> TARGET_PAGE_BITS) + \
>          |                                                       ^~~~~~~~~~~~~~~~
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/system/kvm_xen.h | 2 ++
>   1 file changed, 2 insertions(+)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 16/38] hw/misc/cpc: Include missing 'hw/core/cpu.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> The "hw/core/cpu.h" header is indirectly included. Include it
> explicitly otherwise we get when refactoring unrelated headers:
> 
>    ../hw/misc/mips_cpc.c:36:53: error: unknown type name 'run_on_cpu_data'
>       36 | static void mips_cpu_reset_async_work(CPUState *cs, run_on_cpu_data data)
>          |                                                     ^
>    ../hw/misc/mips_cpc.c:40:5: error: call to undeclared function 'cpu_reset'
>         40 |     cpu_reset(cs);
>            |     ^
>    ../hw/misc/riscv_cpc.c:34:54: error: unknown type name 'run_on_cpu_data'
>       34 | static void riscv_cpu_reset_async_work(CPUState *cs, run_on_cpu_data data)
>          |                                                      ^
>    ../hw/misc/riscv_cpc.c:39:5: error: call to undeclared function 'cpu_reset'
>       39 |     cpu_reset(cs);
>          |     ^
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/misc/mips_cpc.c  | 1 +
>   hw/misc/riscv_cpc.c | 1 +
>   2 files changed, 2 insertions(+)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 17/38] target/s390x/tcg: Include missing '*cpu.h' headers

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> The "hw/core/cpu.h" header (declaring run_on_cpu_data) and
> "target/s390x/cpu.h" are indirectly included. Include them
> explicitly otherwise we get when refactoring unrelated headers:
> 
>    ../target/s390x/tcg/tcg_s390x.h:17:44: error: unknown type name 'CPUS390XState'; did you mean 'CPUSH4State'?
>       17 | G_NORETURN void tcg_s390_program_interrupt(CPUS390XState *env,
>          |                                            ^~~~~~~~~~~~~
>          |                                            CPUSH4State
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/s390x/tcg/tcg_s390x.h | 3 +++
>   1 file changed, 3 insertions(+)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 18/38] exec/helper-head: Include missing 'exec/target_long.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> TARGET_LONG_BITS is defined in "exec/target_long.h" (which
> is currently included implicitly by various headers).
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/exec/helper-head.h.inc | 15 +++++++--------
>   1 file changed, 7 insertions(+), 8 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 19/38] target/cpu: Do not include 'exec/cpu-defs.h' anymore

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Nothing in all our target "cpu.h" directly uses definitions
> from "exec/cpu-defs.h": no need to include it there. This
> remove a lot of target-specificities, simplifying inclusion
> of target "cpu.h" by common code.
> 
> Inspired-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/alpha/cpu.h      | 1 -
>   target/arm/cpu.h        | 1 -
>   target/avr/cpu.h        | 1 -
>   target/hexagon/cpu.h    | 1 -
>   target/hppa/cpu.h       | 1 -
>   target/i386/cpu.h       | 1 -
>   target/loongarch/cpu.h  | 1 -
>   target/m68k/cpu.h       | 1 -
>   target/microblaze/cpu.h | 1 -
>   target/mips/cpu.h       | 1 -
>   target/or1k/cpu.h       | 1 -
>   target/ppc/cpu.h        | 1 -
>   target/riscv/cpu.h      | 1 -
>   target/rx/cpu.h         | 1 -
>   target/s390x/cpu.h      | 1 -
>   target/sh4/cpu.h        | 1 -
>   target/sparc/cpu.h      | 1 -
>   target/tricore/cpu.h    | 1 -
>   18 files changed, 18 deletions(-)
> 

Great!
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 20/38] hw/alpha: Include full path to target 'cpu.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/alpha/dp264.c   | 2 +-
>   hw/alpha/typhoon.c | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 21/38] hw/arm: Include full path to target 'cpu.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   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 +-
>   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/intc/arm_gicv3_cpuif.c        | 2 +-
>   hw/intc/arm_gicv3_cpuif_common.c | 2 +-
>   13 files changed, 13 insertions(+), 13 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 22/38] hw/avr: Include full path to target 'cpu.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/avr/boot.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 23/38] hw/hppa: Include full path to target 'cpu.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/hppa/machine.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 24/38] hw/i386: Include full path to target 'cpu.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/hw/i386/apic_internal.h | 2 +-
>   hw/i386/multiboot.c             | 2 +-
>   hw/i386/pc_sysfw_ovmf.c         | 2 +-
>   hw/i386/vmmouse.c               | 2 +-
>   hw/isa/lpc_ich9.c               | 2 +-
>   5 files changed, 5 insertions(+), 5 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 25/38] hw/m68k: Include full path to target 'cpu.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/intc/m68k_irqc.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 +-
>   8 files changed, 8 insertions(+), 8 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 26/38] hw/microblaze: Include full path to target 'cpu.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   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 +-
>   4 files changed, 4 insertions(+), 4 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 27/38] hw/mips: Include full path to target 'cpu.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/hw/intc/mips_gic.h | 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         | 2 +-
>   6 files changed, 6 insertions(+), 6 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 28/38] hw/or1k: Include full path to target 'cpu.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/or1k/boot.c     | 2 +-
>   hw/or1k/cputimer.c | 2 +-
>   hw/or1k/or1k-sim.c | 2 +-
>   hw/or1k/virt.c     | 2 +-
>   4 files changed, 4 insertions(+), 4 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 29/38] hw/ppc: Include full path to target 'cpu.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/hw/ppc/pnv.h          | 2 +-
>   include/hw/ppc/spapr_fadump.h | 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 +-
>   10 files changed, 10 insertions(+), 10 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 30/38] hw/riscv: Include full path to target 'cpu.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/misc/riscv_cmgcr.c           | 2 +-
>   hw/misc/riscv_cpc.c             | 2 +-
>   hw/riscv/microblaze-v-generic.c | 2 +-
>   3 files changed, 3 insertions(+), 3 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 31/38] hw/s390x: Include full path to target 'cpu.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/s390x/ipl.h            | 2 +-
>   hw/s390x/s390-hypercall.h | 2 +-
>   hw/s390x/ap-bridge.c      | 2 +-
>   hw/s390x/s390-hypercall.c | 2 +-
>   hw/s390x/s390-stattrib.c  | 2 +-
>   hw/s390x/tod-tcg.c        | 2 +-
>   6 files changed, 6 insertions(+), 6 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 32/38] hw/sh4: Include full path to target 'cpu.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/intc/sh_intc.c | 2 +-
>   hw/sh4/r2d.c      | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 33/38] hw/sparc: Include full path to target 'cpu.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   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 +-
>   5 files changed, 5 insertions(+), 5 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 34/38] hw/tricore: Include full path to target 'cpu.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/tricore/tricore_testboard.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 35/38] hw/xtensa: Include full path to target 'cpu.h' header

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/xtensa/xtensa_memory.h | 2 +-
>   hw/xtensa/pic_cpu.c       | 2 +-
>   hw/xtensa/xtfpga.c        | 2 +-
>   3 files changed, 3 insertions(+), 3 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 36/38] hw/misc/allwinner-cpucfg.c: make compilation unit common

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> 
> include "target/arm/cpu.h" is needed because of:
> bool target_aa64 = arm_feature(cpu_env(target_cpu), ARM_FEATURE_AARCH64);
> 
> This file is reused between various allwinner boards, including 32 and
> 64 bits cpus.
> 
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/misc/meson.build | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 37/38] hw/avr: Build as common unit files

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Nothing there is target-specific anymore.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/misc/meson.build  | 2 +-
>   hw/timer/meson.build | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 38/38] hw/misc: Build 'mac_via' as common unit file

[Pierrick Bouvier]

On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Nothing there is target-specific anymore.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/misc/meson.build | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 00/38] target/cpu: Do not include 'exec/cpu-defs.h' anymore

[Pierrick Bouvier]

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/20260312224702.1608408-2-pierrick.bouvier@linaro.org/
> 
> 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

Re: [PATCH v2 00/38] target/cpu: Do not include 'exec/cpu-defs.h' anymore

[Philippe Mathieu-Daudé]

On 13/3/26 07:20, Philippe Mathieu-Daudé wrote:

> 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

Series queued for 11.1, thanks.