[maybe-for-2.0,1/2] hw/arm: Stop specifying integratorcp as the default board

Message ID 1395775613-30984-2-git-send-email-peter.maydell@linaro.org
State New
Headers show

Commit Message

Peter Maydell March 25, 2014, 7:26 p.m.
Currently for both qemu-system-arm and qemu-system-aarch64
the default board model if the user doesn't specify one
is the 'integratorcp'. This is a totally arbitrary historical
accident since it was the first board to be modelled.
That board is now just one target among many for us, and
is a very poor choice of default:
 * it's an ancient board that is now only found in the
   junkpiles of longtime ARM/Linux hackers, if at all
 * it's an ARMv5 CPU, when most distros are now assuming
 * it's pretty much unmaintained in QEMU
 * it doesn't even have versatilepb's advantage of
   supporting PCI

Making it or any other board the default serves only
to confuse people new to ARM who expect something more
like the x86 monoculture. Remove the is_default marker
from integratorcp, and don't set it for any other board,
to give users a nudge that they need to think about
which board they want a QEMU model of. (QEMU will produce
the admittedly slightly cryptic error "No machine found.")

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
 hw/arm/integratorcp.c | 1 -
 1 file changed, 1 deletion(-)


Alex Bennée March 28, 2014, 11:17 a.m. | #1
Peter Maydell <peter.maydell@linaro.org> writes:

> -    .is_default = 1,

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Peter Maydell March 28, 2014, 11:35 a.m. | #2
On 28 March 2014 11:17, Alex Bennée <alex.bennee@linaro.org> wrote:
> Peter Maydell <peter.maydell@linaro.org> writes:
> <snip>
>> -    .is_default = 1,
> <snip>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Bit late, this was applied to master yesterday :-)

-- PMM


diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index a759689..912af96 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -534,7 +534,6 @@  static QEMUMachine integratorcp_machine = {
     .name = "integratorcp",
     .desc = "ARM Integrator/CP (ARM926EJ-S)",
     .init = integratorcp_init,
-    .is_default = 1,
 static void integratorcp_machine_init(void)