From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Wed, 26 Aug 2015 04:30:56 +0000 (+0900)
Subject: merge: git auto-merge had missed ram_size setting
X-Git-Tag: TizenStudio_2.0_p2.3.2~259
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e8883d43624e033b06001761960844e966c012ac;p=sdk%2Femulator%2Fqemu.git

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
--- 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;