diff options
| author | Eric Auger <eric.auger@redhat.com> | 2019-03-04 11:13:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-05 15:55:09 +0000 |
| commit | ee6850110c627d904a11b8d3851257b4f01da20e (patch) | |
| tree | 515e3a3e6081707039553d126aa49400ac74df49 | |
| parent | a27382e2106c12a9761ca0954b4c0fba0e650682 (diff) | |
| download | qemu-ee6850110c627d904a11b8d3851257b4f01da20e.zip qemu-ee6850110c627d904a11b8d3851257b4f01da20e.tar.gz qemu-ee6850110c627d904a11b8d3851257b4f01da20e.tar.bz2 | |
vl: Set machine ram_size, maxram_size and ram_slots earlier
The machine RAM attributes will need to be analyzed during the
configure_accelerator() process. especially kvm_type() arm64
machine callback will use them to know how many IPA/GPA bits are
needed to model the whole RAM range. So let's assign those machine
state fields before calling configure_accelerator.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20190304101339.25970-7-eric.auger@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | vl.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -4239,6 +4239,9 @@ int main(int argc, char **argv, char **envp) machine_opts = qemu_get_machine_opts(); qemu_opt_foreach(machine_opts, machine_set_property, current_machine, &error_fatal); + current_machine->ram_size = ram_size; + current_machine->maxram_size = maxram_size; + current_machine->ram_slots = ram_slots; configure_accelerator(current_machine, argv[0]); @@ -4434,9 +4437,6 @@ int main(int argc, char **argv, char **envp) replay_checkpoint(CHECKPOINT_INIT); qdev_machine_init(); - current_machine->ram_size = ram_size; - current_machine->maxram_size = maxram_size; - current_machine->ram_slots = ram_slots; current_machine->boot_order = boot_order; /* parse features once if machine provides default cpu_type */ |