From: Igor Mammedov <imammedo@redhat.com>
Date: Tue, 8 Jul 2014 13:29:46 +0000 (+0200)
Subject: pc: fix qemu exiting with error when -m X < 128 with old machine types
X-Git-Tag: v2.1.0-rc3~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5734d031aa2fdb442410ca958ca5382d54fd71ff;p=thirdparty%2Fqemu.git

pc: fix qemu exiting with error when -m X < 128 with old machine types

If machine doesn't support memory hotplug then starting QEMU
with initial memory less than default will make QEMU exit with
following error message:

$QEMU -m 16  -M isapc
qemu-system-i386: "-memory 'slots|maxmem'" is not supported by: isapc

Set maxram_size to initial memory value before parsing
'maxmem' option allows to keep maxmem in sync with initial
memory size if no maxmem option was specified.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
CC: Bruce Rogers <brogers@suse.com>
Reviewed-By: Bruce Rogers <brogers@suse.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/vl.c b/vl.c
index 6e084c2da26..6abedcfae74 100644
--- a/vl.c
+++ b/vl.c
@@ -3315,6 +3315,7 @@ int main(int argc, char **argv, char **envp)
                     error_report("ram size too large");
                     exit(EXIT_FAILURE);
                 }
+                maxram_size = ram_size;
 
                 maxmem_str = qemu_opt_get(opts, "maxmem");
                 slots_str = qemu_opt_get(opts, "slots");