diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2014-07-08 15:29:46 +0200 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-07-17 17:45:45 +0100 |
| commit | 5734d031aa2fdb442410ca958ca5382d54fd71ff (patch) | |
| tree | e6e30c1d081170093addef8edf94041e00654882 | |
| parent | af52fe862fba686713044efdf9158195f84535ab (diff) | |
| download | focaccia-qemu-5734d031aa2fdb442410ca958ca5382d54fd71ff.tar.gz focaccia-qemu-5734d031aa2fdb442410ca958ca5382d54fd71ff.zip | |
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>
| -rw-r--r-- | vl.c | 1 |
1 files changed, 1 insertions, 0 deletions
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"); |