@@ -3115,7 +3115,7 @@ F: system/ioport.c
F: system/memory.c
F: system/memory_mapping.c
F: system/physmem.c
-F: include/exec/memory-internal.h
+F: system/memory-internal.h
F: scripts/coccinelle/memory-region-housekeeping.cocci
Memory devices
similarity index 88%
rename from include/exec/memory-internal.h
rename to system/memory-internal.h
@@ -11,12 +11,6 @@
*
*/
-/*
- * This header is for use by exec.c, memory.c and accel/tcg/cputlb.c ONLY,
- * for declarations which are shared between the memory subsystem's
- * internals and the TCG TLB code. Do not include it from elsewhere.
- */
-
#ifndef MEMORY_INTERNAL_H
#define MEMORY_INTERNAL_H
@@ -25,7 +25,6 @@
#include "qom/object.h"
#include "trace.h"
-#include "exec/memory-internal.h"
#include "exec/ram_addr.h"
#include "system/kvm.h"
#include "system/runstate.h"
@@ -35,6 +34,8 @@
#include "migration/vmstate.h"
#include "exec/address-spaces.h"
+#include "memory-internal.h"
+
//#define DEBUG_UNASSIGNED
static unsigned memory_region_transaction_depth;
@@ -66,7 +66,6 @@
#include "qemu/main-loop.h"
#include "system/replay.h"
-#include "exec/memory-internal.h"
#include "exec/ram_addr.h"
#include "qemu/pmem.h"
@@ -88,6 +87,8 @@
#include <daxctl/libdaxctl.h>
#endif
+#include "memory-internal.h"
+
//#define DEBUG_SUBPAGE
/* ram_list is read under rcu_read_lock()/rcu_read_unlock(). Writes
Only file units within the system/ directory need access to "memory-internal.h". Restrict its scope by moving it there. The comment from commit 9d70618c684 ("memory-internal.h: Remove obsolete claim that header is obsolete") is now obsolete, remove it. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- MAINTAINERS | 2 +- {include/exec => system}/memory-internal.h | 6 ------ system/memory.c | 3 ++- system/physmem.c | 3 ++- 4 files changed, 5 insertions(+), 9 deletions(-) rename {include/exec => system}/memory-internal.h (88%)