[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 04/56] Move page_size_init earlier
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PATCH v9 04/56] Move page_size_init earlier |
Date: |
Thu, 5 Nov 2015 18:10:31 +0000 |
From: "Dr. David Alan Gilbert" <address@hidden>
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 <address@hidden>
---
include/exec/exec-all.h | 1 -
include/qemu-common.h | 1 +
kvm-all.c | 1 -
qtest.c | 1 -
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 9b93b9b..61d5128 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
diff --git a/kvm-all.c b/kvm-all.c
index 1bc1273..de3c8c4 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -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;
diff --git a/qtest.c b/qtest.c
index 8e10340..05cefd2 100644
--- a/qtest.c
+++ b/qtest.c
@@ -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)
diff --git a/vl.c b/vl.c
index 8f24c30..904850d 100644
--- a/vl.c
+++ b/vl.c
@@ -4254,6 +4254,7 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
+ page_size_init();
socket_init();
if (qemu_opts_foreach(qemu_find_opts("object"),
--
2.5.0
- [Qemu-devel] [PATCH v9 00/56] Postcopy implementation, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 02/56] Provide runtime Target page information, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 03/56] Move configuration section writing, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 01/56] Add postcopy documentation, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 04/56] Move page_size_init earlier,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PATCH v9 05/56] qemu_ram_block_from_host, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 06/56] qemu_ram_block_by_name, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 08/56] Add qemu_get_buffer_in_place to avoid copies some of the time, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 07/56] Rename mis->file to from_src_file, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 09/56] Add wrapper for setting blocking status on a QEMUFile, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 10/56] Add QEMU_MADV_NOHUGEPAGE, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 11/56] ram_debug_dump_bitmap: Dump a migration bitmap as text, Dr. David Alan Gilbert (git), 2015/11/05