diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2025-03-17 17:13:29 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2025-04-23 14:08:29 -0700 |
| commit | d4c9cab37fa440807a4f2bf87efd0511d5694b2c (patch) | |
| tree | 039eaf4b151d5225675682a50c915740205c3401 | |
| parent | 261a0303ae4770cadaf02ec21da9b5e60076cd43 (diff) | |
| download | focaccia-qemu-d4c9cab37fa440807a4f2bf87efd0511d5694b2c.tar.gz focaccia-qemu-d4c9cab37fa440807a4f2bf87efd0511d5694b2c.zip | |
exec: Restrict memory-internal.h to system/
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>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20250317161329.40300-3-philmd@linaro.org>
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | system/memory-internal.h (renamed from include/exec/memory-internal.h) | 6 | ||||
| -rw-r--r-- | system/memory.c | 4 | ||||
| -rw-r--r-- | system/physmem.c | 3 |
4 files changed, 5 insertions, 10 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ba885010c5..661a47db5a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3129,7 +3129,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 diff --git a/include/exec/memory-internal.h b/system/memory-internal.h index c75178a3d6..085e81a9fe 100644 --- a/include/exec/memory-internal.h +++ b/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 diff --git a/system/memory.c b/system/memory.c index 6a5d853071..7e2f16f4e9 100644 --- a/system/memory.c +++ b/system/memory.c @@ -24,8 +24,6 @@ #include "qemu/qemu-print.h" #include "qom/object.h" #include "trace.h" - -#include "exec/memory-internal.h" #include "system/ram_addr.h" #include "system/kvm.h" #include "system/runstate.h" @@ -35,6 +33,8 @@ #include "migration/vmstate.h" #include "system/address-spaces.h" +#include "memory-internal.h" + //#define DEBUG_UNASSIGNED static unsigned memory_region_transaction_depth; diff --git a/system/physmem.c b/system/physmem.c index 307d0764b6..16cf557d1a 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -66,7 +66,6 @@ #include "qemu/main-loop.h" #include "system/replay.h" -#include "exec/memory-internal.h" #include "system/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 |