Skip to contentSkip to conversation

include: Remove "exec/exec-all.h"

PATCH In review Philippe Mathieu-Daudé 3 participants 23 messages Apr 24, 2025 – Apr 28, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v3 cover include: Remove "exec/exec-all.h"

Since v2:
- Removed CONFIG_TCG #ifdef'ry (rth)
- Added R-b/A-b tags

Trivial series moving declarations around, emptying "exec/exec-all.h" to eventually remove it.

- Fix accel/stubs/tcg-stub.c headers
- Include "accel/tcg/getpc.h" where appropriate
- Extract TCG IOMMU API to "accel/tcg/iommu.h"
- Extract TCG probe API to "accel/tcg/probe.h"
- Remove "exec/exec-all.h"

It is based on "accel/tcg: Compile tb-maint.c twice". I had to fix its patch #12, so I'm including patches 12-15 in this series.

Based-on: <[email protected]>

Philippe Mathieu-Daudé (9):
accel/tcg: Correct list of included headers in tcg-stub.c include/exec: Include missing headers in exec-all.h target/riscv: Include missing 'accel/tcg/getpc.h' in csr.c target/hexagon: Include missing 'accel/tcg/getpc.h' accel/tcg: Include 'accel/tcg/getpc.h' in 'exec/helper-proto'
physmem: Move TCG IOTLB methods around
physmem: Restrict TCG IOTLB code to TCG accel accel/tcg: Extract probe API out of 'exec/exec-all.h'
include: Remove 'exec/exec-all.h'

Richard Henderson (4):
accel/tcg: Use vaddr for walk_memory_regions callback accel/tcg: Use vaddr in user/page-protection.h include/exec: Move tb_invalidate_phys_range to translation-block.h accel/tcg: Compile tb-maint.c twice

 MAINTAINERS                                   |  3 +-
 accel/tcg/tb-hash.h                           |  3 +-
 bsd-user/qemu.h                               |  1 -
 include/accel/tcg/iommu.h                     | 41 ++++++++++++
 .../{exec/exec-all.h => accel/tcg/probe.h}    | 58 ++---------------
 include/exec/helper-proto-common.h            |  2 +
 include/exec/translation-block.h              |  4 ++
 include/system/ram_addr.h                     |  1 -
 include/user/page-protection.h                | 22 +++----
 linux-user/user-internals.h                   |  1 -
 target/arm/tcg/translate.h                    |  1 -
 target/hexagon/macros.h                       |  1 +
 target/hexagon/mmvec/macros.h                 |  2 +
 target/i386/tcg/helper-tcg.h                  |  1 -
 accel/hvf/hvf-accel-ops.c                     |  1 -
 accel/stubs/tcg-stub.c                        |  3 +-
 accel/tcg/cputlb.c                            |  3 +-
 accel/tcg/tb-maint.c                          |  2 -
 accel/tcg/translate-all.c                     |  2 +-
 accel/tcg/user-exec.c                         | 63 +++++++++----------
 bsd-user/main.c                               |  1 -
 hw/ppc/spapr_nested.c                         |  1 -
 hw/riscv/riscv-iommu-sys.c                    |  1 -
 hw/sh4/sh7750.c                               |  1 -
 linux-user/elfload.c                          | 19 +++---
 linux-user/main.c                             |  1 -
 linux-user/syscall.c                          |  8 +--
 semihosting/uaccess.c                         |  2 +-
 system/physmem.c                              | 56 +++++++++--------
 target/alpha/cpu.c                            |  1 -
 target/alpha/fpu_helper.c                     |  1 -
 target/alpha/int_helper.c                     |  1 -
 target/alpha/mem_helper.c                     |  1 -
 target/alpha/translate.c                      |  1 -
 target/alpha/vax_helper.c                     |  1 -
 target/arm/cpu.c                              |  1 -
 target/arm/debug_helper.c                     |  1 -
 target/arm/helper.c                           |  2 +-
 target/arm/ptw.c                              |  2 +-
 target/arm/tcg/helper-a64.c                   |  2 +-
 target/arm/tcg/m_helper.c                     |  1 -
 target/arm/tcg/mte_helper.c                   |  2 +-
 target/arm/tcg/mve_helper.c                   |  1 -
 target/arm/tcg/op_helper.c                    |  2 +-
 target/arm/tcg/pauth_helper.c                 |  1 -
 target/arm/tcg/sme_helper.c                   |  1 -
 target/arm/tcg/sve_helper.c                   |  2 +-
 target/arm/tcg/tlb_helper.c                   |  1 -
 target/arm/tcg/translate-a64.c                |  1 -
 target/avr/cpu.c                              |  1 -
 target/avr/helper.c                           |  1 -
 target/avr/translate.c                        |  1 -
 target/hexagon/cpu.c                          |  1 -
 target/hexagon/op_helper.c                    |  2 +-
 target/hppa/cpu.c                             |  1 -
 target/hppa/fpu_helper.c                      |  1 -
 target/hppa/helper.c                          |  1 -
 target/hppa/mem_helper.c                      |  2 +-
 target/hppa/op_helper.c                       |  2 +-
 target/hppa/sys_helper.c                      |  1 -
 target/hppa/translate.c                       |  1 -
 target/i386/tcg/access.c                      |  2 +-
 target/i386/tcg/excp_helper.c                 |  1 -
 target/i386/tcg/int_helper.c                  |  1 -
 target/i386/tcg/mem_helper.c                  |  1 -
 target/i386/tcg/mpx_helper.c                  |  1 -
 target/i386/tcg/seg_helper.c                  |  2 +-
 target/i386/tcg/system/bpt_helper.c           |  1 -
 target/i386/tcg/system/excp_helper.c          |  1 +
 target/i386/tcg/translate.c                   |  1 -
 target/i386/tcg/user/excp_helper.c            |  1 -
 target/i386/tcg/user/seg_helper.c             |  1 -
 target/loongarch/cpu.c                        |  1 -
 target/loongarch/tcg/fpu_helper.c             |  1 -
 target/loongarch/tcg/iocsr_helper.c           |  1 -
 target/loongarch/tcg/op_helper.c              |  1 -
 target/loongarch/tcg/tlb_helper.c             |  1 -
 target/loongarch/tcg/vec_helper.c             |  1 -
 target/m68k/fpu_helper.c                      |  1 -
 target/m68k/helper.c                          |  1 -
 target/m68k/op_helper.c                       |  1 -
 target/m68k/translate.c                       |  1 -
 target/microblaze/cpu.c                       |  1 -
 target/microblaze/op_helper.c                 |  1 -
 target/microblaze/translate.c                 |  1 -
 target/mips/cpu.c                             |  1 -
 target/mips/system/physaddr.c                 |  1 -
 target/mips/tcg/exception.c                   |  1 -
 target/mips/tcg/fpu_helper.c                  |  1 -
 target/mips/tcg/ldst_helper.c                 |  1 -
 target/mips/tcg/msa_helper.c                  |  2 +-
 target/mips/tcg/op_helper.c                   |  1 -
 target/mips/tcg/system/special_helper.c       |  1 -
 target/mips/tcg/system/tlb_helper.c           |  1 -
 target/openrisc/cpu.c                         |  1 -
 target/openrisc/exception.c                   |  1 -
 target/openrisc/exception_helper.c            |  1 -
 target/openrisc/fpu_helper.c                  |  1 -
 target/openrisc/interrupt.c                   |  1 -
 target/openrisc/interrupt_helper.c            |  1 -
 target/openrisc/sys_helper.c                  |  1 -
 target/openrisc/translate.c                   |  1 -
 target/ppc/excp_helper.c                      |  1 -
 target/ppc/fpu_helper.c                       |  1 -
 target/ppc/machine.c                          |  1 -
 target/ppc/mem_helper.c                       |  2 +-
 target/ppc/misc_helper.c                      |  1 -
 target/ppc/mmu-hash32.c                       |  1 -
 target/ppc/mmu-hash64.c                       |  1 -
 target/ppc/mmu-radix64.c                      |  1 -
 target/ppc/mmu_common.c                       |  1 -
 target/ppc/mmu_helper.c                       |  1 -
 target/ppc/power8-pmu.c                       |  1 -
 target/ppc/tcg-excp_helper.c                  |  1 -
 target/ppc/timebase_helper.c                  |  1 -
 target/ppc/translate.c                        |  1 -
 target/ppc/user_only_helper.c                 |  1 -
 target/riscv/cpu.c                            |  1 -
 target/riscv/cpu_helper.c                     |  1 -
 target/riscv/crypto_helper.c                  |  1 -
 target/riscv/csr.c                            |  2 +-
 target/riscv/debug.c                          |  1 -
 target/riscv/fpu_helper.c                     |  1 -
 target/riscv/m128_helper.c                    |  1 -
 target/riscv/op_helper.c                      |  2 +-
 target/riscv/tcg/tcg-cpu.c                    |  1 -
 target/riscv/translate.c                      |  1 -
 target/riscv/vcrypto_helper.c                 |  1 -
 target/riscv/vector_helper.c                  |  2 +-
 target/riscv/zce_helper.c                     |  1 -
 target/rx/op_helper.c                         |  1 -
 target/rx/translate.c                         |  1 -
 target/s390x/interrupt.c                      |  1 -
 target/s390x/mmu_helper.c                     |  1 -
 target/s390x/sigp.c                           |  1 -
 target/s390x/tcg/cc_helper.c                  |  1 -
 target/s390x/tcg/crypto_helper.c              |  1 -
 target/s390x/tcg/excp_helper.c                |  1 -
 target/s390x/tcg/fpu_helper.c                 |  1 -
 target/s390x/tcg/int_helper.c                 |  1 -
 target/s390x/tcg/mem_helper.c                 |  2 +-
 target/s390x/tcg/misc_helper.c                |  1 -
 target/s390x/tcg/translate.c                  |  1 -
 target/s390x/tcg/vec_fpu_helper.c             |  1 -
 target/s390x/tcg/vec_helper.c                 |  1 -
 target/sh4/cpu.c                              |  1 -
 target/sh4/helper.c                           |  1 -
 target/sh4/op_helper.c                        |  1 -
 target/sh4/translate.c                        |  1 -
 target/sparc/cpu.c                            |  1 -
 target/sparc/fop_helper.c                     |  1 -
 target/sparc/helper.c                         |  1 -
 target/sparc/ldst_helper.c                    |  1 -
 target/sparc/machine.c                        |  1 -
 target/sparc/translate.c                      |  1 -
 target/sparc/win_helper.c                     |  1 -
 target/tricore/cpu.c                          |  1 -
 target/tricore/op_helper.c                    |  1 -
 target/tricore/translate.c                    |  1 -
 target/xtensa/dbg_helper.c                    |  1 -
 target/xtensa/exc_helper.c                    |  1 -
 target/xtensa/fpu_helper.c                    |  1 -
 target/xtensa/mmu_helper.c                    |  2 +-
 target/xtensa/op_helper.c                     |  1 -
 target/xtensa/translate.c                     |  1 -
 target/xtensa/win_helper.c                    |  1 -
 accel/tcg/meson.build                         |  2 +-
 167 files changed, 165 insertions(+), 297 deletions(-)
 create mode 100644 include/accel/tcg/iommu.h
 rename include/{exec/exec-all.h => accel/tcg/probe.h} (65%)
Signature · 1 line
2.47.1
#1 lore raw

PATCH v3 1/13 accel/tcg: Use vaddr for walk_memory_regions callback

From: Richard Henderson <[email protected]>

Use vaddr instead of target_ulong. At the same time, use int instead of unsigned long for flags, to match page_set_flags().

Message-ID: <[email protected]>

---
 include/user/page-protection.h |  5 ++---
 accel/tcg/user-exec.c          | 10 +++++-----
 linux-user/elfload.c           | 19 +++++++++----------
 linux-user/syscall.c           |  8 ++++----
 4 files changed, 20 insertions(+), 22 deletions(-)
include/user/page-protection.h +2 -3
index 1de72e31e68..8f0b769b134 100644
@@ -14,6 +14,7 @@
 
 #include "cpu-param.h"
 #include "exec/target_long.h"
+#include "exec/vaddr.h"
 #include "exec/translation-block.h"
 
 int page_unprotect(CPUState *cpu, tb_page_addr_t address, uintptr_t pc);
@@ -88,9 +89,7 @@ target_ulong page_find_range_empty(target_ulong min, target_ulong max,
 __attribute__((returns_nonnull))
 void *page_get_target_data(target_ulong address);
 
-typedef int (*walk_memory_regions_fn)(void *, target_ulong,
-                                      target_ulong, unsigned long);
-
+typedef int (*walk_memory_regions_fn)(void *, vaddr, vaddr, int);
 int walk_memory_regions(void *, walk_memory_regions_fn);
 
 void page_dump(FILE *f);
accel/tcg/user-exec.c +5 -5
index 17e3be337f5..25d86567e70 100644
@@ -199,13 +199,13 @@ int walk_memory_regions(void *priv, walk_memory_regions_fn fn)
     return rc;
 }
 
