Skip to contentSkip to conversation

target/cpu: Do not include 'exec/cpu-defs.h' anymore

PATCH Superseded Philippe Mathieu-Daudé 5 participants 89 messages Mar 13 – Mar 23

Subsystems (5)

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v2 cover target/cpu: Do not include 'exec/cpu-defs.h' anymore

Pierrick noticed [*] "exec/cpu-defs.h" isn't really used by each target "cpu.h". However various source files rely on it (or actually a small subset of it: "exec/target_long.h").

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

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

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

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

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

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

PATCH v2 1/38 target/arm: Remove target_ulong use in hvf_handle_psci_call()

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.

---
 target/arm/hvf/hvf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
target/arm/hvf/hvf.c +1 -1
index 5fc8f6bbbd9..678afe5c8e1 100644
@@ -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;
 
Signature · 1 line
2.53.0
Reviewed-by on v2 1/38
#2 lore raw

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

Quoted 9 lines · 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.

---
  target/arm/hvf/hvf.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
#3 lore raw

PATCH v2 2/38 target/ppc: Replace TARGET_PAGE_BITS -> qemu_target_page_bits()

In reply to Philippe Mathieu-Daudé

Get the target page bits at runtime.

---
 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(-)
target/ppc/mmu-booke.c +2 -1
index 55e5dd7c6b0..9cc66c613b7 100644
@@ -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;
target/ppc/mmu-hash64.c +2 -1
index d026abadd11..2c33d98001d 100644
@@ -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;
     }
 
target/ppc/mmu-radix64.c +2 -1
index 33ac3412901..a09ba2b8d1a 100644
@@ -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;
     }
 
Signature · 1 line
2.53.0
#5 lore raw

PATCH v2 3/38 hw/s390x/vfio: Replace TARGET_PAGE_BITS -> qemu_target_page_bits()

In reply to Philippe Mathieu-Daudé

Get the target page bits at runtime.

---
 hw/s390x/s390-pci-vfio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
hw/s390x/s390-pci-vfio.c +2 -1
index 8ce44dbecce..7c754b656da 100644
@@ -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;
         }
Signature · 1 line
2.53.0
Reviewed-by on v2 3/38
#6 lore raw

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

Quoted 20 lines · Philippe Mathieu-Daudé

Get the target page bits at runtime.

---
  hw/s390x/s390-pci-vfio.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
hw/s390x/s390-pci-vfio.c +1 -0
index 8ce44dbecce..7c754b656da 100644
@@ -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

hw/s390x/s390-pci-vfio.c static void s390_pci_read_base(S390PCIBusDevice *pbdev, · line 157

Quoted 8 lines
hw/s390x/s390-pci-vfio.c +1 -1
@@ -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
#7 lore raw

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

Quoted 22 lines · Thomas Huth
Quoted 21 lines · Philippe Mathieu-Daudé

Get the target page bits at runtime.

---
  hw/s390x/s390-pci-vfio.c | 3 ++-

  1 file changed, 2 insertions(+), 1 deletion(-)
hw/s390x/s390-pci-vfio.c +1 -0
index 8ce44dbecce..7c754b656da 100644
@@ -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.
        */
Quoted 9 lines

hw/s390x/s390-pci-vfio.c static void s390_pci_read_base(S390PCIBusDevice *pbdev, · line 157

Quoted 6 lines
hw/s390x/s390-pci-vfio.c +1 -1
       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;
           }

Thanks,

C.

#9 lore raw

PATCH v2 4/38 monitor/hmp: : Include missing 'exec/target_long.h' header

In reply to 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,
        |     ^
---
 include/monitor/hmp-target.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/monitor/hmp-target.h +1 -1
index 5167d17d41d..898473b3ed0 100644
@@ -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;
Signature · 1 line
2.53.0
Reviewed-by on v2 4/38
#10 lore raw

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

Quoted 18 lines · 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,
         |     ^
---
  include/monitor/hmp-target.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
include/monitor/hmp-target.h +0 -0
index 5167d17d41d..898473b3ed0 100644

include/monitor/hmp-target.h line 34

Quoted 8 lines
include/monitor/hmp-target.h +1 -1
@@ -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 on v2 4/38
#11 lore raw

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

In reply to Philippe Mathieu-Daudé
Quoted 4 lines · 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:

Quoted 9 lines

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,
         |     ^
---
  include/monitor/hmp-target.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
#12 lore raw

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

In reply to 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,
| ^

---
 target-info-stub.c | 1 +
 1 file changed, 1 insertion(+)
target-info-stub.c +1 -0
index f5896a72621..07d8647ed8e 100644
@@ -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. */
Signature · 1 line
2.53.0
Reviewed-by on v2 5/38
#13 lore raw

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

Quoted 4 lines · 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:

Quoted 9 lines

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

---
  target-info-stub.c | 1 +
  1 file changed, 1 insertion(+)
#14 lore raw

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

In reply to Philippe Mathieu-Daudé

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

---
 target/xtensa/cpu.h | 1 -
 target/xtensa/cpu.c | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
target/xtensa/cpu.h +0 -1
index 22192924841..dfd2ceab7cf 100644
@@ -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"
target/xtensa/cpu.c +1 -0
index 86ec899a67c..dcf3cd84c84 100644
@@ -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"
Signature · 1 line
2.53.0
Reviewed-by on v2 6/38
#15 lore raw

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

Quoted 9 lines · Philippe Mathieu-Daudé

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

---
  target/xtensa/cpu.h | 1 -
  target/xtensa/cpu.c | 1 +
  2 files changed, 1 insertion(+), 1 deletion(-)
#16 lore raw

PATCH v2 7/38 target/hexagon: Include missing 'exec/target_long.h' header

In reply to 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];
        |     ^~~~~~~~~~~~
