diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-05-17 10:13:01 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-05-26 14:49:46 +0200 |
| commit | d349f92f78d26db2805ca39a7745cc70affea021 (patch) | |
| tree | e66d7354627ae425dc4558d873c9da7ffed3cd18 /softmmu/vl.c | |
| parent | b02629550d7bdea405364124a356f88791c56260 (diff) | |
| download | qemu-d349f92f78d26db2805ca39a7745cc70affea021.zip qemu-d349f92f78d26db2805ca39a7745cc70affea021.tar.gz qemu-d349f92f78d26db2805ca39a7745cc70affea021.tar.bz2 | |
vl: allow not specifying size in -m when using -M memory-backend
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>
Diffstat (limited to 'softmmu/vl.c')
| -rw-r--r-- | softmmu/vl.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c index ac0ff6e..21e5571 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2039,8 +2039,6 @@ static void set_memory_options(MachineClass *mc) exit(EXIT_FAILURE); } - /* store value for the future use */ - qemu_opt_set_number(opts, "size", ram_size, &error_abort); maxram_size = ram_size; if (qemu_opt_get(opts, "maxmem")) { |