From 5734d031aa2fdb442410ca958ca5382d54fd71ff Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Tue, 8 Jul 2014 15:29:46 +0200 Subject: 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 CC: Bruce Rogers Reviewed-By: Bruce Rogers Signed-off-by: Peter Maydell --- vl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/vl.c b/vl.c index 6e084c2da2..6abedcfae7 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"); -- cgit v1.2.3