---
 target/hexagon/cpu.h         | 2 ++
 target/hexagon/mmvec/mmvec.h | 3 +++
 2 files changed, 5 insertions(+)
target/hexagon/cpu.h +2 -0
index 85afd592778..7a91399fe02 100644
@@ -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"
target/hexagon/mmvec/mmvec.h +3 -0
index 52d470709c0..4a4f6cc9805 100644
@@ -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)
 
Signature · 1 line
2.53.0
Reviewed-by on v2 7/38
#17 lore raw

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

Quoted 12 lines · 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];
        |     ^~~~~~~~~~~~
Quoted 3 lines

---

 target/hexagon/cpu.h         | 2 ++
Quoted 38 lines
 target/hexagon/mmvec/mmvec.h | 3 +++
 2 files changed, 5 insertions(+)
target/hexagon/cpu.h +2 -0
index 85afd592778..7a91399fe02 100644
@@ -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"
target/hexagon/mmvec/mmvec.h +3 -1
index 52d470709c0..4a4f6cc9805 100644
@@ -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

Reviewed-by on v2 7/38
#18 lore raw

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

In reply to Philippe Mathieu-Daudé
Quoted 11 lines · 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];
         |     ^~~~~~~~~~~~
Quoted 6 lines
---
  target/hexagon/cpu.h         | 2 ++
  target/hexagon/mmvec/mmvec.h | 3 +++
  2 files changed, 5 insertions(+)
#19 lore raw

PATCH v2 8/38 target/hppa: Include missing 'exec/target_long.h' header

In reply to 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);
        | ^
---
 target/hppa/cpu.h | 1 +
 1 file changed, 1 insertion(+)
target/hppa/cpu.h +1 -0
index 7d47afe8efa..6ea4c9b6826 100644
@@ -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"
Signature · 1 line
2.53.0
Reviewed-by on v2 8/38
#20 lore raw

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

Quoted 4 lines · 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:

Quoted 9 lines
   target/hppa/cpu.h:375:1: error: unknown type name 'target_ulong'
     375 | target_ulong cpu_hppa_get_psw(CPUHPPAState *env);
         | ^
---
  target/hppa/cpu.h | 1 +
  1 file changed, 1 insertion(+)
#21 lore raw

PATCH v2 9/38 target/i386: Include missing 'exec/target_long.h' header

In reply to 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);
        |                                           ^
---
 target/i386/cpu.h | 1 +
 1 file changed, 1 insertion(+)
target/i386/cpu.h +1 -0
index 0b539155c40..6fad9571e25 100644
@@ -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"
Signature · 1 line
2.53.0
Reviewed-by on v2 9/38
#22 lore raw

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

Quoted 4 lines · 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:

Quoted 9 lines
   ../target/i386/cpu.h:2777:43: error: unknown type name 'target_ulong'
    2777 | void cpu_x86_update_cr3(CPUX86State *env, target_ulong new_cr3);
         |                                           ^
