From d4715c4183043c5e977f821b6f9ca88b17d90bbb Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 27 Mar 2014 14:00:52 +0000 Subject: [PATCH 1/2] hw/arm: Stop specifying integratorcp as the default board 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 ARMv7 * 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 Reviewed-by: Paolo Bonzini --- hw/arm/integratorcp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index a759689b44..912af96ee6 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) From a7a5544a3a59600f30f29985397f56ee40929850 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 27 Mar 2014 14:00:52 +0000 Subject: [PATCH 2/2] vl.c: Improve message when no default machine is found Improve the clarity of the message QEMU prints when the user doesn't specify a machine model to use and there is no default. Signed-off-by: Peter Maydell Reviewed-by: Paolo Bonzini Reviewed-by: Marcel Apfelbaum --- vl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vl.c b/vl.c index 2355227bcb..9975e5a4e3 100644 --- a/vl.c +++ b/vl.c @@ -3929,7 +3929,8 @@ int main(int argc, char **argv, char **envp) #endif if (machine_class == NULL) { - fprintf(stderr, "No machine found.\n"); + fprintf(stderr, "No machine specified, and there is no default.\n" + "Use -machine help to list supported machines!\n"); exit(1); }