Skip to content

Commit

Permalink
pc: fix qemu exiting with error when -m X < 128 with old machine types
Browse files Browse the repository at this point in the history
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 <[email protected]>
CC: Bruce Rogers <[email protected]>
Reviewed-By: Bruce Rogers <[email protected]>
Signed-off-by: Peter Maydell <[email protected]>
  • Loading branch information
Igor Mammedov authored and pm215 committed Jul 17, 2014
1 parent af52fe8 commit 5734d03
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions vl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 5734d03

Please sign in to comment.