cpu_exec_init_all() is system specific: it initializes globals for the memory subsystem. Rename it as machine_memory_init() and restrict its declaration to 'system/' namespace.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- include/exec/cpu-common.h | 1 - system/memory-internal.h | 2 ++ system/physmem.c | 2 +- system/vl.c | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 6fe821b9a1d..883389b0abf 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -21,7 +21,6 @@ #define EXCP_YIELD 0x10004 /* cpu wants to yield timeslice to another */ #define EXCP_ATOMIC 0x10005 /* stop-the-world and emulate atomic */ -void cpu_exec_init_all(void); void cpu_exec_step_atomic(CPUState *cpu); #define REAL_HOST_PAGE_ALIGN(addr) ROUND_UP((addr), qemu_real_host_page_size()) diff --git a/system/memory-internal.h b/system/memory-internal.h index c7573a68b5e..b2b9b5b0c5e 100644 --- a/system/memory-internal.h +++ b/system/memory-internal.h @@ -14,6 +14,8 @@ #ifndef MEMORY_INTERNAL_H #define MEMORY_INTERNAL_H +void machine_memory_init(void); + static inline AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv) { return fv->dispatch; diff --git a/system/physmem.c b/system/physmem.c index f91230eac42..5fc9f89607e 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -3600,7 +3600,7 @@ void address_space_register_map_client(AddressSpace *as, QEMUBH *bh) } } -void cpu_exec_init_all(void) +void machine_memory_init(void) { qemu_mutex_init(&ram_list.mutex); /* The data structures we set up here depend on knowing the page size, diff --git a/system/vl.c b/system/vl.c index dbdd4f22572..1c0da7df293 100644 --- a/system/vl.c +++ b/system/vl.c @@ -143,6 +143,7 @@ #include "system/iothread.h" #include "qemu/guest-random.h" #include "qemu/keyval.h" +#include "memory-internal.h" #define MAX_VIRTIO_CONSOLES 1 @@ -2217,7 +2218,7 @@ static void qemu_create_machine(QDict *qdict) } } - cpu_exec_init_all(); + machine_memory_init(); /* * Get the default machine options from the machine if it is not already -- 2.53.0
