| Message ID | 20190205173306.20483-9-eric.auger@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | ARM virt: Initial RAM expansion and PCDIMM/NVDIMM support | expand |
On Tue, 5 Feb 2019 at 17:33, Eric Auger <eric.auger@redhat.com> wrote: > > 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> > > --- > > v4: new > --- > vl.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/vl.c b/vl.c > index 9cf0fbe0b8..28f6bbebe2 100644 > --- a/vl.c > +++ b/vl.c > @@ -4324,6 +4324,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]); This is still after the call to set_memory_options(), so it's OK. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
diff --git a/vl.c b/vl.c index 9cf0fbe0b8..28f6bbebe2 100644 --- a/vl.c +++ b/vl.c @@ -4324,6 +4324,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]); @@ -4521,9 +4524,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 */
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> --- v4: new --- vl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)