diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index 7eb45a95b6..a781dba770 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -18,7 +18,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 c7573a68b5..b2b9b5b0c5 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 883ac0f314..9e5b50c5b1 100644
--- a/system/physmem.c
+++ b/system/physmem.c
@@ -3592,7 +3592,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 dbdd4f2257..1c0da7df29 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