Reorder default ram_size initialization

PATCH New Jan Kiszka 1 participant 1 message Aug 15, 2011

lore

Share & tools

lore

Jan Kiszka

author

2011-08-15 23:19 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 vl.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

vl.c +5 -5

index cc4998f..44ea10c 100644
@@ -3087,6 +3087,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()) {

@@ -3121,11 +3126,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) {