diff options
| author | Jan Kiszka <jan.kiszka@web.de> | 2011-08-15 16:18:57 -0700 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2011-08-21 00:50:23 +0200 |
| commit | 0ac543de94f4f5e7e79d59a56df60937cdd3cd24 (patch) | |
| tree | 872cd3f281f23de81a3d7ffeaf31f1b64228ffa2 /vl.c | |
| parent | 02fa69b6e8de1742c60ce3a050ed397102122e6b (diff) | |
| download | focaccia-qemu-0ac543de94f4f5e7e79d59a56df60937cdd3cd24.tar.gz focaccia-qemu-0ac543de94f4f5e7e79d59a56df60937cdd3cd24.zip | |
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 <jan.kiszka@siemens.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 10 |
1 files 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) { |