On Tue, 15 Sep 2020 at 14:22, Andrew Jones <drjo...@redhat.com> wrote: > > On Tue, Sep 15, 2020 at 03:11:43AM +0000, Haibo Xu wrote: > > From: Andrew Jones <drjo...@redhat.com> > > > > We'll add more to this new function in coming patches so we also > > state the gic must be created and call it below create_gic(). > > > > No functional change intended. > > > > Signed-off-by: Andrew Jones <drjo...@redhat.com> > > Reviewed-by: Peter Maydell <peter.mayd...@linaro.org> > > --- > > hw/arm/virt.c | 38 ++++++++++++++++++++++---------------- > > 1 file changed, 22 insertions(+), 16 deletions(-) > > This still isn't the right version of this patch. You need > https://www.mail-archive.com/qemu-devel@nongnu.org/msg727591.html >
My fault! Very sorry for forgetting to address that in this version. Shall I re-send this patch with the fix? Or fix it in the next version? > > > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > > index 3f6d26c531..2ffcb073af 100644 > > --- a/hw/arm/virt.c > > +++ b/hw/arm/virt.c > > @@ -1672,6 +1672,26 @@ static void finalize_gic_version(VirtMachineState > > *vms) > > } > > } > > > > +static void virt_cpu_post_init(VirtMachineState *vms) > > +{ > > + bool aarch64; > > + > > + aarch64 = object_property_get_bool(OBJECT(first_cpu), "aarch64", NULL); > > + > > + if (!kvm_enabled()) { > > + if (aarch64 && vms->highmem) { > > + int requested_pa_size = 64 - clz64(vms->highest_gpa); > > + int pamax = arm_pamax(ARM_CPU(first_cpu)); > > + > > + if (pamax < requested_pa_size) { > > + error_report("VCPU supports less PA bits (%d) than > > requested " > > + "by the memory map (%d)", pamax, > > requested_pa_size); > > + exit(1); > > + } > > + } > > + } > > +} > > + > > static void machvirt_init(MachineState *machine) > > { > > VirtMachineState *vms = VIRT_MACHINE(machine); > > @@ -1890,22 +1910,6 @@ static void machvirt_init(MachineState *machine) > > fdt_add_timer_nodes(vms); > > fdt_add_cpu_nodes(vms); > > > > - if (!kvm_enabled()) { > > - ARMCPU *cpu = ARM_CPU(first_cpu); > > - bool aarch64 = object_property_get_bool(OBJECT(cpu), "aarch64", > > NULL); > > - > > - if (aarch64 && vms->highmem) { > > - int requested_pa_size, pamax = arm_pamax(cpu); > > - > > - requested_pa_size = 64 - clz64(vms->highest_gpa); > > - if (pamax < requested_pa_size) { > > - error_report("VCPU supports less PA bits (%d) than > > requested " > > - "by the memory map (%d)", pamax, > > requested_pa_size); > > - exit(1); > > - } > > - } > > - } > > - > > memory_region_add_subregion(sysmem, vms->memmap[VIRT_MEM].base, > > machine->ram); > > if (machine->device_memory) { > > @@ -1917,6 +1921,8 @@ static void machvirt_init(MachineState *machine) > > > > create_gic(vms); > > > > + virt_cpu_post_init(vms); > > + > > fdt_add_pmu_nodes(vms); > > > > create_uart(vms, VIRT_UART, sysmem, serial_hd(0)); > > -- > > 2.17.1 > > > > >