[Qemu-devel] [PULL for-2.0 0/2] target-arm queue

[Qemu-devel] [PULL for-2.0 0/2] target-arm queue

[Peter Maydell]

This pull request just has the patches which make integratorcp
no longer the default board for qemu-system-arm and qemu-system-aarch64.

thanks
-- PMM

The following changes since commit bea4acda3bff00e98cb00d5354f23de9e74a928f:

  Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging (2014-03-27 10:54:17 +0000)

are available in the git repository at:


  git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20140327

for you to fetch changes up to a7a5544a3a59600f30f29985397f56ee40929850:

  vl.c: Improve message when no default machine is found (2014-03-27 14:01:13 +0000)

----------------------------------------------------------------
target-arm queue:
 * Don't default to integratorcp board if no machine specified

----------------------------------------------------------------
Peter Maydell (2):
      hw/arm: Stop specifying integratorcp as the default board
      vl.c: Improve message when no default machine is found

 hw/arm/integratorcp.c | 1 -
 vl.c                  | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

[Qemu-devel] [PULL 1/2] hw/arm: Stop specifying integratorcp as the default board

[Peter Maydell]

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 <peter.maydell@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/arm/integratorcp.c | 1 -
 1 file changed, 1 deletion(-)

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)
-- 
1.9.0

[Qemu-devel] [PULL 2/2] vl.c: Improve message when no default machine is found

[Peter Maydell]

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 <peter.maydell@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel.a@redhat.com>
---
 vl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vl.c b/vl.c
index 2355227..9975e5a 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);
     }
 
-- 
1.9.0

Re: [Qemu-devel] [PULL for-2.0 0/2] target-arm queue

[Peter Maydell]

On 27 March 2014 14:13, Peter Maydell <peter.maydell@linaro.org> wrote:
> This pull request just has the patches which make integratorcp
> no longer the default board for qemu-system-arm and qemu-system-aarch64.
>
> thanks
> -- PMM
>
> The following changes since commit bea4acda3bff00e98cb00d5354f23de9e74a928f:
>
>   Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging (2014-03-27 10:54:17 +0000)
>
> are available in the git repository at:
>
>
>   git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20140327
>
> for you to fetch changes up to a7a5544a3a59600f30f29985397f56ee40929850:
>
>   vl.c: Improve message when no default machine is found (2014-03-27 14:01:13 +0000)

Applied, thanks.

-- PMM