merge: git auto-merge had missed ram_size setting

Change-Id: I86c5283d67f2c038b0a19c8c5cac7063ddc28dd0
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/vl.c b/vl.c
index 6d59b72..165a119 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -4677,6 +4677,7 @@ int main(int argc, char **argv, char **envp)
 
     qdev_machine_init();
 
+    current_machine->ram_size = ram_size;
     current_machine->maxram_size = maxram_size;
     current_machine->ram_slots = ram_slots;
     current_machine->boot_order = boot_order;