@@ -189,13 +189,13 @@ extern unsigned long reserved_va;
#define ARG1 as
#define ARG1_DECL AddressSpace *as
#define TARGET_ENDIANNESS
-#include "exec/memory_ldst.inc.h"
+#include "exec/memory_ldst.h.inc"
#define SUFFIX _cached_slow
#define ARG1 cache
#define ARG1_DECL MemoryRegionCache *cache
#define TARGET_ENDIANNESS
-#include "exec/memory_ldst.inc.h"
+#include "exec/memory_ldst.h.inc"
static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val)
{
@@ -207,17 +207,17 @@ static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val
#define ARG1 as
#define ARG1_DECL AddressSpace *as
#define TARGET_ENDIANNESS
-#include "exec/memory_ldst_phys.inc.h"
+#include "exec/memory_ldst_phys.h.inc"
/* Inline fast path for direct RAM access. */
#define ENDIANNESS
-#include "exec/memory_ldst_cached.inc.h"
+#include "exec/memory_ldst_cached.h.inc"
#define SUFFIX _cached
#define ARG1 cache
#define ARG1_DECL MemoryRegionCache *cache
#define TARGET_ENDIANNESS
-#include "exec/memory_ldst_phys.inc.h"
+#include "exec/memory_ldst_phys.h.inc"
#endif
/* page related stuff */
@@ -2133,12 +2133,12 @@ MemTxResult address_space_write_rom(AddressSpace *as, hwaddr addr,
#define SUFFIX
#define ARG1 as
#define ARG1_DECL AddressSpace *as
-#include "exec/memory_ldst.inc.h"
+#include "exec/memory_ldst.h.inc"
#define SUFFIX
#define ARG1 as
#define ARG1_DECL AddressSpace *as
-#include "exec/memory_ldst_phys.inc.h"
+#include "exec/memory_ldst_phys.h.inc"
struct MemoryRegionCache {
void *ptr;
@@ -2179,7 +2179,7 @@ struct MemoryRegionCache {
#define SUFFIX _cached_slow
#define ARG1 cache
#define ARG1_DECL MemoryRegionCache *cache
-#include "exec/memory_ldst.inc.h"
+#include "exec/memory_ldst.h.inc"
/* Inline fast path for direct RAM access. */
static inline uint8_t address_space_ldub_cached(MemoryRegionCache *cache,
@@ -2205,15 +2205,15 @@ static inline void address_space_stb_cached(MemoryRegionCache *cache,
}
#define ENDIANNESS _le
-#include "exec/memory_ldst_cached.inc.h"
+#include "exec/memory_ldst_cached.h.inc"
#define ENDIANNESS _be
-#include "exec/memory_ldst_cached.inc.h"
+#include "exec/memory_ldst_cached.h.inc"
#define SUFFIX _cached
#define ARG1 cache
#define ARG1_DECL MemoryRegionCache *cache
-#include "exec/memory_ldst_phys.inc.h"
+#include "exec/memory_ldst_phys.h.inc"
/* address_space_cache_init: prepare for repeated access to a physical
* memory region
similarity index 100%
rename from include/exec/memory_ldst.inc.h
rename to include/exec/memory_ldst.h.inc
similarity index 100%
rename from include/exec/memory_ldst_cached.inc.h
rename to include/exec/memory_ldst_cached.h.inc
similarity index 100%
rename from include/exec/memory_ldst_phys.inc.h
rename to include/exec/memory_ldst_phys.h.inc
@@ -23,7 +23,7 @@
.desc = _DESC, \
},
static const S390FeatDef s390_features[S390_FEAT_MAX] = {
- #include "cpu_features_def.inc.h"
+ #include "cpu_features_def.h.inc"
};
#undef DEF_FEAT
@@ -17,7 +17,7 @@
#define DEF_FEAT(_FEAT, ...) S390_FEAT_##_FEAT,
typedef enum {
- #include "cpu_features_def.inc.h"
+ #include "cpu_features_def.h.inc"
S390_FEAT_MAX,
} S390Feat;
#undef DEF_FEAT
similarity index 100%
rename from target/s390x/cpu_features_def.inc.h
rename to target/s390x/cpu_features_def.h.inc
Make it consistent with '.c.inc' and '.rst.inc'. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- include/exec/cpu-all.h | 10 +++++----- include/exec/memory.h | 12 ++++++------ .../exec/{memory_ldst.inc.h => memory_ldst.h.inc} | 0 ...ry_ldst_cached.inc.h => memory_ldst_cached.h.inc} | 0 ...memory_ldst_phys.inc.h => memory_ldst_phys.h.inc} | 0 target/s390x/cpu_features.c | 2 +- target/s390x/cpu_features_def.h | 2 +- ...cpu_features_def.inc.h => cpu_features_def.h.inc} | 0 8 files changed, 13 insertions(+), 13 deletions(-) rename include/exec/{memory_ldst.inc.h => memory_ldst.h.inc} (100%) rename include/exec/{memory_ldst_cached.inc.h => memory_ldst_cached.h.inc} (100%) rename include/exec/{memory_ldst_phys.inc.h => memory_ldst_phys.h.inc} (100%) rename target/s390x/{cpu_features_def.inc.h => cpu_features_def.h.inc} (100%)