From e8883d43624e033b06001761960844e966c012ac Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Wed, 26 Aug 2015 13:30:56 +0900 Subject: [PATCH] merge: git auto-merge had missed ram_size setting Change-Id: I86c5283d67f2c038b0a19c8c5cac7063ddc28dd0 Signed-off-by: SeokYeon Hwang --- vl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/vl.c b/vl.c index 6d59b72f39..165a119f12 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; -- 2.34.1