diff options
author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2015-11-05 18:10:31 +0000 |
---|---|---|
committer | Juan Quintela <quintela@redhat.com> | 2015-11-10 14:51:48 +0100 |
commit | 87f50caa30ae7449c5875ff3171cff4d8648569a (patch) | |
tree | 5e883f099702fe5394b493be5ebdb8fea402117d | |
parent | 172dfd4faf2b64720db8a2dad7048056f2b81d75 (diff) | |
download | qemu-87f50caa30ae7449c5875ff3171cff4d8648569a.zip qemu-87f50caa30ae7449c5875ff3171cff4d8648569a.tar.gz qemu-87f50caa30ae7449c5875ff3171cff4d8648569a.tar.bz2 |
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>
-rw-r--r-- | include/exec/exec-all.h | 1 | ||||
-rw-r--r-- | include/qemu-common.h | 1 | ||||
-rw-r--r-- | kvm-all.c | 1 | ||||
-rw-r--r-- | qtest.c | 1 | ||||
-rw-r--r-- | vl.c | 1 |
5 files changed, 2 insertions, 3 deletions
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index b07de10..d900b0d 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -72,7 +72,6 @@ void restore_state_to_opc(CPUArchState *env, struct TranslationBlock *tb, void cpu_gen_init(void); 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_io_recompile(CPUState *cpu, uintptr_t retaddr); diff --git a/include/qemu-common.h b/include/qemu-common.h index 2f74540..405364f 100644 --- a/include/qemu-common.h +++ b/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); const char *qemu_ether_ntoa(const MACAddr *mac); +void page_size_init(void); #endif @@ -1461,7 +1461,6 @@ static int kvm_init(MachineState *ms) * page size for the system though. */ assert(TARGET_PAGE_SIZE <= getpagesize()); - page_size_init(); s->sigmask_len = 8; @@ -657,7 +657,6 @@ void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp) inbuf = g_string_new(""); qtest_chr = chr; - page_size_init(); } bool qtest_driver(void) @@ -4285,6 +4285,7 @@ int main(int argc, char **argv, char **envp) exit(1); } + page_size_init(); socket_init(); if (qemu_opts_foreach(qemu_find_opts("object"), |