---
  target/i386/cpu.h | 1 +
  1 file changed, 1 insertion(+)
#23 lore raw

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

In reply to 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];
        |     ^
---
 target/m68k/m68k-semi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
target/m68k/m68k-semi.c +1 -1
index bdc798a28cb..d2a071ea677 100644
@@ -22,7 +22,7 @@
  */
 
 #include "qemu/osdep.h"
-
+#include "exec/target_long.h"
 #include "cpu.h"
 #include "gdbstub/syscalls.h"
 #include "gdbstub/helpers.h"
Signature · 1 line
2.53.0
Reviewed-by on v2 10/38
#24 lore raw

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

Quoted 18 lines · 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];
         |     ^
---
  target/m68k/m68k-semi.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
target/m68k/m68k-semi.c +0 -0
index bdc798a28cb..d2a071ea677 100644

target/m68k/m68k-semi.c line 28

Quoted 8 lines
target/m68k/m68k-semi.c +1 -1
@@ -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 on v2 10/38
#25 lore raw

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

In reply to Philippe Mathieu-Daudé
Quoted 4 lines · 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:

Quoted 9 lines
   ../target/m68k/m68k-semi.c:53:5: error: use of undeclared identifier 'target_ulong'
      53 |     target_ulong args = env->dregs[1];
         |     ^
---
  target/m68k/m68k-semi.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
#26 lore raw

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

In reply to 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];
        |     ^
---
 target/mips/cpu.h | 1 +
 1 file changed, 1 insertion(+)
target/mips/cpu.h +1 -0
index ed662135cb0..3517d2d42cf 100644
@@ -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
Signature · 1 line
2.53.0
Reviewed-by on v2 11/38
#27 lore raw

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

Quoted 4 lines · 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:

Quoted 9 lines
   target/mips/cpu.h:462:5: error: unknown type name 'target_ulong'
     462 |     target_ulong gpr[32];
         |     ^
---
  target/mips/cpu.h | 1 +
  1 file changed, 1 insertion(+)
#28 lore raw

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

In reply to 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);
            |                                            ^
---
 include/hw/ppc/spapr_ovec.h | 2 +-
 target/ppc/cpu.h            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
include/hw/ppc/spapr_ovec.h +1 -1
index c3e8b98e7e2..8d67f492d02 100644
@@ -37,7 +37,7 @@
 #ifndef SPAPR_OVEC_H
 #define SPAPR_OVEC_H
 
-#include "cpu.h"
+#include "exec/target_long.h"
 
 typedef struct SpaprOptionVector SpaprOptionVector;
 
target/ppc/cpu.h +1 -0
index d637a50798f..a0df7a467ed 100644
@@ -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"
Signature · 1 line
2.53.0
Reviewed-by on v2 12/38
#29 lore raw

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

Quoted 11 lines · 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);
             |                                            ^
Quoted 6 lines
---
  include/hw/ppc/spapr_ovec.h | 2 +-
  target/ppc/cpu.h            | 1 +
  2 files changed, 2 insertions(+), 1 deletion(-)
#30 lore raw

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

In reply to 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)
        |               ^
---
 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(+)
target/riscv/cpu.h +1 -0
index 35d1f6362ca..f30d3006166 100644
@@ -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"
target/riscv/debug.h +1 -0
index f76b8f944a2..066e9c585f1 100644
@@ -23,6 +23,7 @@
 #define RISCV_DEBUG_H
 
 #include "exec/breakpoint.h"
+#include "exec/target_long.h"
 
 #define RV_MAX_TRIGGERS         2
 
target/riscv/pmp.h +1 -0
index 271cf241699..97ceddc0013 100644
@@ -22,6 +22,7 @@
 #ifndef RISCV_PMP_H
 #define RISCV_PMP_H
 
+#include "exec/target_long.h"
 #include "cpu.h"
 
 typedef enum {
hw/misc/riscv_cmgcr.c +1 -0
index b0294e76635..a4d56e3b308 100644
@@ -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"
 
Signature · 1 line
2.53.0
Reviewed-by on v2 13/38
#31 lore raw

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

Quoted 17 lines · 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)
         |               ^
Quoted 8 lines
---
  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(+)
#32 lore raw

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

In reply to 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 *);
        | ^
---
 target/sparc/cpu.h | 1 +
 1 file changed, 1 insertion(+)
