Commit 6ff45f01 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20140327' into staging 



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

# gpg: Signature made Thu 27 Mar 2014 14:09:12 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"

* remotes/pmaydell/tags/pull-target-arm-20140327:
  vl.c: Improve message when no default machine is found
  hw/arm: Stop specifying integratorcp as the default board

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9ad665df a7a5544a

hw/arm/integratorcp.c

+0 −1
Original line number Diff line number Diff line
@@ -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)

vl.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

    }