-static int dump_region(void *priv, target_ulong start,
-                       target_ulong end, unsigned long prot)
+static int dump_region(void *opaque, vaddr start, vaddr end, int prot)
 {
-    FILE *f = (FILE *)priv;
+    FILE *f = opaque;
 
-    fprintf(f, TARGET_FMT_lx"-"TARGET_FMT_lx" "TARGET_FMT_lx" %c%c%c\n",
-            start, end, end - start,
+    fprintf(f, TARGET_ABI_FMT_ptr "-" TARGET_ABI_FMT_ptr
+            " " TARGET_ABI_FMT_ptr " %c%c%c\n",
+            (abi_ptr)start, (abi_ptr)end, (abi_ptr)(end - start),
             ((prot & PAGE_READ) ? 'r' : '-'),
             ((prot & PAGE_WRITE) ? 'w' : '-'),
             ((prot & PAGE_EXEC) ? 'x' : '-'));
linux-user/elfload.c +9 -10
index 7519b6bcda3..e281745e485 100644
@@ -4044,8 +4044,7 @@ static inline void bswap_note(struct elf_note *en) { }
 /*
  * Calculate file (dump) size of given memory region.
  */
-static size_t vma_dump_size(target_ulong start, target_ulong end,
-                            unsigned long flags)
+static size_t vma_dump_size(vaddr start, vaddr end, int flags)
 {
     /* The area must be readable. */
     if (!(flags & PAGE_READ)) {
@@ -4238,8 +4237,8 @@ static int dump_write(int fd, const void *ptr, size_t size)
     return (0);
 }
 
-static int wmr_page_unprotect_regions(void *opaque, target_ulong start,
-                                      target_ulong end, unsigned long flags)
+static int wmr_page_unprotect_regions(void *opaque, vaddr start,
+                                      vaddr end, int flags)
 {
     if ((flags & (PAGE_WRITE | PAGE_WRITE_ORG)) == PAGE_WRITE_ORG) {
         size_t step = MAX(TARGET_PAGE_SIZE, qemu_real_host_page_size());
@@ -4260,8 +4259,8 @@ typedef struct {
     size_t size;
 } CountAndSizeRegions;
 
-static int wmr_count_and_size_regions(void *opaque, target_ulong start,
-                                      target_ulong end, unsigned long flags)
+static int wmr_count_and_size_regions(void *opaque, vaddr start,
+                                      vaddr end, int flags)
 {
     CountAndSizeRegions *css = opaque;
 
@@ -4275,8 +4274,8 @@ typedef struct {
     off_t offset;
 } FillRegionPhdr;
 
-static int wmr_fill_region_phdr(void *opaque, target_ulong start,
-                                target_ulong end, unsigned long flags)
+static int wmr_fill_region_phdr(void *opaque, vaddr start,
+                                vaddr end, int flags)
 {
     FillRegionPhdr *d = opaque;
     struct elf_phdr *phdr = d->phdr;
@@ -4298,8 +4297,8 @@ static int wmr_fill_region_phdr(void *opaque, target_ulong start,
     return 0;
 }
 
-static int wmr_write_region(void *opaque, target_ulong start,
-                            target_ulong end, unsigned long flags)
+static int wmr_write_region(void *opaque, vaddr start,
+                            vaddr end, int flags)
 {
     int fd = *(int *)opaque;
     size_t size = vma_dump_size(start, end, flags);
linux-user/syscall.c +4 -4
index 5826ac3adbb..23b901b7133 100644
@@ -8135,8 +8135,8 @@ static void open_self_maps_4(const struct open_self_maps_data *d,
  * Callback for walk_memory_regions, when read_self_maps() fails.
  * Proceed without the benefit of host /proc/self/maps cross-check.
  */
-static int open_self_maps_3(void *opaque, target_ulong guest_start,
-                            target_ulong guest_end, unsigned long flags)
+static int open_self_maps_3(void *opaque, vaddr guest_start,
+                            vaddr guest_end, int flags)
 {
     static const MapInfo mi = { .is_priv = true };
 
@@ -8147,8 +8147,8 @@ static int open_self_maps_3(void *opaque, target_ulong guest_start,
 /*
  * Callback for walk_memory_regions, when read_self_maps() succeeds.
  */
-static int open_self_maps_2(void *opaque, target_ulong guest_start,
-                            target_ulong guest_end, unsigned long flags)
+static int open_self_maps_2(void *opaque, vaddr guest_start,
+                            vaddr guest_end, int flags)
 {
     const struct open_self_maps_data *d = opaque;
     uintptr_t host_start = (uintptr_t)g2h_untagged(guest_start);
Signature · 1 line
2.47.1
#2 lore raw

PATCH v3 2/13 accel/tcg: Use vaddr in user/page-protection.h

In reply to Philippe Mathieu-Daudé

From: Richard Henderson <[email protected]>

Message-ID: <[email protected]>

---
 include/user/page-protection.h | 17 +++++-------
 accel/tcg/user-exec.c          | 51 ++++++++++++++++------------------
 2 files changed, 31 insertions(+), 37 deletions(-)
include/user/page-protection.h +7 -10
index 8f0b769b134..86143212fdd 100644
@@ -12,14 +12,12 @@
 #error Cannot include this header from system emulation
 #endif
 
-#include "cpu-param.h"
-#include "exec/target_long.h"
 #include "exec/vaddr.h"
 #include "exec/translation-block.h"
 
 int page_unprotect(CPUState *cpu, tb_page_addr_t address, uintptr_t pc);
 
-int page_get_flags(target_ulong address);
+int page_get_flags(vaddr address);
 
 /**
  * page_set_flags:
@@ -32,9 +30,9 @@ int page_get_flags(target_ulong address);
  * The flag PAGE_WRITE_ORG is positioned automatically depending
  * on PAGE_WRITE.  The mmap_lock should already be held.
  */
-void page_set_flags(target_ulong start, target_ulong last, int flags);
+void page_set_flags(vaddr start, vaddr last, int flags);
 
-void page_reset_target_data(target_ulong start, target_ulong last);
+void page_reset_target_data(vaddr start, vaddr last);
 
 /**
  * page_check_range
@@ -46,7 +44,7 @@ void page_reset_target_data(target_ulong start, target_ulong last);
  * Return false if any page is unmapped.  Thus testing flags == 0 is
  * equivalent to testing for flags == PAGE_VALID.
  */
-bool page_check_range(target_ulong start, target_ulong last, int flags);
+bool page_check_range(vaddr start, vaddr last, int flags);
 
 /**
  * page_check_range_empty:
@@ -58,7 +56,7 @@ bool page_check_range(target_ulong start, target_ulong last, int flags);
  * The memory lock must be held so that the caller will can ensure
  * the result stays true until a new mapping can be installed.
  */
-bool page_check_range_empty(target_ulong start, target_ulong last);
+bool page_check_range_empty(vaddr start, vaddr last);
 
 /**
  * page_find_range_empty
@@ -72,8 +70,7 @@ bool page_check_range_empty(target_ulong start, target_ulong last);
  * The memory lock must be held, as the caller will want to ensure
  * the returned range stays empty until a new mapping can be installed.
  */
-target_ulong page_find_range_empty(target_ulong min, target_ulong max,
-                                   target_ulong len, target_ulong align);
+vaddr page_find_range_empty(vaddr min, vaddr max, vaddr len, vaddr align);
 
 /**
  * page_get_target_data(address)
@@ -87,7 +84,7 @@ target_ulong page_find_range_empty(target_ulong min, target_ulong max,
  * e.g. with the munmap system call.
  */
 __attribute__((returns_nonnull))
-void *page_get_target_data(target_ulong address);
+void *page_get_target_data(vaddr address);
 
 typedef int (*walk_memory_regions_fn)(void *, vaddr, vaddr, int);
 int walk_memory_regions(void *, walk_memory_regions_fn);
accel/tcg/user-exec.c +24 -27

178 lines not on this page · raw message

Signature · 1 line
2.47.1
Reviewed-by Anton Johansson on v3 2/13
#3 lore raw

Re: [PATCH v3 02/13] accel/tcg: Use vaddr in user/page-protection.h

Quoted 9 lines · Philippe Mathieu-Daudé

From: Richard Henderson <[email protected]>

Message-ID: <[email protected]>

---
 include/user/page-protection.h | 17 +++++-------
 accel/tcg/user-exec.c          | 51 ++++++++++++++++------------------
 2 files changed, 31 insertions(+), 37 deletions(-)
#4 lore raw

PATCH v3 3/13 accel/tcg: Correct list of included headers in tcg-stub.c

In reply to Philippe Mathieu-Daudé

In commit 3549118b498 we moved cpu_loop_exit*() declarations to "exec/cpu-common.h" but neglected to update tcg-stub.c. We missed it because "exec/cpu-common.h" is indirectly pulled in via "exec/exec-all.h" -> "exec/translation-block.h". Include it directly instead of the not necessary "exec/exec-all.h".

Commit bb6cf6f0168 ("accel/tcg: Factor tcg_cpu_reset_hold() out") removed the need for "exec/tb-flush.h", so remote it too.

Fixes 3549118b498 ("exec: Move cpu_loop_foo() functions to 'cpu-common.h'")
---
 accel/stubs/tcg-stub.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
accel/stubs/tcg-stub.c +1 -2
index b2b9881bdfb..3b76b8b17c1 100644
@@ -11,8 +11,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "exec/tb-flush.h"
-#include "exec/exec-all.h"
+#include "exec/cpu-common.h"
 
 G_NORETURN void cpu_loop_exit(CPUState *cpu)
 {
Signature · 1 line
2.47.1
#5 lore raw

PATCH v3 4/13 include/exec: Include missing headers in exec-all.h

In reply to Philippe Mathieu-Daudé

"exec/exec-all.h" declares prototypes such:

void *probe_access(CPUArchState *env, vaddr addr, int size,

                                        ^^^^^
                     MMUAccessType access_type, int mmu_idx,
                     uintptr_t retaddr);
  MemoryRegionSection *iotlb_to_section(CPUState *cpu,
                                        hwaddr index,
                                        ^^^^^^
                                        MemTxAttrs attrs);
                                        ^^^^^^^^^^

vaddr is defined in "exec/vaddr.h", hwaddr in "exec/hwaddr.h" and MemTxAttrs in "exec/memattrs.h". All these headers are indirectly pulled in via "exec/translation-block.h". Since we will remove "exec/translation-block.h" in the next commit, include the missing ones, otherwise we'd get errors such:

include/exec/exec-all.h:51:1: error: unknown type name 'hwaddr'
51 | hwaddr memory_region_section_get_iotlb(CPUState *cpu,
| ^

---
 include/exec/exec-all.h | 3 +++
 1 file changed, 3 insertions(+)
include/exec/exec-all.h +3 -0
index 24383b6abad..c46255e66ef 100644
@@ -20,8 +20,11 @@
 #ifndef EXEC_ALL_H
 #define EXEC_ALL_H
 
+#include "exec/hwaddr.h"
+#include "exec/memattrs.h"
 #include "exec/mmu-access-type.h"
 #include "exec/translation-block.h"
+#include "exec/vaddr.h"
 
 #if defined(CONFIG_TCG)
 #include "accel/tcg/getpc.h"
Signature · 1 line
2.47.1
#6 lore raw

PATCH v3 5/13 include/exec: Move tb_invalidate_phys_range to translation-block.h

In reply to Philippe Mathieu-Daudé

From: Richard Henderson <[email protected]>

Message-ID: <[email protected]>

---
 include/exec/exec-all.h          | 5 -----
 include/exec/translation-block.h | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)
include/exec/exec-all.h +0 -5
index c46255e66ef..4c5ad98c6a9 100644
@@ -23,7 +23,6 @@
 #include "exec/hwaddr.h"
 #include "exec/memattrs.h"
 #include "exec/mmu-access-type.h"
-#include "exec/translation-block.h"
 #include "exec/vaddr.h"
 
 #if defined(CONFIG_TCG)
@@ -123,10 +122,6 @@ int probe_access_full_mmu(CPUArchState *env, vaddr addr, int size,
 #endif /* !CONFIG_USER_ONLY */
 #endif /* CONFIG_TCG */
 
-/* TranslationBlock invalidate API */
-void tb_invalidate_phys_range(CPUState *cpu, tb_page_addr_t start,
-                              tb_page_addr_t last);
-
 #if !defined(CONFIG_USER_ONLY)
 
 /**
include/exec/translation-block.h +4 -0
index 8b8e730561d..cdce399ebab 100644
@@ -207,4 +207,8 @@ static inline void tb_set_page_addr1(TranslationBlock *tb,
 #endif
 }
 
+/* TranslationBlock invalidate API */
+void tb_invalidate_phys_range(CPUState *cpu, tb_page_addr_t start,
+                              tb_page_addr_t last);
+
 #endif /* EXEC_TRANSLATION_BLOCK_H */
Signature · 1 line
2.47.1
Reviewed-by Anton Johansson on v3 5/13
#7 lore raw

Re: [PATCH v3 05/13] include/exec: Move tb_invalidate_phys_range to translation-block.h

Quoted 10 lines · Philippe Mathieu-Daudé

From: Richard Henderson <[email protected]>

Message-ID: <[email protected]>

---
 include/exec/exec-all.h          | 5 -----
 include/exec/translation-block.h | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)
#8 lore raw

PATCH v3 6/13 accel/tcg: Compile tb-maint.c twice

In reply to Philippe Mathieu-Daudé

From: Richard Henderson <[email protected]>

Message-ID: <[email protected]>

---
 accel/tcg/tb-hash.h   | 3 +--
 accel/tcg/tb-maint.c  | 2 --
 accel/tcg/meson.build | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)
accel/tcg/tb-hash.h +1 -2
index 3bc5042d9d0..f7b159f04cb 100644
@@ -20,8 +20,7 @@
 #ifndef EXEC_TB_HASH_H
 #define EXEC_TB_HASH_H
 
-#include "exec/cpu-defs.h"
-#include "exec/exec-all.h"
+#include "exec/vaddr.h"
 #include "exec/target_page.h"
 #include "exec/translation-block.h"
 #include "qemu/xxhash.h"
accel/tcg/tb-maint.c +0 -2
index cf12a28eabf..512dae93bdf 100644
@@ -20,10 +20,8 @@
 #include "qemu/osdep.h"
 #include "qemu/interval-tree.h"
 #include "qemu/qtree.h"
-#include "cpu.h"
 #include "exec/cputlb.h"
 #include "exec/log.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "exec/mmap-lock.h"
 #include "exec/tb-flush.h"
accel/tcg/meson.build +1 -1
index 047afa49a28..3f7b127130b 100644
@@ -8,6 +8,7 @@ tcg_ss.add(files(
   'cpu-exec-common.c',
   'tcg-runtime.c',
   'tcg-runtime-gvec.c',
+  'tb-maint.c',
   'translator.c',
 ))
 if get_option('plugins')
@@ -21,7 +22,6 @@ tcg_specific_ss = ss.source_set()
 tcg_specific_ss.add(files(
   'tcg-all.c',
   'cpu-exec.c',
-  'tb-maint.c',
   'translate-all.c',
 ))
 tcg_specific_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c'))
Signature · 1 line
2.47.1
Reviewed-by Anton Johansson on v3 6/13
#9 lore raw

Re: [PATCH v3 06/13] accel/tcg: Compile tb-maint.c twice

Quoted 10 lines · Philippe Mathieu-Daudé

From: Richard Henderson <[email protected]>

Message-ID: <[email protected]>

---
 accel/tcg/tb-hash.h   | 3 +--
 accel/tcg/tb-maint.c  | 2 --
 accel/tcg/meson.build | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)
#10 lore raw

PATCH v3 7/13 target/riscv: Include missing 'accel/tcg/getpc.h' in csr.c

In reply to Philippe Mathieu-Daudé

"accel/tcg/getpc.h" is pulled in indirectly. Include it explicitly to avoid when refactoring unrelated headers:

target/riscv/csr.c:2117:25: error: call to undeclared function 'GETPC' [-Wimplicit-function-declaration]
2117 | if ((val & RVC) && (GETPC() & ~3) != 0) {
| ^

Note the TODO comment around GETPC() added upon introduction in commit f18637cd611 ("RISC-V: Add misa runtime write support"):

2099 static RISCVException write_misa(CPURISCVState *env, int csrno,
2100 target_ulong val)
2101 {
...
2113 /*

 2114      * Suppress 'C' if next instruction is not aligned
 2115      * TODO: this should check next_pc
 2116      */

2117 if ((val & RVC) && (GETPC() & ~3) != 0) {
2118 val &= ~RVC;
2119 }

---
 target/riscv/csr.c | 1 +
 1 file changed, 1 insertion(+)
target/riscv/csr.c +1 -0
index c52c87faaea..13086438552 100644
@@ -28,6 +28,7 @@
 #include "exec/cputlb.h"
 #include "exec/tb-flush.h"
 #include "exec/icount.h"
+#include "accel/tcg/getpc.h"
 #include "qemu/guest-random.h"
 #include "qapi/error.h"
 #include <stdbool.h>
Signature · 1 line
2.47.1
#11 lore raw

PATCH v3 8/13 target/hexagon: Include missing 'accel/tcg/getpc.h'

In reply to Philippe Mathieu-Daudé

Since the macros.h headers call GETPC(), they need to include "accel/tcg/getpc.h", which defines it.

---
 target/hexagon/macros.h       | 1 +
 target/hexagon/mmvec/macros.h | 1 +
 2 files changed, 2 insertions(+)
target/hexagon/macros.h +1 -0
index ee3d4c88e7b..6f82277a415 100644
@@ -21,6 +21,7 @@
 #include "cpu.h"
 #include "hex_regs.h"
 #include "reg_fields.h"
+#include "accel/tcg/getpc.h"
 
 #define GET_FIELD(FIELD, REGIN) \
     fEXTRACTU_BITS(REGIN, reg_field_info[FIELD].width, \
target/hexagon/mmvec/macros.h +1 -0
index bcd4a1e8973..c1a88392c05 100644
@@ -21,6 +21,7 @@
 #include "qemu/host-utils.h"
 #include "arch.h"
 #include "mmvec/system_ext_mmvec.h"
+#include "accel/tcg/getpc.h"
 
 #ifndef QEMU_GENERATE
 #define VdV      (*(MMVector *restrict)(VdV_void))
Signature · 1 line
2.47.1
#12 lore raw

PATCH v3 9/13 accel/tcg: Include 'accel/tcg/getpc.h' in 'exec/helper-proto'

In reply to Philippe Mathieu-Daudé

Most files including "exec/helper-proto.h" call GETPC(). Include it there (in the common part) instead of the unspecific "exec/exec-all.h" header.

---
 include/exec/exec-all.h            | 1 -
 include/exec/helper-proto-common.h | 2 ++
 accel/tcg/translate-all.c          | 1 +
 target/avr/helper.c                | 1 -
 4 files changed, 3 insertions(+), 2 deletions(-)
include/exec/exec-all.h +0 -1
index 4c5ad98c6a9..816274bf905 100644
@@ -26,7 +26,6 @@
 #include "exec/vaddr.h"
 
 #if defined(CONFIG_TCG)
-#include "accel/tcg/getpc.h"
 
 /**
  * probe_access:
include/exec/helper-proto-common.h +2 -0
index 16782ef46c8..76e6c25becb 100644
@@ -13,4 +13,6 @@
 #include "exec/helper-proto.h.inc"
 #undef  HELPER_H
 
+#include "accel/tcg/getpc.h"
+
 #endif /* HELPER_PROTO_COMMON_H */
accel/tcg/translate-all.c +1 -0
index 38819a507b2..0408e2522a8 100644
@@ -61,6 +61,7 @@
 #include "system/tcg.h"
 #include "qapi/error.h"
 #include "accel/tcg/cpu-ops.h"
+#include "accel/tcg/getpc.h"
 #include "tb-jmp-cache.h"
 #include "tb-hash.h"
 #include "tb-context.h"
target/avr/helper.c +0 -1
index afa591470fe..b9cd6d5ef27 100644
@@ -23,7 +23,6 @@
 #include "qemu/error-report.h"
 #include "cpu.h"
 #include "accel/tcg/cpu-ops.h"
-#include "accel/tcg/getpc.h"
 #include "exec/cputlb.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
Signature · 1 line
2.47.1
#13 lore raw

Re: [PATCH v3 09/13] accel/tcg: Include 'accel/tcg/getpc.h' in 'exec/helper-proto'

Quoted 29 lines · Philippe Mathieu-Daudé

Most files including "exec/helper-proto.h" call GETPC(). Include it there (in the common part) instead of the unspecific "exec/exec-all.h" header.

---
 include/exec/exec-all.h            | 1 -
 include/exec/helper-proto-common.h | 2 ++
 accel/tcg/translate-all.c          | 1 +
 target/avr/helper.c                | 1 -
 4 files changed, 3 insertions(+), 2 deletions(-)
include/exec/exec-all.h +0 -1
index 4c5ad98c6a9..816274bf905 100644
@@ -26,7 +26,6 @@
 #include "exec/vaddr.h"
 
 #if defined(CONFIG_TCG)
-#include "accel/tcg/getpc.h"
 
 /**
  * probe_access:
include/exec/helper-proto-common.h +0 -0
index 16782ef46c8..76e6c25becb 100644

include/exec/helper-proto-common.h line 17

Quoted 5 lines
include/exec/helper-proto-common.h +2 -0
@@ -13,4 +13,6 @@
 #include "exec/helper-proto.h.inc"
 #undef  HELPER_H
 
+#include "accel/tcg/getpc.h"
+

Non-TCG builds will fail since exec/helper-proto.h is sometimes included outside CONFIG_TCG (e.g. target/arm/debug_helper.c).

Signature · 2 lines
Anton Johansson
rev.ng Labs Srl.
#14 lore raw

Re: [PATCH v3 09/13] accel/tcg: Include 'accel/tcg/getpc.h' in 'exec/helper-proto'

Quoted 33 lines · Anton Johansson
Quoted 32 lines · Philippe Mathieu-Daudé

Most files including "exec/helper-proto.h" call GETPC(). Include it there (in the common part) instead of the unspecific "exec/exec-all.h" header.

---
  include/exec/exec-all.h            | 1 -
  include/exec/helper-proto-common.h | 2 ++
  accel/tcg/translate-all.c          | 1 +
  target/avr/helper.c                | 1 -
  4 files changed, 3 insertions(+), 2 deletions(-)
include/exec/exec-all.h +0 -1
index 4c5ad98c6a9..816274bf905 100644
@@ -26,7 +26,6 @@
  #include "exec/vaddr.h"
 
  #if defined(CONFIG_TCG)
-#include "accel/tcg/getpc.h"
 
  /**
   * probe_access:
include/exec/helper-proto-common.h +0 -0
index 16782ef46c8..76e6c25becb 100644
@@ -13,4 +13,6 @@
  #include "exec/helper-proto.h.inc"
  #undef  HELPER_H
 
Quoted 5 lines

include/exec/helper-proto-common.h line 17

Quoted 2 lines
include/exec/helper-proto-common.h +2 -0
+#include "accel/tcg/getpc.h"
+

Non-TCG builds will fail since exec/helper-proto.h is sometimes included outside CONFIG_TCG (e.g. target/arm/debug_helper.c).

Yes, I've removed that #ifndef in getpc.h on my tcg-next-1 branch.

r~

#15 lore raw

PATCH v3 10/13 physmem: Move TCG IOTLB methods around

In reply to Philippe Mathieu-Daudé

The next commit will restrict TCG specific code in physmem.c using some #ifdef'ry. In order to keep it simple, move iotlb_to_section() and memory_region_section_get_iotlb() around close together.

---
 system/physmem.c | 50 ++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)
system/physmem.c +25 -25
index 637f2d85324..ccbeae241c4 100644
@@ -746,6 +746,31 @@ translate_fail:
     return &d->map.sections[PHYS_SECTION_UNASSIGNED];
 }
 
+MemoryRegionSection *iotlb_to_section(CPUState *cpu,
+                                      hwaddr index, MemTxAttrs attrs)
+{
+    int asidx = cpu_asidx_from_attrs(cpu, attrs);
+    CPUAddressSpace *cpuas = &cpu->cpu_ases[asidx];
+    AddressSpaceDispatch *d = cpuas->memory_dispatch;
+    int section_index = index & ~TARGET_PAGE_MASK;
+    MemoryRegionSection *ret;
+
+    assert(section_index < d->map.sections_nb);
+    ret = d->map.sections + section_index;
+    assert(ret->mr);
+    assert(ret->mr->ops);
+
+    return ret;
+}
+
+/* Called from RCU critical section */
+hwaddr memory_region_section_get_iotlb(CPUState *cpu,
+                                       MemoryRegionSection *section)
+{
+    AddressSpaceDispatch *d = flatview_to_dispatch(section->fv);
+    return section - d->map.sections;
+}
+
 void cpu_address_space_init(CPUState *cpu, int asidx,
                             const char *prefix, MemoryRegion *mr)
 {
@@ -1002,14 +1027,6 @@ bool cpu_physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap,
     return false;
 }
 
-/* Called from RCU critical section */
-hwaddr memory_region_section_get_iotlb(CPUState *cpu,
-                                       MemoryRegionSection *section)
-{
-    AddressSpaceDispatch *d = flatview_to_dispatch(section->fv);
-    return section - d->map.sections;
-}
-
 static int subpage_register(subpage_t *mmio, uint32_t start, uint32_t end,
                             uint16_t section);
 static subpage_t *subpage_init(FlatView *fv, hwaddr base);
@@ -2669,23 +2686,6 @@ static uint16_t dummy_section(PhysPageMap *map, FlatView *fv, MemoryRegion *mr)
     return phys_section_add(map, &section);
 }
 
-MemoryRegionSection *iotlb_to_section(CPUState *cpu,
-                                      hwaddr index, MemTxAttrs attrs)
-{
-    int asidx = cpu_asidx_from_attrs(cpu, attrs);
-    CPUAddressSpace *cpuas = &cpu->cpu_ases[asidx];
-    AddressSpaceDispatch *d = cpuas->memory_dispatch;
-    int section_index = index & ~TARGET_PAGE_MASK;
-    MemoryRegionSection *ret;
-
-    assert(section_index < d->map.sections_nb);
-    ret = d->map.sections + section_index;
-    assert(ret->mr);
-    assert(ret->mr->ops);
-
-    return ret;
-}
-
 static void io_mem_init(void)
 {
     memory_region_init_io(&io_mem_unassigned, NULL, &unassigned_mem_ops, NULL,
Signature · 1 line
2.47.1
#16 lore raw

PATCH v3 11/13 physmem: Restrict TCG IOTLB code to TCG accel

In reply to Philippe Mathieu-Daudé

Restrict iotlb_to_section(), address_space_translate_for_iotlb() and memory_region_section_get_iotlb() to TCG. Declare them in the new "accel/tcg/iommu.h" header. Declare iotlb_to_section() using the MemoryRegionSection typedef.

---
 MAINTAINERS               |  2 +-
 include/accel/tcg/iommu.h | 41 +++++++++++++++++++++++++++++++++++++++
 include/exec/exec-all.h   | 26 -------------------------
 accel/tcg/cputlb.c        |  1 +
 system/physmem.c          |  5 +++++
 5 files changed, 48 insertions(+), 27 deletions(-)
 create mode 100644 include/accel/tcg/iommu.h
MAINTAINERS +1 -1
index 661a47db5ac..3a37cc73af7 100644
@@ -168,7 +168,7 @@ F: include/exec/helper*.h.inc
 F: include/exec/helper-info.c.inc
 F: include/exec/page-protection.h
 F: include/system/tcg.h
-F: include/accel/tcg/cpu-ops.h
+F: include/accel/tcg/
 F: host/include/*/host/cpuinfo.h
 F: util/cpuinfo-*.c
 F: include/tcg/
include/accel/tcg/iommu.h new file +41 -0

41 lines not on this page · raw message

include/exec/exec-all.h +0 -26
index 816274bf905..b9eb9bc4b63 100644
@@ -21,7 +21,6 @@
 #define EXEC_ALL_H
 
 #include "exec/hwaddr.h"
-#include "exec/memattrs.h"
 #include "exec/mmu-access-type.h"
 #include "exec/vaddr.h"
 
@@ -121,29 +120,4 @@ int probe_access_full_mmu(CPUArchState *env, vaddr addr, int size,
 #endif /* !CONFIG_USER_ONLY */
 #endif /* CONFIG_TCG */
 
-#if !defined(CONFIG_USER_ONLY)
-
-/**
- * iotlb_to_section:
- * @cpu: CPU performing the access
- * @index: TCG CPU IOTLB entry
- *
- * Given a TCG CPU IOTLB entry, return the MemoryRegionSection that
- * it refers to. @index will have been initially created and returned
- * by memory_region_section_get_iotlb().
- */
-struct MemoryRegionSection *iotlb_to_section(CPUState *cpu,
-                                             hwaddr index, MemTxAttrs attrs);
-#endif
-
-#if !defined(CONFIG_USER_ONLY)
-
-MemoryRegionSection *
-address_space_translate_for_iotlb(CPUState *cpu, int asidx, hwaddr addr,
-                                  hwaddr *xlat, hwaddr *plen,
-                                  MemTxAttrs attrs, int *prot);
-hwaddr memory_region_section_get_iotlb(CPUState *cpu,
-                                       MemoryRegionSection *section);
-#endif
-
 #endif
accel/tcg/cputlb.c +1 -0
index ca69128232c..d11989f5674 100644
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "qemu/main-loop.h"
 #include "accel/tcg/cpu-ops.h"
+#include "accel/tcg/iommu.h"
 #include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "system/memory.h"
system/physmem.c +5 -0
index ccbeae241c4..f1ec0902c78 100644
@@ -29,6 +29,7 @@
 
 #ifdef CONFIG_TCG
 #include "accel/tcg/cpu-ops.h"
+#include "accel/tcg/iommu.h"
 #endif /* CONFIG_TCG */
 
 #include "exec/exec-all.h"
@@ -587,6 +588,8 @@ MemoryRegion *flatview_translate(FlatView *fv, hwaddr addr, hwaddr *xlat,
     return mr;
 }
 
+#ifdef CONFIG_TCG
+
 typedef struct TCGIOMMUNotifier {
     IOMMUNotifier n;
     MemoryRegion *mr;
@@ -771,6 +774,8 @@ hwaddr memory_region_section_get_iotlb(CPUState *cpu,
     return section - d->map.sections;
 }
 
+#endif /* CONFIG_TCG */
+
 void cpu_address_space_init(CPUState *cpu, int asidx,
                             const char *prefix, MemoryRegion *mr)
 {
Signature · 1 line
2.47.1
Reviewed-by Anton Johansson on v3 11/13
#17 lore raw

Re: [PATCH v3 11/13] physmem: Restrict TCG IOTLB code to TCG accel

Quoted 39 lines · Philippe Mathieu-Daudé

Restrict iotlb_to_section(), address_space_translate_for_iotlb() and memory_region_section_get_iotlb() to TCG. Declare them in the new "accel/tcg/iommu.h" header. Declare iotlb_to_section() using the MemoryRegionSection typedef.

---
 MAINTAINERS               |  2 +-
 include/accel/tcg/iommu.h | 41 +++++++++++++++++++++++++++++++++++++++
 include/exec/exec-all.h   | 26 -------------------------
 accel/tcg/cputlb.c        |  1 +
 system/physmem.c          |  5 +++++
 5 files changed, 48 insertions(+), 27 deletions(-)
 create mode 100644 include/accel/tcg/iommu.h
MAINTAINERS +1 -1
index 661a47db5ac..3a37cc73af7 100644
@@ -168,7 +168,7 @@ F: include/exec/helper*.h.inc
 F: include/exec/helper-info.c.inc
 F: include/exec/page-protection.h
 F: include/system/tcg.h
-F: include/accel/tcg/cpu-ops.h
+F: include/accel/tcg/
 F: host/include/*/host/cpuinfo.h
 F: util/cpuinfo-*.c
 F: include/tcg/
include/accel/tcg/iommu.h new file +5 -0
new file mode 100644
index 00000000000..90cfd6c0ed1
@@ -0,0 +1,41 @@
+/*
+ * TCG IOMMU translations.
+ *
+ * Copyright (c) 2003 Fabrice Bellard
+ * SPDX-License-Identifier: LGPL-2.1-or-later

include/accel/tcg/iommu.h line 15

Quoted 10 lines
include/accel/tcg/iommu.h new file +10 -0
+ */
+#ifndef ACCEL_TCG_IOMMU_H
+#define ACCEL_TCG_IOMMU_H
+
+#ifdef CONFIG_USER_ONLY
+#error Cannot include accel/tcg/iommu.h from user emulation
+#endif
+
+#include "exec/hwaddr.h"
+#include "exec/memattrs.h"

Missing qemu/typedefs.h include

Otherwise:

#18 lore raw

Re: [PATCH v3 11/13] physmem: Restrict TCG IOTLB code to TCG accel

Quoted 44 lines · Anton Johansson
Quoted 43 lines · Philippe Mathieu-Daudé

Restrict iotlb_to_section(), address_space_translate_for_iotlb() and memory_region_section_get_iotlb() to TCG. Declare them in the new "accel/tcg/iommu.h" header. Declare iotlb_to_section() using the MemoryRegionSection typedef.

---
  MAINTAINERS               |  2 +-
  include/accel/tcg/iommu.h | 41 +++++++++++++++++++++++++++++++++++++++
  include/exec/exec-all.h   | 26 -------------------------
  accel/tcg/cputlb.c        |  1 +
  system/physmem.c          |  5 +++++
  5 files changed, 48 insertions(+), 27 deletions(-)

create mode 100644 include/accel/tcg/iommu.h

MAINTAINERS +1 -1
index 661a47db5ac..3a37cc73af7 100644
@@ -168,7 +168,7 @@ F: include/exec/helper*.h.inc
  F: include/exec/helper-info.c.inc
  F: include/exec/page-protection.h
  F: include/system/tcg.h
-F: include/accel/tcg/cpu-ops.h
+F: include/accel/tcg/
  F: host/include/*/host/cpuinfo.h
  F: util/cpuinfo-*.c
  F: include/tcg/
include/accel/tcg/iommu.h new file +9 -0
new file mode 100644
index 00000000000..90cfd6c0ed1
@@ -0,0 +1,41 @@
+/*
+ * TCG IOMMU translations.
+ *
+ * Copyright (c) 2003 Fabrice Bellard
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+#ifndef ACCEL_TCG_IOMMU_H
+#define ACCEL_TCG_IOMMU_H
+
Quoted 8 lines

include/accel/tcg/iommu.h line 15

Quoted 6 lines
include/accel/tcg/iommu.h new file +6 -0
+#ifdef CONFIG_USER_ONLY
+#error Cannot include accel/tcg/iommu.h from user emulation
+#endif
+
+#include "exec/hwaddr.h"
+#include "exec/memattrs.h"

Missing qemu/typedefs.h include

No, that's always done by qemu/osdep.h in the c file.

r~

#19 lore raw

Re: [PATCH v3 11/13] physmem: Restrict TCG IOTLB code to TCG accel

Quoted 54 lines · Richard Henderson
Quoted 44 lines · Anton Johansson
Quoted 43 lines · Philippe Mathieu-Daudé

Restrict iotlb_to_section(), address_space_translate_for_iotlb() and memory_region_section_get_iotlb() to TCG. Declare them in the new "accel/tcg/iommu.h" header. Declare iotlb_to_section() using the MemoryRegionSection typedef.

---
  MAINTAINERS               |  2 +-
  include/accel/tcg/iommu.h | 41 +++++++++++++++++++++++++++++++++++++++
  include/exec/exec-all.h   | 26 -------------------------
  accel/tcg/cputlb.c        |  1 +
  system/physmem.c          |  5 +++++
  5 files changed, 48 insertions(+), 27 deletions(-)

create mode 100644 include/accel/tcg/iommu.h

MAINTAINERS +1 -1
index 661a47db5ac..3a37cc73af7 100644
@@ -168,7 +168,7 @@ F: include/exec/helper*.h.inc
  F: include/exec/helper-info.c.inc
  F: include/exec/page-protection.h
  F: include/system/tcg.h
-F: include/accel/tcg/cpu-ops.h
+F: include/accel/tcg/
  F: host/include/*/host/cpuinfo.h
  F: util/cpuinfo-*.c
  F: include/tcg/
include/accel/tcg/iommu.h new file +9 -0
new file mode 100644
index 00000000000..90cfd6c0ed1
@@ -0,0 +1,41 @@
+/*
+ * TCG IOMMU translations.
+ *
+ * Copyright (c) 2003 Fabrice Bellard
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+#ifndef ACCEL_TCG_IOMMU_H
+#define ACCEL_TCG_IOMMU_H
+
Quoted 8 lines

include/accel/tcg/iommu.h line 15

Quoted 6 lines
include/accel/tcg/iommu.h new file +6 -0
+#ifdef CONFIG_USER_ONLY
+#error Cannot include accel/tcg/iommu.h from user emulation
+#endif
+
+#include "exec/hwaddr.h"
+#include "exec/memattrs.h"

Missing qemu/typedefs.h include

Quoted 4 lines

No, that's always done by qemu/osdep.h in the c file.

r~

Oh alright then! Thanks:)

Signature · 2 lines
Anton Johansson
rev.ng Labs Srl.
#20 lore raw

PATCH v3 12/13 accel/tcg: Extract probe API out of 'exec/exec-all.h'

In reply to Philippe Mathieu-Daudé

Declare probe methods in "accel/tcg/probe.h" to emphasize they are specific to TCG accelerator.

---
 include/accel/tcg/probe.h            | 106 +++++++++++++++++++++++++++
 include/exec/exec-all.h              | 100 -------------------------
 target/hexagon/mmvec/macros.h        |   1 +
 accel/tcg/cputlb.c                   |   1 +
 accel/tcg/user-exec.c                |   1 +
 semihosting/uaccess.c                |   1 +
 target/arm/helper.c                  |   1 +
 target/arm/ptw.c                     |   1 +
 target/arm/tcg/helper-a64.c          |   1 +
 target/arm/tcg/mte_helper.c          |   1 +
 target/arm/tcg/op_helper.c           |   1 +
 target/arm/tcg/sve_helper.c          |   1 +
 target/hexagon/op_helper.c           |   1 +
 target/hppa/mem_helper.c             |   1 +
 target/hppa/op_helper.c              |   1 +
 target/i386/tcg/access.c             |   1 +
 target/i386/tcg/seg_helper.c         |   1 +
 target/i386/tcg/system/excp_helper.c |   1 +
 target/mips/tcg/msa_helper.c         |   1 +
 target/ppc/mem_helper.c              |   1 +
 target/riscv/op_helper.c             |   1 +
 target/riscv/vector_helper.c         |   1 +
 target/s390x/tcg/mem_helper.c        |   1 +
 target/xtensa/mmu_helper.c           |   1 +
 24 files changed, 128 insertions(+), 100 deletions(-)
 create mode 100644 include/accel/tcg/probe.h
include/accel/tcg/probe.h new file +106 -0
new file mode 100644
index 00000000000..177bd1608d1
@@ -0,0 +1,106 @@
+/*
+ * Probe guest virtual addresses for access permissions.
+ *
+ * Copyright (c) 2003 Fabrice Bellard
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+#ifndef ACCEL_TCG_PROBE_H
+#define ACCEL_TCG_PROBE_H
+
+#include "exec/mmu-access-type.h"
+#include "exec/vaddr.h"
+
+/**
+ * probe_access:
+ * @env: CPUArchState
+ * @addr: guest virtual address to look up
+ * @size: size of the access
+ * @access_type: read, write or execute permission
+ * @mmu_idx: MMU index to use for lookup
+ * @retaddr: return address for unwinding
+ *
+ * Look up the guest virtual address @addr.  Raise an exception if the
+ * page does not satisfy @access_type.  Raise an exception if the
+ * access (@addr, @size) hits a watchpoint.  For writes, mark a clean
+ * page as dirty.
+ *
+ * Finally, return the host address for a page that is backed by RAM,
+ * or NULL if the page requires I/O.
+ */
+void *probe_access(CPUArchState *env, vaddr addr, int size,
+                   MMUAccessType access_type, int mmu_idx, uintptr_t retaddr);
+
+static inline void *probe_write(CPUArchState *env, vaddr addr, int size,
+                                int mmu_idx, uintptr_t retaddr)
+{
+    return probe_access(env, addr, size, MMU_DATA_STORE, mmu_idx, retaddr);
+}
+
+static inline void *probe_read(CPUArchState *env, vaddr addr, int size,
+                               int mmu_idx, uintptr_t retaddr)
+{
+    return probe_access(env, addr, size, MMU_DATA_LOAD, mmu_idx, retaddr);
+}
+
+/**
+ * probe_access_flags:
+ * @env: CPUArchState
+ * @addr: guest virtual address to look up
+ * @size: size of the access
+ * @access_type: read, write or execute permission
+ * @mmu_idx: MMU index to use for lookup
+ * @nonfault: suppress the fault
+ * @phost: return value for host address
+ * @retaddr: return address for unwinding
+ *
+ * Similar to probe_access, loosely returning the TLB_FLAGS_MASK for
+ * the page, and storing the host address for RAM in @phost.
+ *
+ * If @nonfault is set, do not raise an exception but return TLB_INVALID_MASK.
+ * Do not handle watchpoints, but include TLB_WATCHPOINT in the returned flags.
+ * Do handle clean pages, so exclude TLB_NOTDIRY from the returned flags.
+ * For simplicity, all "mmio-like" flags are folded to TLB_MMIO.
+ */
+int probe_access_flags(CPUArchState *env, vaddr addr, int size,
+                       MMUAccessType access_type, int mmu_idx,
+                       bool nonfault, void **phost, uintptr_t retaddr);
+
+#ifndef CONFIG_USER_ONLY
+
+/**
+ * probe_access_full:
+ * Like probe_access_flags, except also return into @pfull.
+ *
+ * The CPUTLBEntryFull structure returned via @pfull is transient
+ * and must be consumed or copied immediately, before any further
+ * access or changes to TLB @mmu_idx.
+ *
+ * This function will not fault if @nonfault is set, but will
+ * return TLB_INVALID_MASK if the page is not mapped, or is not
+ * accessible with @access_type.
+ *
+ * This function will return TLB_MMIO in order to force the access
+ * to be handled out-of-line if plugins wish to instrument the access.
+ */
+int probe_access_full(CPUArchState *env, vaddr addr, int size,
+                      MMUAccessType access_type, int mmu_idx,
+                      bool nonfault, void **phost,
+                      CPUTLBEntryFull **pfull, uintptr_t retaddr);
+
+/**
+ * probe_access_full_mmu:
+ * Like probe_access_full, except:
+ *
+ * This function is intended to be used for page table accesses by
+ * the target mmu itself.  Since such page walking happens while
+ * handling another potential mmu fault, this function never raises
+ * exceptions (akin to @nonfault true for probe_access_full).
+ * Likewise this function does not trigger plugin instrumentation.
+ */
+int probe_access_full_mmu(CPUArchState *env, vaddr addr, int size,
+                          MMUAccessType access_type, int mmu_idx,
+                          void **phost, CPUTLBEntryFull **pfull);
+
+#endif /* !CONFIG_USER_ONLY */
+
+#endif
include/exec/exec-all.h +0 -100

104 lines not on this page · raw message

target/hexagon/mmvec/macros.h +1 -0
index c1a88392c05..c7840fbf2e1 100644
@@ -22,6 +22,7 @@
 #include "arch.h"
 #include "mmvec/system_ext_mmvec.h"
 #include "accel/tcg/getpc.h"
+#include "accel/tcg/probe.h"
 
 #ifndef QEMU_GENERATE
 #define VdV      (*(MMVector *restrict)(VdV_void))
accel/tcg/cputlb.c +1 -0
index d11989f5674..b346af942a0 100644
@@ -21,6 +21,7 @@
 #include "qemu/main-loop.h"
 #include "accel/tcg/cpu-ops.h"
 #include "accel/tcg/iommu.h"
+#include "accel/tcg/probe.h"
 #include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "system/memory.h"
accel/tcg/user-exec.c +1 -0
index 43d005e24e4..697fdf18241 100644
@@ -27,6 +27,7 @@
 #include "qemu/bitops.h"
 #include "qemu/rcu.h"
 #include "accel/tcg/cpu-ldst.h"
+#include "accel/tcg/probe.h"
 #include "user/cpu_loop.h"
 #include "qemu/main-loop.h"
 #include "user/page-protection.h"
semihosting/uaccess.c +1 -0
index 81ffecaaba4..ebbb300f86a 100644
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "accel/tcg/cpu-mmu-index.h"
+#include "accel/tcg/probe.h"
 #include "exec/exec-all.h"
 #include "exec/target_page.h"
 #include "exec/tlb-flags.h"
target/arm/helper.c +1 -0
index c6fd2900126..2f039b2db33 100644
@@ -30,6 +30,7 @@
 #include "qapi/error.h"
 #include "qemu/guest-random.h"
 #ifdef CONFIG_TCG
+#include "accel/tcg/probe.h"
 #include "semihosting/common-semi.h"
 #endif
 #include "cpregs.h"
target/arm/ptw.c +1 -0
index e0e82ae507f..87d707b5923 100644
@@ -14,6 +14,7 @@
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
 #include "exec/tlb-flags.h"
+#include "accel/tcg/probe.h"
 #include "cpu.h"
 #include "internals.h"
 #include "cpu-features.h"
target/arm/tcg/helper-a64.c +1 -0
index 08d8f63ffea..ac86629432a 100644
@@ -31,6 +31,7 @@
 #include "exec/cpu-common.h"
 #include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
+#include "accel/tcg/probe.h"
 #include "exec/target_page.h"
 #include "exec/tlb-flags.h"
 #include "qemu/int128.h"
target/arm/tcg/mte_helper.c +1 -0
index 7dc5fb776b3..8fbdcc8fb95 100644
@@ -30,6 +30,7 @@
 #include "system/ram_addr.h"
 #endif
 #include "accel/tcg/cpu-ldst.h"
+#include "accel/tcg/probe.h"
 #include "exec/helper-proto.h"
 #include "exec/tlb-flags.h"
 #include "accel/tcg/cpu-ops.h"
target/arm/tcg/op_helper.c +1 -0
index 38d49cbb9d8..d50b8720ad6 100644
@@ -25,6 +25,7 @@
 #include "cpu-features.h"
 #include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
+#include "accel/tcg/probe.h"
 #include "cpregs.h"
 
 #define SIGNBIT (uint32_t)0x80000000
target/arm/tcg/sve_helper.c +1 -0
index 87b6b4b3e64..50aca54eaa3 100644
@@ -32,6 +32,7 @@
 #include "sve_ldst_internal.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "accel/tcg/cpu-ops.h"
+#include "accel/tcg/probe.h"
 #ifdef CONFIG_USER_ONLY
 #include "user/page-protection.h"
 #endif
target/hexagon/op_helper.c +1 -0
index 3f3d86db2b2..dd726b43187 100644
@@ -19,6 +19,7 @@
 #include "qemu/log.h"
 #include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
+#include "accel/tcg/probe.h"
 #include "exec/helper-proto.h"
 #include "fpu/softfloat.h"
 #include "cpu.h"
target/hppa/mem_helper.c +1 -0
index 554d7bf4d14..a5f73aedf82 100644
@@ -23,6 +23,7 @@
 #include "exec/exec-all.h"
 #include "exec/cputlb.h"
 #include "accel/tcg/cpu-mmu-index.h"
+#include "accel/tcg/probe.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
 #include "exec/helper-proto.h"
target/hppa/op_helper.c +1 -0
index 2398ce2c648..32207c1a4c8 100644
@@ -23,6 +23,7 @@
 #include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "accel/tcg/cpu-ldst.h"
+#include "accel/tcg/probe.h"
 #include "qemu/timer.h"
 #include "trace.h"
 #ifdef CONFIG_USER_ONLY
target/i386/tcg/access.c +1 -0
index 0fdd587eddf..ee5b4514597 100644
@@ -4,6 +4,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "accel/tcg/cpu-ldst.h"
+#include "accel/tcg/probe.h"
 #include "exec/exec-all.h"
 #include "exec/target_page.h"
 #include "access.h"
target/i386/tcg/seg_helper.c +1 -0
index 3af902e0ec5..e45d71fa1ad 100644
@@ -24,6 +24,7 @@
 #include "exec/helper-proto.h"
 #include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
+#include "accel/tcg/probe.h"
 #include "exec/log.h"
 #include "helper-tcg.h"
 #include "seg_helper.h"
target/i386/tcg/system/excp_helper.c +1 -0
index 93614aa3e54..c1626215877 100644
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "accel/tcg/cpu-ldst.h"
+#include "accel/tcg/probe.h"
 #include "exec/cputlb.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
target/mips/tcg/msa_helper.c +1 -0
index 14de4a71ff6..4d9a4468e53 100644
@@ -23,6 +23,7 @@
 #include "tcg/tcg.h"
 #include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
+#include "accel/tcg/probe.h"
 #include "exec/helper-proto.h"
 #include "exec/memop.h"
 #include "exec/target_page.h"
target/ppc/mem_helper.c +1 -0
index d7e8d678f4b..50f05a915ed 100644
@@ -25,6 +25,7 @@
 #include "exec/helper-proto.h"
 #include "helper_regs.h"
 #include "accel/tcg/cpu-ldst.h"
+#include "accel/tcg/probe.h"
 #include "internal.h"
 #include "qemu/atomic128.h"
 
target/riscv/op_helper.c +1 -0
index 5b0db2c45ab..abb1d284dce 100644
@@ -24,6 +24,7 @@
 #include "exec/exec-all.h"
 #include "exec/cputlb.h"
 #include "accel/tcg/cpu-ldst.h"
+#include "accel/tcg/probe.h"
 #include "exec/helper-proto.h"
 #include "exec/tlb-flags.h"
 #include "trace.h"
target/riscv/vector_helper.c +1 -0
index b8ae7044578..5ccb294e319 100644
@@ -23,6 +23,7 @@
 #include "exec/memop.h"
 #include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
+#include "accel/tcg/probe.h"
 #include "exec/page-protection.h"
 #include "exec/helper-proto.h"
 #include "exec/tlb-flags.h"
target/s390x/tcg/mem_helper.c +1 -0
index 0cdfd380ce4..9e77cde81bd 100644
@@ -29,6 +29,7 @@
 #include "exec/cputlb.h"
 #include "exec/page-protection.h"
 #include "accel/tcg/cpu-ldst.h"
+#include "accel/tcg/probe.h"
 #include "exec/target_page.h"
 #include "exec/tlb-flags.h"
 #include "accel/tcg/cpu-ops.h"
target/xtensa/mmu_helper.c +1 -0
index a7dd8100555..182c6e35c17 100644
@@ -34,6 +34,7 @@
 #include "qemu/host-utils.h"
 #include "exec/cputlb.h"
 #include "accel/tcg/cpu-mmu-index.h"
+#include "accel/tcg/probe.h"
 #include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
Signature · 1 line
2.47.1
#21 lore raw

PATCH v3 13/13 include: Remove 'exec/exec-all.h'

In reply to Philippe Mathieu-Daudé

"exec/exec-all.h" is now fully empty, let's remove it.

Mechanical change running:

  $ sed -i '/exec\/exec-all.h/d' $(git grep -wl exec/exec-all.h)
---
 MAINTAINERS                             |  1 -
 bsd-user/qemu.h                         |  1 -
 include/exec/exec-all.h                 | 23 -----------------------
 include/system/ram_addr.h               |  1 -
 linux-user/user-internals.h             |  1 -
 target/arm/tcg/translate.h              |  1 -
 target/i386/tcg/helper-tcg.h            |  1 -
 accel/hvf/hvf-accel-ops.c               |  1 -
 accel/tcg/cputlb.c                      |  1 -
 accel/tcg/translate-all.c               |  1 -
 accel/tcg/user-exec.c                   |  1 -
 bsd-user/main.c                         |  1 -
 hw/ppc/spapr_nested.c                   |  1 -
 hw/riscv/riscv-iommu-sys.c              |  1 -
 hw/sh4/sh7750.c                         |  1 -
 linux-user/main.c                       |  1 -
 semihosting/uaccess.c                   |  1 -
 system/physmem.c                        |  1 -
 target/alpha/cpu.c                      |  1 -
 target/alpha/fpu_helper.c               |  1 -
 target/alpha/int_helper.c               |  1 -
 target/alpha/mem_helper.c               |  1 -
 target/alpha/translate.c                |  1 -
 target/alpha/vax_helper.c               |  1 -
 target/arm/cpu.c                        |  1 -
 target/arm/debug_helper.c               |  1 -
 target/arm/helper.c                     |  1 -
 target/arm/ptw.c                        |  1 -
 target/arm/tcg/helper-a64.c             |  1 -
 target/arm/tcg/m_helper.c               |  1 -
 target/arm/tcg/mte_helper.c             |  1 -
 target/arm/tcg/mve_helper.c             |  1 -
 target/arm/tcg/op_helper.c              |  1 -
 target/arm/tcg/pauth_helper.c           |  1 -
 target/arm/tcg/sme_helper.c             |  1 -
 target/arm/tcg/sve_helper.c             |  1 -
 target/arm/tcg/tlb_helper.c             |  1 -
 target/arm/tcg/translate-a64.c          |  1 -
 target/avr/cpu.c                        |  1 -
 target/avr/translate.c                  |  1 -
 target/hexagon/cpu.c                    |  1 -
 target/hexagon/op_helper.c              |  1 -
 target/hppa/cpu.c                       |  1 -
 target/hppa/fpu_helper.c                |  1 -
 target/hppa/helper.c                    |  1 -
 target/hppa/mem_helper.c                |  1 -
 target/hppa/op_helper.c                 |  1 -
 target/hppa/sys_helper.c                |  1 -
 target/hppa/translate.c                 |  1 -
 target/i386/tcg/access.c                |  1 -
 target/i386/tcg/excp_helper.c           |  1 -
 target/i386/tcg/int_helper.c            |  1 -
 target/i386/tcg/mem_helper.c            |  1 -
 target/i386/tcg/mpx_helper.c            |  1 -
 target/i386/tcg/seg_helper.c            |  1 -
 target/i386/tcg/system/bpt_helper.c     |  1 -
 target/i386/tcg/translate.c             |  1 -
 target/i386/tcg/user/excp_helper.c      |  1 -
 target/i386/tcg/user/seg_helper.c       |  1 -
 target/loongarch/cpu.c                  |  1 -
 target/loongarch/tcg/fpu_helper.c       |  1 -
 target/loongarch/tcg/iocsr_helper.c     |  1 -
 target/loongarch/tcg/op_helper.c        |  1 -
 target/loongarch/tcg/tlb_helper.c       |  1 -
 target/loongarch/tcg/vec_helper.c       |  1 -
 target/m68k/fpu_helper.c                |  1 -
 target/m68k/helper.c                    |  1 -
 target/m68k/op_helper.c                 |  1 -
 target/m68k/translate.c                 |  1 -
 target/microblaze/cpu.c                 |  1 -
 target/microblaze/op_helper.c           |  1 -
 target/microblaze/translate.c           |  1 -
 target/mips/cpu.c                       |  1 -
 target/mips/system/physaddr.c           |  1 -
 target/mips/tcg/exception.c             |  1 -
 target/mips/tcg/fpu_helper.c            |  1 -
 target/mips/tcg/ldst_helper.c           |  1 -
 target/mips/tcg/msa_helper.c            |  1 -
 target/mips/tcg/op_helper.c             |  1 -
 target/mips/tcg/system/special_helper.c |  1 -
 target/mips/tcg/system/tlb_helper.c     |  1 -
 target/openrisc/cpu.c                   |  1 -
 target/openrisc/exception.c             |  1 -
 target/openrisc/exception_helper.c      |  1 -
 target/openrisc/fpu_helper.c            |  1 -
 target/openrisc/interrupt.c             |  1 -
 target/openrisc/interrupt_helper.c      |  1 -
 target/openrisc/sys_helper.c            |  1 -
 target/openrisc/translate.c             |  1 -
 target/ppc/excp_helper.c                |  1 -
 target/ppc/fpu_helper.c                 |  1 -
 target/ppc/machine.c                    |  1 -
 target/ppc/mem_helper.c                 |  1 -
 target/ppc/misc_helper.c                |  1 -
 target/ppc/mmu-hash32.c                 |  1 -
 target/ppc/mmu-hash64.c                 |  1 -
 target/ppc/mmu-radix64.c                |  1 -
 target/ppc/mmu_common.c                 |  1 -
 target/ppc/mmu_helper.c                 |  1 -
 target/ppc/power8-pmu.c                 |  1 -
 target/ppc/tcg-excp_helper.c            |  1 -
 target/ppc/timebase_helper.c            |  1 -
 target/ppc/translate.c                  |  1 -
 target/ppc/user_only_helper.c           |  1 -
 target/riscv/cpu.c                      |  1 -
 target/riscv/cpu_helper.c               |  1 -
 target/riscv/crypto_helper.c            |  1 -
 target/riscv/csr.c                      |  1 -
 target/riscv/debug.c                    |  1 -
 target/riscv/fpu_helper.c               |  1 -
 target/riscv/m128_helper.c              |  1 -
 target/riscv/op_helper.c                |  1 -
 target/riscv/tcg/tcg-cpu.c              |  1 -
 target/riscv/translate.c                |  1 -
 target/riscv/vcrypto_helper.c           |  1 -
 target/riscv/vector_helper.c            |  1 -
 target/riscv/zce_helper.c               |  1 -
 target/rx/op_helper.c                   |  1 -
 target/rx/translate.c                   |  1 -
 target/s390x/interrupt.c                |  1 -
 target/s390x/mmu_helper.c               |  1 -
 target/s390x/sigp.c                     |  1 -
 target/s390x/tcg/cc_helper.c            |  1 -
 target/s390x/tcg/crypto_helper.c        |  1 -
 target/s390x/tcg/excp_helper.c          |  1 -
 target/s390x/tcg/fpu_helper.c           |  1 -
 target/s390x/tcg/int_helper.c           |  1 -
 target/s390x/tcg/mem_helper.c           |  1 -
 target/s390x/tcg/misc_helper.c          |  1 -
 target/s390x/tcg/translate.c            |  1 -
 target/s390x/tcg/vec_fpu_helper.c       |  1 -
 target/s390x/tcg/vec_helper.c           |  1 -
 target/sh4/cpu.c                        |  1 -
 target/sh4/helper.c                     |  1 -
 target/sh4/op_helper.c                  |  1 -
 target/sh4/translate.c                  |  1 -
 target/sparc/cpu.c                      |  1 -
 target/sparc/fop_helper.c               |  1 -
 target/sparc/helper.c                   |  1 -
 target/sparc/ldst_helper.c              |  1 -
 target/sparc/machine.c                  |  1 -
 target/sparc/translate.c                |  1 -
 target/sparc/win_helper.c               |  1 -
 target/tricore/cpu.c                    |  1 -
 target/tricore/op_helper.c              |  1 -
 target/tricore/translate.c              |  1 -
 target/xtensa/dbg_helper.c              |  1 -
 target/xtensa/exc_helper.c              |  1 -
 target/xtensa/fpu_helper.c              |  1 -
 target/xtensa/mmu_helper.c              |  1 -
 target/xtensa/op_helper.c               |  1 -
 target/xtensa/translate.c               |  1 -
 target/xtensa/win_helper.c              |  1 -
 153 files changed, 175 deletions(-)
 delete mode 100644 include/exec/exec-all.h
MAINTAINERS +0 -1
index 3a37cc73af7..9e677a26c52 100644
@@ -493,7 +493,6 @@ M: Richard Henderson <[email protected]>
 R: Paolo Bonzini <[email protected]>
 S: Maintained
 F: include/exec/cpu*.h
-F: include/exec/exec-all.h
 F: include/exec/target_long.h
 F: include/qemu/accel.h
 F: include/system/accel-*.h
bsd-user/qemu.h +0 -1
index 244670dd24d..93388e7c34e 100644
@@ -23,7 +23,6 @@
 #include "cpu.h"
 #include "qemu/units.h"
 #include "accel/tcg/cpu-ldst.h"
-#include "exec/exec-all.h"
 
 #include "user/abitypes.h"
 #include "user/cpu_loop.h"
include/exec/exec-all.h deleted +0 -23
deleted file mode 100644
index 9ef7569a0b8..00000000000
@@ -1,23 +0,0 @@
-/*
- * internal execution defines for qemu
- *
- *  Copyright (c) 2003 Fabrice Bellard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef EXEC_ALL_H
-#define EXEC_ALL_H
-
-#endif
include/system/ram_addr.h +0 -1
index b4e4425acbb..15a1b1a4fa2 100644
@@ -24,7 +24,6 @@
 #include "exec/cputlb.h"
 #include "exec/ramlist.h"
 #include "system/ramblock.h"
-#include "exec/exec-all.h"
 #include "system/memory.h"
 #include "exec/target_page.h"
 #include "qemu/rcu.h"
linux-user/user-internals.h +0 -1
index 4aa253b5663..691b9a1775f 100644
@@ -19,7 +19,6 @@
 #define LINUX_USER_USER_INTERNALS_H
 
 #include "user/thunk.h"
-#include "exec/exec-all.h"
 #include "qemu/log.h"
 
 extern char *exec_path;
target/arm/tcg/translate.h +0 -1
index 53e485d28ac..1bfdb0fb9bb 100644
@@ -4,7 +4,6 @@
 #include "cpu.h"
 #include "tcg/tcg-op.h"
 #include "tcg/tcg-op-gvec.h"
-#include "exec/exec-all.h"
 #include "exec/translator.h"
 #include "exec/translation-block.h"
 #include "exec/helper-gen.h"
target/i386/tcg/helper-tcg.h +0 -1
index 54d845379cd..6b3f19855f1 100644
@@ -20,7 +20,6 @@
 #ifndef I386_HELPER_TCG_H
 #define I386_HELPER_TCG_H
 
-#include "exec/exec-all.h"
 #include "qemu/host-utils.h"
 
 /* Maximum instruction code size */
accel/hvf/hvf-accel-ops.c +0 -1
index 601c3bc0ac6..bbd774dbc94 100644
@@ -51,7 +51,6 @@
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "system/address-spaces.h"
-#include "exec/exec-all.h"
 #include "gdbstub/enums.h"
 #include "hw/boards.h"
 #include "system/accel-ops.h"
accel/tcg/cputlb.c +0 -1
index b346af942a0..5b6d6f79751 100644
@@ -22,7 +22,6 @@
 #include "accel/tcg/cpu-ops.h"
 #include "accel/tcg/iommu.h"
 #include "accel/tcg/probe.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "system/memory.h"
 #include "accel/tcg/cpu-ldst.h"
accel/tcg/translate-all.c +0 -1
index 0408e2522a8..31c7f9927f2 100644
@@ -21,7 +21,6 @@
 
 #include "trace.h"
 #include "disas/disas.h"
-#include "exec/exec-all.h"
 #include "tcg/tcg.h"
 #if defined(CONFIG_USER_ONLY)
 #include "qemu.h"
accel/tcg/user-exec.c +0 -1
index 697fdf18241..70feee8df99 100644
@@ -21,7 +21,6 @@
 #include "disas/disas.h"
 #include "cpu.h"
 #include "exec/vaddr.h"
-#include "exec/exec-all.h"
 #include "exec/tlb-flags.h"
 #include "tcg/tcg.h"
 #include "qemu/bitops.h"
bsd-user/main.c +0 -1
index fdb160bed0f..fa7645a56ea 100644
@@ -36,7 +36,6 @@
 #include "qemu/help_option.h"
 #include "qemu/module.h"
 #include "qemu/plugin.h"
-#include "exec/exec-all.h"
 #include "user/guest-base.h"
 #include "user/page-protection.h"
 #include "tcg/startup.h"
hw/ppc/spapr_nested.c +0 -1
index a79e398c132..9cc6083feee 100644
@@ -1,6 +1,5 @@
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
-#include "exec/exec-all.h"
 #include "exec/cputlb.h"
 #include "exec/target_long.h"
 #include "helper_regs.h"
hw/riscv/riscv-iommu-sys.c +0 -1
index 65b24fb07de..bbe839ed241 100644
@@ -26,7 +26,6 @@
 #include "qemu/host-utils.h"
 #include "qemu/module.h"
 #include "qom/object.h"
-#include "exec/exec-all.h"
 #include "trace.h"
 
 #include "riscv-iommu.h"
hw/sh4/sh7750.c +0 -1
index 41306fb6008..300eabc595d 100644
@@ -36,7 +36,6 @@
 #include "sh7750_regnames.h"
 #include "hw/sh4/sh_intc.h"
 #include "hw/timer/tmu012.h"
-#include "exec/exec-all.h"
 #include "exec/cputlb.h"
 #include "trace.h"
 
linux-user/main.c +0 -1
index e2ec5970bed..4af7f49f383 100644
@@ -40,7 +40,6 @@
 #include "qemu/plugin.h"
 #include "user/guest-base.h"
 #include "user/page-protection.h"
-#include "exec/exec-all.h"
 #include "exec/gdbstub.h"
 #include "gdbstub/user.h"
 #include "tcg/startup.h"
semihosting/uaccess.c +0 -1
index ebbb300f86a..4554844e15b 100644
@@ -10,7 +10,6 @@
 #include "qemu/osdep.h"
 #include "accel/tcg/cpu-mmu-index.h"
 #include "accel/tcg/probe.h"
-#include "exec/exec-all.h"
 #include "exec/target_page.h"
 #include "exec/tlb-flags.h"
 #include "semihosting/uaccess.h"
system/physmem.c +0 -1
index f1ec0902c78..3f4fd69d9a5 100644
@@ -32,7 +32,6 @@
 #include "accel/tcg/iommu.h"
 #endif /* CONFIG_TCG */
 
-#include "exec/exec-all.h"
 #include "exec/cputlb.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
target/alpha/cpu.c +0 -1
index 35fb145d27f..cb3f382dc64 100644
@@ -23,7 +23,6 @@
 #include "qapi/error.h"
 #include "qemu/qemu-print.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/translation-block.h"
 #include "exec/target_page.h"
 #include "fpu/softfloat.h"
target/alpha/fpu_helper.c +0 -1
index 6aefb9b851a..30f3c7fd185 100644
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "fpu/softfloat.h"
 
target/alpha/int_helper.c +0 -1
index 5672696f6f1..6bfe63500e0 100644
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
 
target/alpha/mem_helper.c +0 -1
index a4d5adb40c6..2113fe33ae2 100644
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 
 static void do_unaligned_access(CPUAlphaState *env, vaddr addr, uintptr_t retaddr)
target/alpha/translate.c +0 -1
index 7f3195a5dcc..cebab0318cf 100644
@@ -21,7 +21,6 @@
 #include "cpu.h"
 #include "system/cpus.h"
 #include "qemu/host-utils.h"
-#include "exec/exec-all.h"
 #include "tcg/tcg-op.h"
 #include "exec/helper-proto.h"
 #include "exec/helper-gen.h"
target/alpha/vax_helper.c +0 -1
index f94fb519dbd..c1d201e7b4d 100644
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "fpu/softfloat.h"
 
target/arm/cpu.c +0 -1
index 377791c84dd..e149a462505 100644
@@ -33,7 +33,6 @@
 #endif /* CONFIG_TCG */
 #include "internals.h"
 #include "cpu-features.h"
-#include "exec/exec-all.h"
 #include "exec/target_page.h"
 #include "hw/qdev-properties.h"
 #if !defined(CONFIG_USER_ONLY)
target/arm/debug_helper.c +0 -1
index 473ee2af38e..de7999f6a94 100644
@@ -11,7 +11,6 @@
 #include "internals.h"
 #include "cpu-features.h"
 #include "cpregs.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "exec/watchpoint.h"
 #include "system/tcg.h"
target/arm/helper.c +0 -1
index 2f039b2db33..8de4eb2c1fa 100644
@@ -20,7 +20,6 @@
 #include "qemu/bitops.h"
 #include "qemu/qemu-print.h"
 #include "exec/cputlb.h"
-#include "exec/exec-all.h"
 #include "exec/translation-block.h"
 #include "hw/irq.h"
 #include "system/cpu-timers.h"
target/arm/ptw.c +0 -1
index 87d707b5923..1040a189627 100644
@@ -10,7 +10,6 @@
 #include "qemu/log.h"
 #include "qemu/range.h"
 #include "qemu/main-loop.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
 #include "exec/tlb-flags.h"
target/arm/tcg/helper-a64.c +0 -1
index ac86629432a..590717ecd8c 100644
@@ -29,7 +29,6 @@
 #include "internals.h"
 #include "qemu/crc32c.h"
 #include "exec/cpu-common.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "accel/tcg/probe.h"
 #include "exec/target_page.h"
target/arm/tcg/m_helper.c +0 -1
index 37dc98dc35c..6614719832e 100644
@@ -15,7 +15,6 @@
 #include "qemu/main-loop.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #ifdef CONFIG_TCG
 #include "accel/tcg/cpu-ldst.h"
target/arm/tcg/mte_helper.c +0 -1
index 8fbdcc8fb95..13d7ac00972 100644
@@ -21,7 +21,6 @@
 #include "qemu/log.h"
 #include "cpu.h"
 #include "internals.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #ifdef CONFIG_USER_ONLY
 #include "user/cpu_loop.h"
target/arm/tcg/mve_helper.c +0 -1
index f9f67d1f88e..506d1c34757 100644
@@ -23,7 +23,6 @@
 #include "vec_internal.h"
 #include "exec/helper-proto.h"
 #include "accel/tcg/cpu-ldst.h"
-#include "exec/exec-all.h"
 #include "tcg/tcg.h"
 #include "fpu/softfloat.h"
 #include "crypto/clmul.h"
target/arm/tcg/op_helper.c +0 -1
index d50b8720ad6..dc3f83c37dc 100644
@@ -23,7 +23,6 @@
 #include "exec/target_page.h"
 #include "internals.h"
 #include "cpu-features.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "accel/tcg/probe.h"
 #include "cpregs.h"
target/arm/tcg/pauth_helper.c +0 -1
index 59bf27541dc..c591c3052c3 100644
@@ -21,7 +21,6 @@
 #include "cpu.h"
 #include "internals.h"
 #include "cpu-features.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "exec/helper-proto.h"
 #include "tcg/tcg-gvec-desc.h"
target/arm/tcg/sme_helper.c +0 -1
index 96b84c37a2d..3226895cae3 100644
@@ -23,7 +23,6 @@
 #include "tcg/tcg-gvec-desc.h"
 #include "exec/helper-proto.h"
 #include "accel/tcg/cpu-ldst.h"
-#include "exec/exec-all.h"
 #include "qemu/int128.h"
 #include "fpu/softfloat.h"
 #include "vec_internal.h"
target/arm/tcg/sve_helper.c +0 -1
index 50aca54eaa3..9f20ecb51d3 100644
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "internals.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "exec/helper-proto.h"
 #include "exec/target_page.h"
target/arm/tcg/tlb_helper.c +0 -1
index 8841f039bc6..5ea4d6590f2 100644
@@ -9,7 +9,6 @@
 #include "cpu.h"
 #include "internals.h"
 #include "cpu-features.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 
 
target/arm/tcg/translate-a64.c +0 -1
index 43408c71bbd..11053f083a0 100644
@@ -17,7 +17,6 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "qemu/osdep.h"
-#include "exec/exec-all.h"
 #include "exec/target_page.h"
 #include "translate.h"
 #include "translate-a64.h"
target/avr/cpu.c +0 -1
index 84f3b839c9b..86e53ef9f65 100644
@@ -21,7 +21,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/qemu-print.h"
-#include "exec/exec-all.h"
 #include "exec/translation-block.h"
 #include "system/address-spaces.h"
 #include "cpu.h"
target/avr/translate.c +0 -1
index b9c592c899a..804b0b21dbd 100644
@@ -22,7 +22,6 @@
 #include "qemu/qemu-print.h"
 #include "tcg/tcg.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/translation-block.h"
 #include "tcg/tcg-op.h"
 #include "exec/helper-proto.h"
target/hexagon/cpu.c +0 -1
index 3c5191282ea..9f93c170092 100644
@@ -19,7 +19,6 @@
 #include "qemu/qemu-print.h"
 #include "cpu.h"
 #include "internal.h"
-#include "exec/exec-all.h"
 #include "exec/translation-block.h"
 #include "qapi/error.h"
 #include "hw/qdev-properties.h"
target/hexagon/op_helper.c +0 -1
index dd726b43187..444799d3ade 100644
@@ -17,7 +17,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "accel/tcg/probe.h"
 #include "exec/helper-proto.h"
target/hppa/cpu.c +0 -1
index 10e18c945ef..6acbf3de27a 100644
@@ -24,7 +24,6 @@
 #include "qemu/timer.h"
 #include "cpu.h"
 #include "qemu/module.h"
-#include "exec/exec-all.h"
 #include "exec/translation-block.h"
 #include "exec/target_page.h"
 #include "fpu/softfloat.h"
target/hppa/fpu_helper.c +0 -1
index a62d9d30831..ddd0a343d63 100644
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "fpu/softfloat.h"
 
target/hppa/helper.c +0 -1
index ac7f58f0afe..d7f8495d982 100644
@@ -21,7 +21,6 @@
 #include "qemu/log.h"
 #include "cpu.h"
 #include "fpu/softfloat.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "qemu/qemu-print.h"
 #include "hw/hppa/hppa_hardware.h"
target/hppa/mem_helper.c +0 -1
index a5f73aedf82..9bdd0a6f23d 100644
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/cputlb.h"
 #include "accel/tcg/cpu-mmu-index.h"
 #include "accel/tcg/probe.h"
target/hppa/op_helper.c +0 -1
index 32207c1a4c8..0458378abb2 100644
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "accel/tcg/probe.h"
target/hppa/sys_helper.c +0 -1
index 052a6a88a27..6e65fadcc7b 100644
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "qemu/timer.h"
 #include "system/runstate.h"
target/hppa/translate.c +0 -1
index 14f38333222..156c3dedd18 100644
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "qemu/host-utils.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "tcg/tcg-op.h"
 #include "tcg/tcg-op-gvec.h"
target/i386/tcg/access.c +0 -1
index ee5b4514597..97e3f0e7568 100644
@@ -5,7 +5,6 @@
 #include "cpu.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "accel/tcg/probe.h"
-#include "exec/exec-all.h"
 #include "exec/target_page.h"
 #include "access.h"
 
target/i386/tcg/excp_helper.c +0 -1
index de71e68f986..6fb8036d988 100644
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "qemu/log.h"
 #include "system/runstate.h"
 #include "exec/helper-proto.h"
target/i386/tcg/int_helper.c +0 -1
index 1a02e9d8434..46741d9f68a 100644
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
 #include "qapi/error.h"
target/i386/tcg/mem_helper.c +0 -1
index 84a08152171..9e7c2d80293 100644
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "qemu/int128.h"
 #include "qemu/atomic128.h"
target/i386/tcg/mpx_helper.c +0 -1
index a0f816dfae0..fa8abcc4820 100644
@@ -21,7 +21,6 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "accel/tcg/cpu-ldst.h"
-#include "exec/exec-all.h"
 #include "exec/target_page.h"
 #include "helper-tcg.h"
 
target/i386/tcg/seg_helper.c +0 -1
index e45d71fa1ad..0ca081b286d 100644
@@ -22,7 +22,6 @@
 #include "cpu.h"
 #include "qemu/log.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "accel/tcg/probe.h"
 #include "exec/log.h"
target/i386/tcg/system/bpt_helper.c +0 -1
index 08ccd3f5e69..aebb5caac37 100644
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "exec/watchpoint.h"
 #include "tcg/helper-tcg.h"
target/i386/tcg/translate.c +0 -1
index 1dcc35f5dfa..6eaa0457314 100644
@@ -21,7 +21,6 @@
 #include "qemu/host-utils.h"
 #include "cpu.h"
 #include "accel/tcg/cpu-mmu-index.h"
-#include "exec/exec-all.h"
 #include "exec/translation-block.h"
 #include "tcg/tcg-op.h"
 #include "tcg/tcg-op-gvec.h"
target/i386/tcg/user/excp_helper.c +0 -1
index b3bdb7831a7..98fab4cbc3f 100644
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "tcg/helper-tcg.h"
 
 void x86_cpu_record_sigsegv(CPUState *cs, vaddr addr,
target/i386/tcg/user/seg_helper.c +0 -1
index 5692dd51953..263f59937fe 100644
@@ -21,7 +21,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "tcg/helper-tcg.h"
 #include "tcg/seg_helper.h"
target/loongarch/cpu.c +0 -1
index fe9462b3b7e..b6f89f0f392 100644
@@ -15,7 +15,6 @@
 #include "system/kvm.h"
 #include "kvm/kvm_loongarch.h"
 #include "hw/qdev-properties.h"
-#include "exec/exec-all.h"
 #include "exec/translation-block.h"
 #include "cpu.h"
 #include "internals.h"
target/loongarch/tcg/fpu_helper.c +0 -1
index fc3fd0561e3..fc9c64c20a8 100644
@@ -8,7 +8,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "fpu/softfloat.h"
 #include "internals.h"
target/loongarch/tcg/iocsr_helper.c +0 -1
index e62170de3ce..c155f48564d 100644
@@ -9,7 +9,6 @@
 #include "cpu.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 
 #define GET_MEMTXATTRS(cas) \
target/loongarch/tcg/op_helper.c +0 -1
index 94e3b28016a..16ac0d43bc9 100644
@@ -10,7 +10,6 @@
 #include "cpu.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "internals.h"
 #include "qemu/crc32c.h"
target/loongarch/tcg/tlb_helper.c +0 -1
index 9a76a2a205f..1d5ba567b97 100644
@@ -13,7 +13,6 @@
 #include "internals.h"
 #include "exec/helper-proto.h"
 #include "exec/cputlb.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
 #include "accel/tcg/cpu-ldst.h"
target/loongarch/tcg/vec_helper.c +0 -1
index 3faf52cbc46..a270998e638 100644
@@ -7,7 +7,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "fpu/softfloat.h"
 #include "internals.h"
target/m68k/fpu_helper.c +0 -1
index ac4a0d85be5..56012863c85 100644
@@ -21,7 +21,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "softfloat.h"
 
target/m68k/helper.c +0 -1
index f73e0def234..5479acc5b99 100644
@@ -21,7 +21,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/cputlb.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
 #include "exec/gdbstub.h"
target/m68k/op_helper.c +0 -1
index 242aecccbbc..f29ae12af84 100644
@@ -20,7 +20,6 @@
 #include "qemu/log.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "semihosting/semihost.h"
 
target/m68k/translate.c +0 -1
index b1266a7875b..97afceb1297 100644
@@ -20,7 +20,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/translation-block.h"
 #include "exec/target_page.h"
 #include "tcg/tcg-op.h"
target/microblaze/cpu.c +0 -1
index edfb05758b3..658d3cb3d7b 100644
@@ -27,7 +27,6 @@
 #include "cpu.h"
 #include "qemu/module.h"
 #include "hw/qdev-properties.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "exec/gdbstub.h"
 #include "exec/translation-block.h"
target/microblaze/op_helper.c +0 -1
index 4624ce5b672..9e838dfa153 100644
@@ -23,7 +23,6 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "fpu/softfloat.h"
 
target/microblaze/translate.c +0 -1
index 7dcad6cf0d7..ad4a85407d0 100644
@@ -20,7 +20,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "tcg/tcg-op.h"
 #include "exec/helper-proto.h"
target/mips/cpu.c +0 -1
index 473cecdebca..26f4f038cde 100644
@@ -29,7 +29,6 @@
 #include "qemu/module.h"
 #include "system/kvm.h"
 #include "system/qtest.h"
-#include "exec/exec-all.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-clock.h"
 #include "fpu_helper.h"
target/mips/system/physaddr.c +0 -1
index 505781d84c1..b8e1a5ac98e 100644
@@ -18,7 +18,6 @@
  */
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "../internal.h"
 
target/mips/tcg/exception.c +0 -1
index 1a8902ea1bc..d32bcebf469 100644
@@ -23,7 +23,6 @@
 #include "cpu.h"
 #include "internal.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "exec/translation-block.h"
 
 target_ulong exception_resume_pc(CPUMIPSState *env)
target/mips/tcg/fpu_helper.c +0 -1
index 45d593de489..36af9808025 100644
@@ -24,7 +24,6 @@
 #include "cpu.h"
 #include "internal.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "fpu/softfloat.h"
 #include "fpu_helper.h"
 
target/mips/tcg/ldst_helper.c +0 -1
index 2fb879fcbcc..10319bf03a6 100644
@@ -23,7 +23,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "exec/memop.h"
 #include "internal.h"
target/mips/tcg/msa_helper.c +0 -1
index 4d9a4468e53..fe4cd1c7b5f 100644
@@ -21,7 +21,6 @@
 #include "cpu.h"
 #include "internal.h"
 #include "tcg/tcg.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "accel/tcg/probe.h"
 #include "exec/helper-proto.h"
target/mips/tcg/op_helper.c +0 -1
index 65403f1a87b..b906d10204b 100644
@@ -22,7 +22,6 @@
 #include "cpu.h"
 #include "internal.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "exec/memop.h"
 #include "fpu_helper.h"
 
target/mips/tcg/system/special_helper.c +0 -1
index 3ce3ae1e124..b54cbe88a38 100644
@@ -22,7 +22,6 @@
 #include "qemu/log.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "exec/translation-block.h"
 #include "internal.h"
 
target/mips/tcg/system/tlb_helper.c +0 -1
index e477ef812ae..eccaf3624cb 100644
@@ -22,7 +22,6 @@
 #include "cpu.h"
 #include "internal.h"
 #include "exec/cputlb.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
 #include "accel/tcg/cpu-ldst.h"
target/openrisc/cpu.c +0 -1
index 6601e0c0666..d3c366dd86a 100644
@@ -21,7 +21,6 @@
 #include "qapi/error.h"
 #include "qemu/qemu-print.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/translation-block.h"
 #include "fpu/softfloat-helpers.h"
 #include "tcg/tcg.h"
target/openrisc/exception.c +0 -1
index 8699c3dcea4..e213be36b6b 100644
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exception.h"
 
 G_NORETURN void raise_exception(OpenRISCCPU *cpu, uint32_t excp)
target/openrisc/exception_helper.c +0 -1
index 1f5be4bed90..c2c9d136528 100644
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "exception.h"
 
target/openrisc/fpu_helper.c +0 -1
index 8b81d2f62f7..dba997255c6 100644
@@ -20,7 +20,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "fpu/softfloat.h"
 
target/openrisc/interrupt.c +0 -1
index b3b5b405779..486823094c8 100644
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "gdbstub/helpers.h"
 #include "qemu/host-utils.h"
 #ifndef CONFIG_USER_ONLY
target/openrisc/interrupt_helper.c +0 -1
index ab4ea88b692..1553ebc71b0 100644
@@ -20,7 +20,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 
 void HELPER(rfe)(CPUOpenRISCState *env)
target/openrisc/sys_helper.c +0 -1
index 92badf017f7..951f8e247a7 100644
@@ -20,7 +20,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/cputlb.h"
 #include "exec/target_page.h"
 #include "exec/helper-proto.h"
target/openrisc/translate.c +0 -1
index d4ce60188bd..3b6843768b0 100644
@@ -21,7 +21,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "accel/tcg/cpu-mmu-index.h"
-#include "exec/exec-all.h"
 #include "tcg/tcg-op.h"
 #include "qemu/log.h"
 #include "qemu/bitops.h"
target/ppc/excp_helper.c +0 -1
index da8b525a41b..1efdc4066eb 100644
@@ -24,7 +24,6 @@
 #include "system/system.h"
 #include "system/runstate.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "internal.h"
 #include "helper_regs.h"
 #include "hw/ppc/ppc.h"
target/ppc/fpu_helper.c +0 -1
index d93cfed17b4..07b782f971b 100644
@@ -19,7 +19,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "internal.h"
 #include "fpu/softfloat.h"
 
target/ppc/machine.c +0 -1
index 98df5b4a3a2..d72e5ecb94b 100644
@@ -1,6 +1,5 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "system/kvm.h"
 #include "system/tcg.h"
 #include "helper_regs.h"
target/ppc/mem_helper.c +0 -1
index 50f05a915ed..aa1af44d22a 100644
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/target_page.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
target/ppc/misc_helper.c +0 -1
index 46ae454afd3..e7d94625185 100644
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/cputlb.h"
 #include "exec/helper-proto.h"
 #include "qemu/error-report.h"
target/ppc/mmu-hash32.c +0 -1
index 5bd3efe70e8..8b980a5aa90 100644
@@ -20,7 +20,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
 #include "system/kvm.h"
target/ppc/mmu-hash64.c +0 -1
index 3ba4810497e..dd337558aa6 100644
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "qemu/error-report.h"
 #include "qemu/qemu-print.h"
target/ppc/mmu-radix64.c +0 -1
index 4ab5f3bb920..33ac3412901 100644
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "qemu/error-report.h"
 #include "system/kvm.h"
target/ppc/mmu_common.c +0 -1
index 394a0c9bb60..52d48615ac2 100644
@@ -24,7 +24,6 @@
 #include "kvm_ppc.h"
 #include "mmu-hash64.h"
 #include "mmu-hash32.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
 #include "exec/log.h"
target/ppc/mmu_helper.c +0 -1
index 2138666122b..ac607054027 100644
@@ -25,7 +25,6 @@
 #include "mmu-hash64.h"
 #include "mmu-hash32.h"
 #include "exec/cputlb.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
 #include "exec/log.h"
target/ppc/power8-pmu.c +0 -1
index db9ee8e96b0..2a7a5b493af 100644
@@ -13,7 +13,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "helper_regs.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
target/ppc/tcg-excp_helper.c +0 -1
index 2b15e5f2f07..f835be51563 100644
@@ -21,7 +21,6 @@
 #include "qemu/log.h"
 #include "target/ppc/cpu.h"
 #include "accel/tcg/cpu-ldst.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "system/runstate.h"
 
target/ppc/timebase_helper.c +0 -1
index 73120323b4e..7209b418fb6 100644
@@ -20,7 +20,6 @@
 #include "cpu.h"
 #include "hw/ppc/ppc.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "qemu/log.h"
 #include "qemu/main-loop.h"
 
target/ppc/translate.c +0 -1
index 399107d319a..f2cd3308f80 100644
@@ -21,7 +21,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "internal.h"
-#include "exec/exec-all.h"
 #include "exec/target_page.h"
 #include "tcg/tcg-op.h"
 #include "tcg/tcg-op-gvec.h"
target/ppc/user_only_helper.c +0 -1
index a4d07a0d0dd..ae210eb8474 100644
@@ -20,7 +20,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "internal.h"
 
 void ppc_cpu_record_sigsegv(CPUState *cs, vaddr address,
target/riscv/cpu.c +0 -1
index 2b830b33178..1b2a42141f0 100644
@@ -24,7 +24,6 @@
 #include "cpu.h"
 #include "cpu_vendorid.h"
 #include "internals.h"
-#include "exec/exec-all.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "qemu/error-report.h"
target/riscv/cpu_helper.c +0 -1
index 619c76cc001..f2e90a9889f 100644
@@ -24,7 +24,6 @@
 #include "internals.h"
 #include "pmu.h"
 #include "exec/cputlb.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
 #include "system/memory.h"
target/riscv/crypto_helper.c +0 -1
index bb084e00efe..a0fb54bc50c 100644
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "crypto/aes.h"
 #include "crypto/aes-round.h"
target/riscv/csr.c +0 -1
index 13086438552..a32e1455c91 100644
@@ -24,7 +24,6 @@
 #include "tcg/tcg-cpu.h"
 #include "pmu.h"
 #include "time_helper.h"
-#include "exec/exec-all.h"
 #include "exec/cputlb.h"
 #include "exec/tb-flush.h"
 #include "exec/icount.h"
target/riscv/debug.c +0 -1
index 7fc9e121e11..94f06b25737 100644
@@ -28,7 +28,6 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "trace.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "exec/watchpoint.h"
 #include "system/cpu-timers.h"
target/riscv/fpu_helper.c +0 -1
index 91b1a56d10a..706bdfa61d5 100644
@@ -19,7 +19,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "qemu/host-utils.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "fpu/softfloat.h"
 #include "internals.h"
target/riscv/m128_helper.c +0 -1
index ec14aaa901a..7d9b83b1b2c 100644
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 
 target_ulong HELPER(divu_i128)(CPURISCVState *env,
target/riscv/op_helper.c +0 -1
index abb1d284dce..05316f2088c 100644
@@ -21,7 +21,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "internals.h"
-#include "exec/exec-all.h"
 #include "exec/cputlb.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "accel/tcg/probe.h"
target/riscv/tcg/tcg-cpu.c +0 -1
index 426145c3b9f..916fd6fb43a 100644
@@ -18,7 +18,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "exec/exec-all.h"
 #include "exec/translation-block.h"
 #include "tcg-cpu.h"
 #include "cpu.h"
target/riscv/translate.c +0 -1
index cef61b5b290..85128f997b7 100644
@@ -20,7 +20,6 @@
 #include "qemu/log.h"
 #include "cpu.h"
 #include "tcg/tcg-op.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "exec/helper-gen.h"
 #include "exec/target_page.h"
target/riscv/vcrypto_helper.c +0 -1
index 1526de96f53..9a0d9b4f536 100644
@@ -26,7 +26,6 @@
 #include "crypto/aes-round.h"
 #include "crypto/sm4.h"
 #include "exec/memop.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "internals.h"
 #include "vector_internals.h"
target/riscv/vector_helper.c +0 -1
index 5ccb294e319..8eea3e6df03 100644
@@ -21,7 +21,6 @@
 #include "qemu/bitops.h"
 #include "cpu.h"
 #include "exec/memop.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "accel/tcg/probe.h"
 #include "exec/page-protection.h"
target/riscv/zce_helper.c +0 -1
index 50d65f386c7..55221f5f375 100644
@@ -18,7 +18,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "accel/tcg/cpu-ldst.h"
 
target/rx/op_helper.c +0 -1
index a2f1f3824d9..2b190a4b2cf 100644
@@ -19,7 +19,6 @@
 #include "qemu/osdep.h"
 #include "qemu/bitops.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "fpu/softfloat.h"
target/rx/translate.c +0 -1
index bbda703be86..19a9584a829 100644
@@ -20,7 +20,6 @@
 #include "qemu/bswap.h"
 #include "qemu/qemu-print.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "tcg/tcg-op.h"
 #include "exec/helper-proto.h"
 #include "exec/helper-gen.h"
target/s390x/interrupt.c +0 -1
index 4ae6e2ddeaa..1dca835c5d8 100644
@@ -11,7 +11,6 @@
 #include "cpu.h"
 #include "kvm/kvm_s390x.h"
 #include "s390x-internal.h"
-#include "exec/exec-all.h"
 #include "system/kvm.h"
 #include "system/tcg.h"
 #include "hw/s390x/ioinst.h"
target/s390x/mmu_helper.c +0 -1
index 0e133cb9a53..00946e9c0fe 100644
@@ -23,7 +23,6 @@
 #include "kvm/kvm_s390x.h"
 #include "system/kvm.h"
 #include "system/tcg.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
 #include "hw/hw.h"
target/s390x/sigp.c +0 -1
index a3347f12362..5e95c4978f9 100644
@@ -16,7 +16,6 @@
 #include "system/runstate.h"
 #include "system/address-spaces.h"
 #include "exec/cputlb.h"
-#include "exec/exec-all.h"
 #include "system/tcg.h"
 #include "trace.h"
 #include "qapi/qapi-types-machine.h"
target/s390x/tcg/cc_helper.c +0 -1
index b36f8cdc8b9..6595ac763c3 100644
@@ -22,7 +22,6 @@
 #include "cpu.h"
 #include "s390x-internal.h"
 #include "tcg_s390x.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
 
target/s390x/tcg/crypto_helper.c +0 -1
index 642c1b18c4c..4447bb66eee 100644
@@ -17,7 +17,6 @@
 #include "s390x-internal.h"
 #include "tcg_s390x.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 
 static uint64_t R(uint64_t x, int c)
target/s390x/tcg/excp_helper.c +0 -1
index 6cd813e1abf..e4c75d0ce01 100644
@@ -23,7 +23,6 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "exec/cputlb.h"
-#include "exec/exec-all.h"
 #include "exec/target_page.h"
 #include "exec/watchpoint.h"
 #include "s390x-internal.h"
target/s390x/tcg/fpu_helper.c +0 -1
index 5041c139627..1ba43715ac1 100644
@@ -22,7 +22,6 @@
 #include "cpu.h"
 #include "s390x-internal.h"
 #include "tcg_s390x.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "fpu/softfloat.h"
 
target/s390x/tcg/int_helper.c +0 -1
index 253c0364157..fbda396f5b4 100644
@@ -22,7 +22,6 @@
 #include "cpu.h"
 #include "s390x-internal.h"
 #include "tcg_s390x.h"
-#include "exec/exec-all.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
 #include "accel/tcg/cpu-ldst.h"
target/s390x/tcg/mem_helper.c +0 -1
index 9e77cde81bd..857005b1202 100644
@@ -25,7 +25,6 @@
 #include "tcg_s390x.h"
 #include "exec/helper-proto.h"
 #include "exec/cpu-common.h"
-#include "exec/exec-all.h"
 #include "exec/cputlb.h"
 #include "exec/page-protection.h"
 #include "accel/tcg/cpu-ldst.h"
target/s390x/tcg/misc_helper.c +0 -1
index d5088493ead..f7101be5745 100644
@@ -26,7 +26,6 @@
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
 #include "qemu/timer.h"
-#include "exec/exec-all.h"
 #include "exec/cputlb.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "exec/target_page.h"
target/s390x/tcg/translate.c +0 -1
index 00073c5560e..4fdb79f1747 100644
@@ -31,7 +31,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "s390x-internal.h"
-#include "exec/exec-all.h"
 #include "tcg/tcg-op.h"
 #include "tcg/tcg-op-gvec.h"
 #include "qemu/log.h"
target/s390x/tcg/vec_fpu_helper.c +0 -1
index 1bbaa82fe8a..744f800fb6c 100644
@@ -15,7 +15,6 @@
 #include "vec.h"
 #include "tcg_s390x.h"
 #include "tcg/tcg-gvec-desc.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "fpu/softfloat.h"
 
target/s390x/tcg/vec_helper.c +0 -1
index 781ccc565bd..46ec4a947dd 100644
@@ -17,7 +17,6 @@
 #include "tcg/tcg-gvec-desc.h"
 #include "exec/helper-proto.h"
 #include "accel/tcg/cpu-ldst.h"
-#include "exec/exec-all.h"
 
 void HELPER(gvec_vbperm)(void *v1, const void *v2, const void *v3,
                          uint32_t desc)
target/sh4/cpu.c +0 -1
index 861fdd47f76..0a04f149d70 100644
@@ -24,7 +24,6 @@
 #include "qemu/qemu-print.h"
 #include "cpu.h"
 #include "migration/vmstate.h"
-#include "exec/exec-all.h"
 #include "exec/translation-block.h"
 #include "fpu/softfloat-helpers.h"
 #include "tcg/tcg.h"
target/sh4/helper.c +0 -1
index b41d14d5d7c..fb7642bda1b 100644
@@ -21,7 +21,6 @@
 
 #include "cpu.h"
 #include "exec/cputlb.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
 #include "exec/log.h"
target/sh4/op_helper.c +0 -1
index e7fcad3c1b7..557b1bf4972 100644
@@ -19,7 +19,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "fpu/softfloat.h"
 
target/sh4/translate.c +0 -1
index 5ce477d0add..f2877157b1c 100644
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "tcg/tcg-op.h"
 #include "exec/helper-proto.h"
 #include "exec/helper-gen.h"
target/sparc/cpu.c +0 -1
index f7d231c6f8b..c864217175b 100644
@@ -23,7 +23,6 @@
 #include "qemu/module.h"
 #include "qemu/qemu-print.h"
 #include "accel/tcg/cpu-mmu-index.h"
-#include "exec/exec-all.h"
 #include "exec/translation-block.h"
 #include "hw/qdev-properties.h"
 #include "qapi/visitor.h"
target/sparc/fop_helper.c +0 -1
index c25097d07f5..a49334150d3 100644
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "fpu/softfloat.h"
 
target/sparc/helper.c +0 -1
index 7846ddd6f62..9163b9d46ad 100644
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "qemu/timer.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
target/sparc/ldst_helper.c +0 -1
index 4c5dba19d11..2c63eb9e036 100644
@@ -23,7 +23,6 @@
 #include "cpu.h"
 #include "tcg/tcg.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "exec/cputlb.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
target/sparc/machine.c +0 -1
index 222e5709c55..4dd75aff74a 100644
@@ -1,6 +1,5 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "qemu/timer.h"
 
 #include "migration/cpu.h"
target/sparc/translate.c +0 -1
index adebddf27b2..241378889c3 100644
@@ -22,7 +22,6 @@
 
 #include "cpu.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "exec/target_page.h"
 #include "tcg/tcg-op.h"
 #include "tcg/tcg-op-gvec.h"
target/sparc/win_helper.c +0 -1
index 0c4b09f2c14..9ad9d01e8b9 100644
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "qemu/main-loop.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "trace.h"
 
target/tricore/cpu.c +0 -1
index a4f93e7d910..bdbcaf0dfcc 100644
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/translation-block.h"
 #include "qemu/error-report.h"
 #include "tcg/debug-assert.h"
target/tricore/op_helper.c +0 -1
index ae559b69220..9910c13f4b5 100644
@@ -18,7 +18,6 @@
 #include "cpu.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "accel/tcg/cpu-ldst.h"
 #include <zlib.h> /* for crc32 */
 
target/tricore/translate.c +0 -1
index 7cd26d8eaba..11496654e4b 100644
@@ -20,7 +20,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "tcg/tcg-op.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "qemu/qemu-print.h"
target/xtensa/dbg_helper.c +0 -1
index c4f4298a50c..3b91f7c38ac 100644
@@ -30,7 +30,6 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
-#include "exec/exec-all.h"
 #include "exec/watchpoint.h"
 #include "system/address-spaces.h"
 
target/xtensa/exc_helper.c +0 -1
index ca629f071d1..b611c9bf97c 100644
@@ -32,7 +32,6 @@
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
 #include "qemu/atomic.h"
-#include "exec/exec-all.h"
 
 void HELPER(exception)(CPUXtensaState *env, uint32_t excp)
 {
target/xtensa/fpu_helper.c +0 -1
index 53fc7cfd2af..5358060c50a 100644
@@ -30,7 +30,6 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
-#include "exec/exec-all.h"
 #include "fpu/softfloat.h"
 
 enum {
target/xtensa/mmu_helper.c +0 -1
index 182c6e35c17..71330fc84b9 100644
@@ -35,7 +35,6 @@
 #include "exec/cputlb.h"
 #include "accel/tcg/cpu-mmu-index.h"
 #include "accel/tcg/probe.h"
-#include "exec/exec-all.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
 #include "system/memory.h"
target/xtensa/op_helper.c +0 -1
index c125fa49464..fc47ebaaf50 100644
@@ -30,7 +30,6 @@
 #include "exec/helper-proto.h"
 #include "exec/page-protection.h"
 #include "qemu/host-utils.h"
-#include "exec/exec-all.h"
 #include "system/memory.h"
 #include "qemu/atomic.h"
 #include "qemu/timer.h"
target/xtensa/translate.c +0 -1
index 5ebd4a512c9..2ba4b1ae66d 100644
@@ -31,7 +31,6 @@
 #include "qemu/osdep.h"
 
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "tcg/tcg-op.h"
 #include "qemu/log.h"
 #include "qemu/qemu-print.h"
target/xtensa/win_helper.c +0 -1
index ec9ff44db05..4b25f8f4de7 100644
@@ -30,7 +30,6 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
-#include "exec/exec-all.h"
 
 static void copy_window_from_phys(CPUXtensaState *env,
                                   uint32_t window, uint32_t phys, uint32_t n)
Signature · 1 line
2.47.1
#22 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 13 lines · Philippe Mathieu-Daudé

Since v2:
- Removed CONFIG_TCG #ifdef'ry (rth)
- Added R-b/A-b tags

Trivial series moving declarations around, emptying "exec/exec-all.h" to eventually remove it.

- Fix accel/stubs/tcg-stub.c headers
- Include "accel/tcg/getpc.h" where appropriate
- Extract TCG IOMMU API to "accel/tcg/iommu.h"
- Extract TCG probe API to "accel/tcg/probe.h"
- Remove "exec/exec-all.h"

Quoted 5 lines

It is based on "accel/tcg: Compile tb-maint.c twice". I had to fix its patch #12, so I'm including patches 12-15 in this series.

Based-on: <[email protected]>

Thanks, queued into tcg-next.

r~