Commit b901a172 authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/arm/raspi: Don't bother setting default_cpu_type 



In commit 210f4784, we changed the bcm2836 SoC object to
always create a CPU of the correct type for that SoC model. This
makes the default_cpu_type settings in the MachineClass structs
for the raspi2 and raspi3 boards redundant. We didn't change
those at the time because it would have meant a temporary
regression in a corner case of error handling if the user
requested a non-existing CPU type. The -cpu parse handling
changes in 2278b939 mean that it no longer implicitly
depends on default_cpu_type for this to work, so we can now
delete the redundant default_cpu_type fields.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180420155547.9497-1-peter.maydell@linaro.org
parent e4e91a21

hw/arm/raspi.c

+0 −2
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ static void raspi2_machine_init(MachineClass *mc) 
    mc->no_parallel = 1;

    mc->no_floppy = 1;

    mc->no_cdrom = 1;

    mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a7");

    mc->max_cpus = BCM283X_NCPUS;

    mc->min_cpus = BCM283X_NCPUS;

    mc->default_cpus = BCM283X_NCPUS;
@@ -249,7 +248,6 @@ static void raspi3_machine_init(MachineClass *mc) 
    mc->no_parallel = 1;

    mc->no_floppy = 1;

    mc->no_cdrom = 1;

    mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a53");

    mc->max_cpus = BCM283X_NCPUS;

    mc->min_cpus = BCM283X_NCPUS;

    mc->default_cpus = BCM283X_NCPUS;