On Wed, 10 Apr 2019 23:10:42 +0000
Alistair Francis <alistair.fran...@wdc.com> wrote:
> Signed-off-by: Alistair Francis <alistair.fran...@wdc.com>
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
> ---
> hw/riscv/virt.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index fc4c6b306e..5b25f028ad 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -400,7 +400,7 @@ static void riscv_virt_board_init(MachineState *machine)
> /* Initialize SOC */
> object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
> TYPE_RISCV_HART_ARRAY, &error_abort, NULL);
> - object_property_set_str(OBJECT(&s->soc), VIRT_CPU, "cpu-type",
> + object_property_set_str(OBJECT(&s->soc), machine->cpu_type, "cpu-type",
> &error_abort);
> object_property_set_int(OBJECT(&s->soc), smp_cpus, "num-harts",
> &error_abort);
> @@ -526,6 +526,7 @@ static void riscv_virt_board_machine_init(MachineClass
> *mc)
> mc->desc = "RISC-V VirtIO Board (Privileged ISA v1.10)";
> mc->init = riscv_virt_board_init;
> mc->max_cpus = 8; /* hardcoded limit in BBL */
> + mc->default_cpu_type = VIRT_CPU;
> }
>
> DEFINE_MACHINE("virt", riscv_virt_board_machine_init)