target/sparc/cpu.h +1 -0
index 0139732e4cc..155aa8ec637 100644
@@ -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)
Signature · 1 line
2.53.0
Reviewed-by on v2 14/38
#33 lore raw

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

Quoted 4 lines · 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:

Quoted 9 lines
   ../target/sparc/cpu.h:615:1: error: unknown type name 'target_ulong'
     615 | target_ulong cpu_get_fsr(CPUSPARCState *);
         | ^
---
  target/sparc/cpu.h | 1 +
  1 file changed, 1 insertion(+)
#34 lore raw

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

In reply to 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) + \
        |                                                       ^~~~~~~~~~~~~~~~
---
 include/system/kvm_xen.h | 2 ++
 1 file changed, 2 insertions(+)
include/system/kvm_xen.h +2 -0
index 7d0e69f1334..ed8c357193c 100644
@@ -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
Signature · 1 line
2.53.0
Reviewed-by on v2 15/38
#35 lore raw

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

Quoted 12 lines · 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) + \
         |                                                       ^~~~~~~~~~~~~~~~
---
  include/system/kvm_xen.h | 2 ++
  1 file changed, 2 insertions(+)
#36 lore raw

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

In reply to 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);
        |     ^
---
 hw/misc/mips_cpc.c  | 1 +
 hw/misc/riscv_cpc.c | 1 +
 2 files changed, 2 insertions(+)
hw/misc/mips_cpc.c +1 -0
index 924de855ee2..d092f76f44d 100644
@@ -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"
 
hw/misc/riscv_cpc.c +1 -0
index 4bf2fd8db16..e04ccdf54fa 100644
@@ -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"
 
Signature · 1 line
2.53.0
Reviewed-by on v2 16/38
#37 lore raw

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

Quoted 39 lines · 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);
         |     ^
---
  hw/misc/mips_cpc.c  | 1 +
  hw/misc/riscv_cpc.c | 1 +
  2 files changed, 2 insertions(+)
hw/misc/mips_cpc.c +1 -0
index 924de855ee2..d092f76f44d 100644
@@ -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"
 
hw/misc/riscv_cpc.c +0 -0
index 4bf2fd8db16..e04ccdf54fa 100644

hw/misc/riscv_cpc.c line 24

Quoted 7 lines
hw/misc/riscv_cpc.c +1 -0
@@ -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 on v2 16/38
#38 lore raw

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

In reply to Philippe Mathieu-Daudé
Quoted 16 lines · 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);
         |     ^
Quoted 6 lines
---
  hw/misc/mips_cpc.c  | 1 +
  hw/misc/riscv_cpc.c | 1 +
  2 files changed, 2 insertions(+)
#39 lore raw

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

In reply to 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
---
 target/s390x/tcg/tcg_s390x.h | 3 +++
 1 file changed, 3 insertions(+)
target/s390x/tcg/tcg_s390x.h +3 -0
index 7c8aede80d2..975f60085ac 100644
@@ -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);
Signature · 1 line
2.53.0
Reviewed-by on v2 17/38
#40 lore raw

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

Quoted 19 lines · 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
---
  target/s390x/tcg/tcg_s390x.h | 3 +++
  1 file changed, 3 insertions(+)
target/s390x/tcg/tcg_s390x.h +0 -0
index 7c8aede80d2..975f60085ac 100644

target/s390x/tcg/tcg_s390x.h line 21

Quoted 9 lines
target/s390x/tcg/tcg_s390x.h +3 -0
@@ -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 on v2 17/38
#41 lore raw

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

In reply to Philippe Mathieu-Daudé
Quoted 5 lines · 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'?

