On 17 July 2014 16:46, Bruce Rogers <brog...@suse.com> wrote: > >>> On 7/8/2014 at 07:29 AM, <imamm...@redhat.com> wrote: >> If machine doesn't support memory hotplug then staring 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 <imamm...@redhat.com> >> CC: Bruce Rogers <brog...@suse.com> >> --- >> vl.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/vl.c b/vl.c >> index 6e084c2..6abedcf 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"); > > > Reviewed-By: Bruce Rogers <brog...@suse.com>
Applied to master, thanks. -- PMM