SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vl: allow not specifying size in -m when using -M memory-backend

Browse Source 
Starting in QEMU 6.0's commit f5c9fcb82d ("vl: separate
qemu_create_machine", 2020-12-10), a function have_custom_ram_size()
replaced the return value of set_memory_options().

The purpose of the return value was to record the presence of
"-m size", and if it was not there, change the default RAM
size to the size of the memory backend passed with "-M
memory-backend".

With that commit, however, have_custom_ram_size() is now queried only
after set_memory_options has stored the fixed-up RAM size in QemuOpts for
"future use".  This was actually the only future use of the fixed-up RAM
size, so remove that code and fix the bug.

Cc: qemu-stable@nongnu.org
Fixes: f5c9fcb82d ("vl: separate qemu_create_machine", 2020-12-10)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2021-05-17 10:13:01 -04:00
parent b02629550d
commit d349f92f78
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
softmmu/vl.c
View File

@ -2039,8 +2039,6 @@ static void set_memory_options(MachineClass *mc)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
/* store value for the future use */
qemu_opt_set_number(opts, "size", ram_size, &error_abort);
maxram_size = ram_size; maxram_size = ram_size;
if (qemu_opt_get(opts, "maxmem")) { if (qemu_opt_get(opts, "maxmem")) {