Quoted 9 lines
      17 | G_NORETURN void tcg_s390_program_interrupt(CPUS390XState *env,
         |                                            ^~~~~~~~~~~~~
         |                                            CPUSH4State
---
  target/s390x/tcg/tcg_s390x.h | 3 +++
  1 file changed, 3 insertions(+)
#42 lore raw

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

In reply to Philippe Mathieu-Daudé

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

---
 include/exec/helper-head.h.inc | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
include/exec/helper-head.h.inc +7 -8
index 5b248fd7138..7dec5f5b067 100644
@@ -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 */
Signature · 1 line
2.53.0
Reviewed-by on v2 18/38
#43 lore raw

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

Quoted 8 lines · Philippe Mathieu-Daudé

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

---
  include/exec/helper-head.h.inc | 15 +++++++--------
  1 file changed, 7 insertions(+), 8 deletions(-)
#44 lore raw

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

In reply to 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.

---
 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(-)
target/alpha/cpu.h +0 -1
index 45944e46b54..bffa1da7ee6 100644
@@ -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"
 
target/arm/cpu.h +0 -1
index 657ff4ab20b..445d5a8a31d 100644
@@ -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"
target/avr/cpu.h +0 -1
index 518e243d812..3da885c7ccb 100644
@@ -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"
 
target/hexagon/cpu.h +0 -1
index 7a91399fe02..800ef6305e6 100644
@@ -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"
target/hppa/cpu.h +0 -1
index 6ea4c9b6826..85f39401423 100644
@@ -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"
target/i386/cpu.h +0 -1
index 6fad9571e25..e5ae29f8af1 100644
@@ -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"
target/loongarch/cpu.h +0 -1
index 4d333806ed8..096d7789285 100644
@@ -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"
target/m68k/cpu.h +0 -1
index 7911ab9de30..d7f508a9e80 100644
@@ -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"
target/microblaze/cpu.h +0 -1
index d26b933b6d0..7e7b024bd1e 100644
@@ -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"
 
target/mips/cpu.h +0 -1
index 3517d2d42cf..17e9f6039ec 100644
@@ -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
target/or1k/cpu.h +0 -1
index c8e2827930b..5bb39b67519 100644
@@ -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"
 
target/ppc/cpu.h +0 -1
index a0df7a467ed..aba8109bbba 100644
@@ -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"
target/riscv/cpu.h +0 -1
index f30d3006166..633d5301f30 100644
@@ -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"
target/rx/cpu.h +0 -1
index b3b1ecff5af..b500b7a2474 100644
@@ -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"
 
target/s390x/cpu.h +0 -1
index 40bc1f0741d..3acbe83f0fc 100644
@@ -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"
target/sh4/cpu.h +0 -1
index b0759010c47..e36268b4256 100644
@@ -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"
 
target/sparc/cpu.h +0 -1
index 155aa8ec637..ac0eb9f0faa 100644
@@ -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"
target/tricore/cpu.h +0 -1
index ab46192e261..604fb7792c6 100644
@@ -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"
 
Signature · 1 line
2.53.0
Reviewed-by on v2 19/38
#45 lore raw
Quoted 19 lines · 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.

---
  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 -
Quoted 9 lines
  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!

#46 lore raw

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

In reply to Philippe Mathieu-Daudé
---
 hw/alpha/dp264.c   | 2 +-
 hw/alpha/typhoon.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
hw/alpha/dp264.c +1 -1
index 98219f04569..86be3ff129b 100644
@@ -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"
hw/alpha/typhoon.c +1 -1
index 7722d4fd009..e32fed86f9f 100644
@@ -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"
 
Signature · 1 line
2.53.0
#48 lore raw

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

In reply to Philippe Mathieu-Daudé
---
 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(-)
include/hw/arm/digic.h +1 -1
index 8f2735c284f..646802806e0 100644
@@ -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"
include/hw/arm/fsl-imx6.h +1 -1
index bb866994dff..cddd100dd6e 100644
@@ -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"
include/hw/arm/fsl-imx6ul.h +1 -1
index 4e3209b25b2..f8f9c249a23 100644
@@ -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"
 
include/hw/arm/fsl-imx7.h +1 -1
index 710831c8bf5..a573e0dd4f8 100644
@@ -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"
 
include/hw/arm/fsl-imx8mp.h +1 -1
index 4b367b754c6..3b6183ed1d6 100644
@@ -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"
hw/arm/boot.c +1 -1
index c97d4c4e118..780b6be6371 100644
@@ -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"
hw/arm/exynos4210.c +1 -1
index 25c385ba1f5..5efe95030c0 100644
@@ -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"
hw/arm/mps3r.c +1 -1
index 2d64a198c42..caad820d3bc 100644
@@ -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"
hw/arm/omap1.c +1 -1
index 47d0f0d7362..980959166d3 100644
@@ -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"
hw/arm/realview.c +1 -1
index c9558be4d45..7e8acd34acd 100644
@@ -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"
hw/arm/smmuv3.c +1 -1
index 068108e49b8..b83e3c99ea5 100644
@@ -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"
hw/intc/arm_gicv3_cpuif.c +1 -1
index eaf1e512ede..fcb3922fa0f 100644
@@ -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"
hw/intc/arm_gicv3_cpuif_common.c +1 -1
index ff1239f65db..e03085592e4 100644
@@ -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)
 {
Signature · 1 line
2.53.0
Reviewed-by on v2 21/38
#49 lore raw

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

Quoted 17 lines · Philippe Mathieu-Daudé
---
  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(-)
#50 lore raw

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

In reply to Philippe Mathieu-Daudé
---
 hw/avr/boot.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/avr/boot.h +1 -1
index 9eed2055591..c5efa54d98c 100644
@@ -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
Signature · 1 line
2.53.0
#52 lore raw

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

In reply to Philippe Mathieu-Daudé
---
 hw/hppa/machine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/hppa/machine.c +1 -1
index ec63dc12979..3a96ba00cfb 100644
@@ -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"
Signature · 1 line
2.53.0
#54 lore raw

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

In reply to Philippe Mathieu-Daudé
---
 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(-)
include/hw/i386/apic_internal.h +1 -1
index 0cb06bbc76c..a26d53bb9d9 100644
@@ -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"
hw/i386/multiboot.c +1 -1
index 0e960a15dda..d544b62afbd 100644
@@ -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"
hw/i386/pc_sysfw_ovmf.c +1 -1
index da947c3ca41..196eb0c83ed 100644
@@ -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"
 
hw/i386/vmmouse.c +1 -1
index c1aeeca0c9a..20ebb0dbbf6 100644
@@ -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"
hw/isa/lpc_ich9.c +1 -1
index 51dc680029d..9cec18a378c 100644
@@ -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"
Signature · 1 line
2.53.0
#56 lore raw

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

In reply to Philippe Mathieu-Daudé
---
 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(-)
hw/intc/m68k_irqc.c +1 -1
index c652bf143f0..68ddb5351be 100644
@@ -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"
hw/m68k/an5206.c +1 -1
index f92a5d6a339..1acd2fbdfb3 100644
@@ -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"
hw/m68k/mcf5206.c +1 -1
index c5befa02eb5..9f373b99b12 100644
@@ -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"
hw/m68k/mcf5208.c +1 -1
index 0e07aa45e9d..a8068c91f24 100644
@@ -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"
hw/m68k/mcf_intc.c +1 -1
index 1014fe6fa57..e8d3bd937de 100644
@@ -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"
hw/m68k/q800-glue.c +1 -1
index 24fccab9666..ac9062c6488 100644
@@ -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"
hw/m68k/q800.c +1 -1
index ded531394e6..bcd1f99df81 100644
@@ -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"
hw/m68k/virt.c +1 -1
index e67900c727d..f25ba64d835 100644
@@ -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"
Signature · 1 line
2.53.0
Reviewed-by on v2 25/38
#57 lore raw

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

Quoted 11 lines · Philippe Mathieu-Daudé
---
  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 on v2 25/38
#58 lore raw

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

In reply to Philippe Mathieu-Daudé
Quoted 12 lines · Philippe Mathieu-Daudé
---
  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(-)
#59 lore raw

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

In reply to Philippe Mathieu-Daudé
---
 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(-)
hw/microblaze/boot.c +1 -1
index a6f9ebab90c..b4a80b042b8 100644
@@ -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"
hw/microblaze/petalogix_ml605_mmu.c +1 -1
index b3bdc4d65f2..8f9f54ff1e2 100644
@@ -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"
hw/microblaze/petalogix_s3adsp1800_mmu.c +1 -1
index 0c9a6bf2529..c5f64319009 100644
@@ -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"
hw/microblaze/xlnx-zynqmp-pmu.c +1 -1
index f4c55589b7f..00154236bf8 100644
@@ -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"
Signature · 1 line
2.53.0
Reviewed-by on v2 26/38
#60 lore raw

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

Quoted 8 lines · Philippe Mathieu-Daudé
---
  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(-)
#61 lore raw

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

In reply to Philippe Mathieu-Daudé
---
 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(-)
include/hw/intc/mips_gic.h +1 -1
index e2e6f0a168c..b3b64fec855 100644
@@ -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
hw/mips/bootloader.c +1 -1
index 1dd6ef20968..aa4abcf4c36 100644
@@ -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 {
hw/mips/fuloong2e.c +1 -1
index d0efe36f7ce..1297dc967e4 100644
@@ -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"
hw/mips/jazz.c +1 -1
index e0adb96c548..bec534d38b0 100644
@@ -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,
hw/mips/malta.c +1 -1
index 812ff64d831..0cbe9956e74 100644
@@ -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)
hw/misc/mips_cpc.c +1 -1
index d092f76f44d..9d9c8bf6ec8 100644
@@ -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"
Signature · 1 line
2.53.0
Reviewed-by on v2 27/38
#62 lore raw

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

Quoted 10 lines · Philippe Mathieu-Daudé
---
  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(-)
#63 lore raw

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

In reply to Philippe Mathieu-Daudé
---
 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(-)
hw/or1k/boot.c +1 -1
index c18f4a6a9fc..714634b5f3f 100644
@@ -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"
hw/or1k/cputimer.c +1 -1
index 51da226fcde..b35411aa1e1 100644
@@ -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"
hw/or1k/or1k-sim.c +1 -1
index f1b1f63274b..b55105cd148 100644
@@ -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"
hw/or1k/virt.c +1 -1
index 39f54058ab3..2ff5c084a2b 100644
@@ -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"
Signature · 1 line
2.53.0
#65 lore raw

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

In reply to Philippe Mathieu-Daudé
---
 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(-)
include/hw/ppc/pnv.h +1 -1
index 24f8843a409..5581ba0f683 100644
@@ -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"
include/hw/ppc/spapr_fadump.h +1 -1
index 82681fb9a6a..778981bc95e 100644
@@ -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
hw/ppc/mpc8544_guts.c +1 -1
index 88ae573d1e8..3f2bbc0a511 100644
@@ -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"
 
hw/ppc/mpc8544ds.c +1 -1
index 582698559d2..6a5d3edc490 100644
@@ -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)
 {
hw/ppc/ppc440_uc.c +1 -1
index 0f28a7937fb..634046506e8 100644
@@ -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"
 
 /*****************************************************************************/
hw/ppc/ppc4xx_devs.c +1 -1
index 1e6b6fec5da..ae1ac4f4672 100644
@@ -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"
hw/ppc/ppc_booke.c +1 -1
index 7c6e5df9fde..052c8c931ae 100644
@@ -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"
hw/ppc/prep_systemio.c +1 -1
index bc8b0964e75..5cd18a9e123 100644
@@ -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"
hw/ppc/spapr_vhyp_mmu.c +1 -1
index 2d41d7f77b7..9cc3aeb2a29 100644
@@ -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"
hw/ppc/virtex_ml507.c +1 -1
index 51b3d7d7121..d10d9135890 100644
@@ -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"
Signature · 1 line
2.53.0
Reviewed-by on v2 29/38
#66 lore raw

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

Quoted 14 lines · Philippe Mathieu-Daudé
---
  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(-)
#67 lore raw

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

In reply to Philippe Mathieu-Daudé
---
 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(-)
hw/misc/riscv_cmgcr.c +1 -1
index a4d56e3b308..0390996f78b 100644
@@ -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
hw/misc/riscv_cpc.c +1 -1
index e04ccdf54fa..37fdd0b39ba 100644
@@ -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"
hw/riscv/microblaze-v-generic.c +1 -1
index d56b64792d7..b0494b1ac50 100644
@@ -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"
Signature · 1 line
2.53.0
#69 lore raw

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

In reply to Philippe Mathieu-Daudé
---
 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(-)
hw/s390x/ipl.h +1 -1
index 403cd08450d..fac30763df2 100644
@@ -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"
hw/s390x/s390-hypercall.h +1 -1
index 4f07209128c..c5a2b17e858 100644
@@ -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 */
hw/s390x/ap-bridge.c +1 -1
index 5cdbf098074..c7e49d966ba 100644
@@ -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)
 {
hw/s390x/s390-hypercall.c +1 -1
index 508dd97ca0d..71dc717d08a 100644
@@ -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"
hw/s390x/s390-stattrib.c +1 -1
index d808ece3b92..2e83aa211cd 100644
@@ -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)
hw/s390x/tod-tcg.c +1 -1
index 0cc96624e1b..448b531b2ea 100644
@@ -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"
 
