diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-04-26 11:04:39 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-04-26 11:04:39 +0100 |
| commit | b901a172455cfbb96cc36e916ebc65f0bfed8109 (patch) | |
| tree | a2cbe78fa93a63fcd7952c48c712a07d9d2b91a7 | |
| parent | e4e91a217c17fff4045dd4b423cdcb471b3d6a0e (diff) | |
| download | qemu-b901a172455cfbb96cc36e916ebc65f0bfed8109.zip qemu-b901a172455cfbb96cc36e916ebc65f0bfed8109.tar.gz qemu-b901a172455cfbb96cc36e916ebc65f0bfed8109.tar.bz2 | |
hw/arm/raspi: Don't bother setting default_cpu_type
In commit 210f47840dd62, 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 2278b93941d42c3 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: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180420155547.9497-1-peter.maydell@linaro.org
| -rw-r--r-- | hw/arm/raspi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 955a7c4..66899c2 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -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; |