From 0ac543de94f4f5e7e79d59a56df60937cdd3cd24 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Mon, 15 Aug 2011 16:18:57 -0700 Subject: [PATCH] Reorder default ram_size initialization code_gen_alloc depends on it, and that is now called earlier via configure_accelerator. Signed-off-by: Jan Kiszka Signed-off-by: Edgar E. Iglesias --- vl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vl.c b/vl.c index c7141274f7..d1971df4aa 100644 --- a/vl.c +++ b/vl.c @@ -3077,6 +3077,11 @@ int main(int argc, char **argv, char **envp) exit(1); } + /* init the memory */ + if (ram_size == 0) { + ram_size = DEFAULT_RAM_SIZE * 1024 * 1024; + } + configure_accelerator(); if (qemu_init_main_loop()) { @@ -3111,11 +3116,6 @@ int main(int argc, char **argv, char **envp) if (foreach_device_config(DEV_BT, bt_parse)) exit(1); - /* init the memory */ - if (ram_size == 0) { - ram_size = DEFAULT_RAM_SIZE * 1024 * 1024; - } - if (!xen_enabled()) { /* On 32-bit hosts, QEMU is limited by virtual address space */ if (ram_size > (2047 << 20) && HOST_LONG_BITS == 32) { -- 2.11.4.GIT