Signature · 1 line
2.53.0
Reviewed-by on v2 31/38
#70 lore raw

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

Quoted 9 lines · Philippe Mathieu-Daudé
---
  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 on v2 31/38
#71 lore raw

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

In reply to Philippe Mathieu-Daudé
Quoted 10 lines · Philippe Mathieu-Daudé
---
  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(-)
#72 lore raw

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

In reply to Philippe Mathieu-Daudé
---
 hw/intc/sh_intc.c | 2 +-
 hw/sh4/r2d.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
hw/intc/sh_intc.c +1 -1
index 16e4b619d6d..0da82f9d5e0 100644
@@ -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"
hw/sh4/r2d.c +1 -1
index acb3fe75a8b..99afe3618e8 100644
@@ -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"
Signature · 1 line
2.53.0
#74 lore raw

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

In reply to Philippe Mathieu-Daudé
---
 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(-)
hw/sparc/leon3.c +1 -1
index 9147d56bd4e..d4a6e917598 100644
@@ -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"
hw/sparc/sun4m.c +1 -1
index 46fcbdda97e..550acdff6d4 100644
@@ -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"
hw/sparc64/niagara.c +1 -1
index 209be380473..1211ecb82d4 100644
@@ -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"
hw/sparc64/sparc64.c +1 -1
index ce7eded143b..16f4aa052bc 100644
@@ -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"
hw/sparc64/sun4u.c +1 -1
index 2e41785b783..d69ed9a81ac 100644
@@ -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"
Signature · 1 line
2.53.0
#76 lore raw

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

