Commit 0ac543de authored by Jan Kiszka's avatar Jan Kiszka Committed by Edgar E. Iglesias
Browse files

Reorder default ram_size initialization 



code_gen_alloc depends on it, and that is now called earlier via
configure_accelerator.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@gmail.com>
parent 02fa69b6

vl.c

+5 −5
Original line number Diff line number Diff line
@@ -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) {