[PATCH v2 06/24] system/memory: Move *ldst* headers from exec/ to system/ namespace

[Philippe Mathieu-Daudé]

Keep all system memory APIs under the system/ namespace.

Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
 MAINTAINERS                                       |  1 +
 include/system/memory.h                           |  4 ++--
 include/system/memory_cached.h                    | 10 +++++-----
 include/{exec => system}/memory_ldst.h.inc        |  0
 include/{exec => system}/memory_ldst_cached.h.inc |  0
 include/{exec => system}/memory_ldst_phys.h.inc   |  0
 6 files changed, 8 insertions(+), 7 deletions(-)
 rename include/{exec => system}/memory_ldst.h.inc (100%)
 rename include/{exec => system}/memory_ldst_cached.h.inc (100%)
 rename include/{exec => system}/memory_ldst_phys.h.inc (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index c299b84d418..f984891ac2b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3255,6 +3255,7 @@ S: Supported
 F: include/system/ioport.h
 F: include/exec/memop.h
 F: include/system/memory.h
+F: include/system/memory_ldst*
 F: include/system/memory_cached.h
 F: include/system/physmem.h
 F: include/system/ram_addr.h
diff --git a/include/system/memory.h b/include/system/memory.h
index 90f375df5df..8043d295334 100644
--- a/include/system/memory.h
+++ b/include/system/memory.h
@@ -2848,12 +2848,12 @@ MemTxResult address_space_write_rom(AddressSpace *as, 
hwaddr addr,
 #define SUFFIX
 #define ARG1         as
 #define ARG1_DECL    AddressSpace *as
-#include "exec/memory_ldst.h.inc"
+#include "system/memory_ldst.h.inc"
 
 #define SUFFIX
 #define ARG1         as
 #define ARG1_DECL    AddressSpace *as
-#include "exec/memory_ldst_phys.h.inc"
+#include "system/memory_ldst_phys.h.inc"
 
 void address_space_flush_icache_range(AddressSpace *as, hwaddr addr, hwaddr 
len);
 
diff --git a/include/system/memory_cached.h b/include/system/memory_cached.h
index 1a07774b6ad..587e8a1453a 100644
--- a/include/system/memory_cached.h
+++ b/include/system/memory_cached.h
@@ -52,7 +52,7 @@ struct MemoryRegionCache {
 #define SUFFIX       _cached_slow
 #define ARG1         cache
 #define ARG1_DECL    MemoryRegionCache *cache
-#include "exec/memory_ldst.h.inc"
+#include "system/memory_ldst.h.inc"
 
 /* Inline fast path for direct RAM access.  */
 static inline uint8_t address_space_ldub_cached(MemoryRegionCache *cache,
@@ -78,18 +78,18 @@ static inline void 
address_space_stb_cached(MemoryRegionCache *cache,
 }
 
 #define ENDIANNESS
-#include "exec/memory_ldst_cached.h.inc"
+#include "system/memory_ldst_cached.h.inc"
 
 #define ENDIANNESS   _le
-#include "exec/memory_ldst_cached.h.inc"
+#include "system/memory_ldst_cached.h.inc"
 
 #define ENDIANNESS   _be
-#include "exec/memory_ldst_cached.h.inc"
+#include "system/memory_ldst_cached.h.inc"
 
 #define SUFFIX       _cached
 #define ARG1         cache
 #define ARG1_DECL    MemoryRegionCache *cache
-#include "exec/memory_ldst_phys.h.inc"
+#include "system/memory_ldst_phys.h.inc"
 
 /**
  * address_space_cache_init: prepare for repeated access to a physical
diff --git a/include/exec/memory_ldst.h.inc b/include/system/memory_ldst.h.inc
similarity index 100%
rename from include/exec/memory_ldst.h.inc
rename to include/system/memory_ldst.h.inc
diff --git a/include/exec/memory_ldst_cached.h.inc 
b/include/system/memory_ldst_cached.h.inc
similarity index 100%
rename from include/exec/memory_ldst_cached.h.inc
rename to include/system/memory_ldst_cached.h.inc
diff --git a/include/exec/memory_ldst_phys.h.inc 
b/include/system/memory_ldst_phys.h.inc
similarity index 100%
rename from include/exec/memory_ldst_phys.h.inc
rename to include/system/memory_ldst_phys.h.inc
-- 
2.52.0