In reply to Philippe Mathieu-Daudé
---
 hw/tricore/tricore_testboard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/tricore/tricore_testboard.c +1 -1
index 60772d4f1d7..d5d796c8eec 100644
@@ -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"
Signature · 1 line
2.53.0
#78 lore raw

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

In reply to Philippe Mathieu-Daudé
---
 hw/xtensa/xtensa_memory.h | 2 +-
 hw/xtensa/pic_cpu.c       | 2 +-
 hw/xtensa/xtfpga.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
hw/xtensa/xtensa_memory.h +1 -1
index af7e8025e3c..c86ad06685a 100644
@@ -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,
hw/xtensa/pic_cpu.c +1 -1
index c00167859a2..370a353f1e3 100644
@@ -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"
hw/xtensa/xtfpga.c +1 -1
index ed24720f94a..5e509216df8 100644
@@ -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"
Signature · 1 line
2.53.0
#80 lore raw

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

In reply to Philippe Mathieu-Daudé

From: Pierrick Bouvier <[email protected]>

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.

---
 hw/misc/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/misc/meson.build +1 -1
index 96b6705b7d0..392d30b1423 100644
@@ -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'))
Signature · 1 line
2.53.0
Reviewed-by on v2 36/38
#81 lore raw

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

Quoted 8 lines · Philippe Mathieu-Daudé

