Ver Fonte

Move page_size_init earlier

The HOST_PAGE_ALIGN macros don't work until the page size variables
have been set up; later in postcopy I use those macros in the RAM
code, and it can be triggered using -object.

Fix this by initialising page_size_init() earlier - it's currently
initialised inside the accelerators, move it up into vl.c.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Dr. David Alan Gilbert há 9 anos atrás
pai
commit
87f50caa30
5 ficheiros alterados com 2 adições e 3 exclusões
  1. 0 1
      include/exec/exec-all.h
  2. 1 0
      include/qemu-common.h
  3. 0 1
      kvm-all.c
  4. 0 1
      qtest.c
  5. 1 0
      vl.c

+ 0 - 1
include/exec/exec-all.h

@@ -72,7 +72,6 @@ void restore_state_to_opc(CPUArchState *env, struct TranslationBlock *tb,
 
 
 void cpu_gen_init(void);
 void cpu_gen_init(void);
 bool cpu_restore_state(CPUState *cpu, uintptr_t searched_pc);
 bool cpu_restore_state(CPUState *cpu, uintptr_t searched_pc);
-void page_size_init(void);
 
 
 void QEMU_NORETURN cpu_resume_from_signal(CPUState *cpu, void *puc);
 void QEMU_NORETURN cpu_resume_from_signal(CPUState *cpu, void *puc);
 void QEMU_NORETURN cpu_io_recompile(CPUState *cpu, uintptr_t retaddr);
 void QEMU_NORETURN cpu_io_recompile(CPUState *cpu, uintptr_t retaddr);

+ 1 - 0
include/qemu-common.h

@@ -499,5 +499,6 @@ size_t buffer_find_nonzero_offset(const void *buf, size_t len);
 int parse_debug_env(const char *name, int max, int initial);
 int parse_debug_env(const char *name, int max, int initial);
 
 
 const char *qemu_ether_ntoa(const MACAddr *mac);
 const char *qemu_ether_ntoa(const MACAddr *mac);
+void page_size_init(void);
 
 
 #endif
 #endif

+ 0 - 1
kvm-all.c

@@ -1461,7 +1461,6 @@ static int kvm_init(MachineState *ms)
      * page size for the system though.
      * page size for the system though.
      */
      */
     assert(TARGET_PAGE_SIZE <= getpagesize());
     assert(TARGET_PAGE_SIZE <= getpagesize());
-    page_size_init();
 
 
     s->sigmask_len = 8;
     s->sigmask_len = 8;
 
 

+ 0 - 1
qtest.c

@@ -657,7 +657,6 @@ void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp)
 
 
     inbuf = g_string_new("");
     inbuf = g_string_new("");
     qtest_chr = chr;
     qtest_chr = chr;
-    page_size_init();
 }
 }
 
 
 bool qtest_driver(void)
 bool qtest_driver(void)

+ 1 - 0
vl.c

@@ -4285,6 +4285,7 @@ int main(int argc, char **argv, char **envp)
         exit(1);
         exit(1);
     }
     }
 
 
+    page_size_init();
     socket_init();
     socket_init();
 
 
     if (qemu_opts_foreach(qemu_find_opts("object"),
     if (qemu_opts_foreach(qemu_find_opts("object"),