From: Pierrick Bouvier <[email protected]>

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.

Quoted 8 lines
---
  hw/misc/meson.build | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
#82 lore raw

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

In reply to Philippe Mathieu-Daudé

Nothing there is target-specific anymore.

---
 hw/misc/meson.build  | 2 +-
 hw/timer/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
hw/misc/meson.build +1 -1
index 392d30b1423..a2601e1c433 100644
@@ -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'))
 
hw/timer/meson.build +1 -1
index 178321c029c..201b5d8316d 100644
@@ -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'))
Signature · 1 line
2.53.0
#84 lore raw

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

In reply to Philippe Mathieu-Daudé

Nothing there is target-specific anymore.

---
 hw/misc/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/misc/meson.build +1 -1
index a2601e1c433..cd084a19363 100644
@@ -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'))
Signature · 1 line
2.53.0
Reviewed-by on v2 38/38
#85 lore raw

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

Quoted 12 lines · Philippe Mathieu-Daudé

Nothing there is target-specific anymore.

---
  hw/misc/meson.build | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
hw/misc/meson.build +0 -0
index a2601e1c433..cd084a19363 100644

hw/misc/meson.build system_ss.add(when: 'CONFIG_I2C_ECHO', if_true: files('i2c-echo.c')) · line 160

Quoted 8 lines
hw/misc/meson.build +1 -1
@@ -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'))
#87 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 158 lines · 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/[email protected]/

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

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

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

#88 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 39 lines · Philippe Mathieu-Daudé

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

Quoted 2 lines

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

Series queued for 11.1, thanks.