From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A03B2C433E0 for ; Mon, 1 Feb 2021 19:59:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1BC68601FB for ; Mon, 1 Feb 2021 19:59:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1BC68601FB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6fMS-0004gX-3W for qemu-devel@archiver.kernel.org; Mon, 01 Feb 2021 14:59:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6fJt-0000r8-NK; Mon, 01 Feb 2021 14:57:10 -0500 Received: from mail-il1-x12a.google.com ([2607:f8b0:4864:20::12a]:36004) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6fJr-0005fi-SM; Mon, 01 Feb 2021 14:57:09 -0500 Received: by mail-il1-x12a.google.com with SMTP id p8so16844044ilg.3; Mon, 01 Feb 2021 11:57:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=W2dJn2sLoY9H+IKibEtw6/D6QgYv/E2xZxjVcAwjgmk=; b=LQIs2QwD80ymhtl44nrZgYq21K0dzZykpVIT/KU5HrBelc9HLidqOViek7clRNiJdY IIykWLdTHPR5fNR4jVOg8T8b88mMSYR7W8CspcfCrdkMBceQY2Xs3y/JjxzWfvVq0u/K 2lb4Yg2EzxleaWBWVguBQnzBUNOZXTuLTu0mn7+VKLuOSSgRzGKoukJsvtj7NpSdvkTT vwwqkAvm5FRxY20sEZmzMcjmJF/tajHPj9+KmQWh/ucMhljNmZPZiB4OcOUwmkZq9Ryb eoz1SLCbufzUV7SzUzBluxsZ5lAZE2YHWZr4UDcW87l8mkdCWsrYOsa2T/Y8/1jBavo9 f3Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=W2dJn2sLoY9H+IKibEtw6/D6QgYv/E2xZxjVcAwjgmk=; b=shL6TlI38mbYFHhDHayd8V5KMRrbyCzo9hvawmBt/YAkiswYaz2EY85z1juToQli2Y 4zND9Gd8RfskRrNQuHtDgAh34YhGef+JME6kbKJygDkFnPXZchhKfCXAKbmRJv3/gKfW FjOUDF8hKzWxnmEhLr/sbhYG5LBp10+oVtAvdQOiJjBs8/lFtqEA0pBd4snjbbuy7SqS Q34k0gMYxyEnnubaXUtNYwzQ1w/i9W7X5zmh9S4wQiCseYVj/MnC18vpcT4aXrv9QNxg VlhND0ndSJjiqNAwyYL1wpfB0fncLW+tB4y/eeozHB/coF3MxJBXVa8AuTQb6oKAqrbp vnmg== X-Gm-Message-State: AOAM530iiTGd3X5N0UDEISlhJAAlBayd0Sfvfs+yrml5gjlOxr2AS3CA enJUrbjZFyfPIGJYGlcj6jxRKkD3dXctnD07mOVdv9XZZO8= X-Google-Smtp-Source: ABdhPJx1zl3+B8mfXw9T2LtJvLPDe/dwzmTi1pww9/h+qZV4GRota3Lmw7xoOvCpNgZzarnVAj0xr9G+aH2Wt1+PYjQ= X-Received: by 2002:a05:6e02:20e5:: with SMTP id q5mr14550714ilv.131.1612209425045; Mon, 01 Feb 2021 11:57:05 -0800 (PST) MIME-Version: 1.0 References: <20210131184449.382425-1-f4bug@amsat.org> <20210131184449.382425-7-f4bug@amsat.org> In-Reply-To: <20210131184449.382425-7-f4bug@amsat.org> From: Alistair Francis Date: Mon, 1 Feb 2021 11:56:37 -0800 Message-ID: Subject: Re: [PATCH v3 6/6] hw/arm: Display CPU type in machine description To: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2607:f8b0:4864:20::12a; envelope-from=alistair23@gmail.com; helo=mail-il1-x12a.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , QEMU Trivial , Alistair Francis , Michael Tokarev , "qemu-devel@nongnu.org Developers" , Laurent Vivier , Niek Linnenbank , qemu-arm , Antony Pavlov , Joel Stanley Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Sun, Jan 31, 2021 at 10:54 AM Philippe Mathieu-Daud=C3=A9 wrote: > > Most of ARM machines display their CPU when QEMU list the available > machines (-M help). Some machines do not. Fix to unify the help > output. > > Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Alistair > --- > hw/arm/digic_boards.c | 2 +- > hw/arm/microbit.c | 2 +- > hw/arm/netduino2.c | 2 +- > hw/arm/netduinoplus2.c | 2 +- > hw/arm/orangepi.c | 2 +- > hw/arm/stellaris.c | 4 ++-- > 6 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c > index be12873673b..6cdc1d83fca 100644 > --- a/hw/arm/digic_boards.c > +++ b/hw/arm/digic_boards.c > @@ -142,7 +142,7 @@ static void canon_a1100_init(MachineState *machine) > > static void canon_a1100_machine_init(MachineClass *mc) > { > - mc->desc =3D "Canon PowerShot A1100 IS"; > + mc->desc =3D "Canon PowerShot A1100 IS (ARM946)"; > mc->init =3D &canon_a1100_init; > mc->ignore_memory_transaction_failures =3D true; > mc->default_ram_size =3D 64 * MiB; > diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c > index 0947491cb97..e9494334ce7 100644 > --- a/hw/arm/microbit.c > +++ b/hw/arm/microbit.c > @@ -64,7 +64,7 @@ static void microbit_machine_class_init(ObjectClass *oc= , void *data) > { > MachineClass *mc =3D MACHINE_CLASS(oc); > > - mc->desc =3D "BBC micro:bit"; > + mc->desc =3D "BBC micro:bit (Cortex-M0)"; > mc->init =3D microbit_init; > mc->max_cpus =3D 1; > } > diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c > index 8f103341443..1733b71507c 100644 > --- a/hw/arm/netduino2.c > +++ b/hw/arm/netduino2.c > @@ -54,7 +54,7 @@ static void netduino2_init(MachineState *machine) > > static void netduino2_machine_init(MachineClass *mc) > { > - mc->desc =3D "Netduino 2 Machine"; > + mc->desc =3D "Netduino 2 Machine (Cortex-M3)"; > mc->init =3D netduino2_init; > mc->ignore_memory_transaction_failures =3D true; > } > diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c > index 68abd3ec69d..d3ad7a2b675 100644 > --- a/hw/arm/netduinoplus2.c > +++ b/hw/arm/netduinoplus2.c > @@ -55,7 +55,7 @@ static void netduinoplus2_init(MachineState *machine) > > static void netduinoplus2_machine_init(MachineClass *mc) > { > - mc->desc =3D "Netduino Plus 2 Machine"; > + mc->desc =3D "Netduino Plus 2 Machine (Cortex-M4)"; > mc->init =3D netduinoplus2_init; > } > > diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c > index d6306dfddae..40cdb5c6d2c 100644 > --- a/hw/arm/orangepi.c > +++ b/hw/arm/orangepi.c > @@ -113,7 +113,7 @@ static void orangepi_init(MachineState *machine) > > static void orangepi_machine_init(MachineClass *mc) > { > - mc->desc =3D "Orange Pi PC"; > + mc->desc =3D "Orange Pi PC (Cortex-A7)"; > mc->init =3D orangepi_init; > mc->block_default_type =3D IF_SD; > mc->units_per_default_bus =3D 1; > diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c > index ad72c0959f1..27292ec4113 100644 > --- a/hw/arm/stellaris.c > +++ b/hw/arm/stellaris.c > @@ -1538,7 +1538,7 @@ static void lm3s811evb_class_init(ObjectClass *oc, = void *data) > { > MachineClass *mc =3D MACHINE_CLASS(oc); > > - mc->desc =3D "Stellaris LM3S811EVB"; > + mc->desc =3D "Stellaris LM3S811EVB (Cortex-M3)"; > mc->init =3D lm3s811evb_init; > mc->ignore_memory_transaction_failures =3D true; > mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("cortex-m3"); > @@ -1554,7 +1554,7 @@ static void lm3s6965evb_class_init(ObjectClass *oc,= void *data) > { > MachineClass *mc =3D MACHINE_CLASS(oc); > > - mc->desc =3D "Stellaris LM3S6965EVB"; > + mc->desc =3D "Stellaris LM3S6965EVB (Cortex-M3)"; > mc->init =3D lm3s6965evb_init; > mc->ignore_memory_transaction_failures =3D true; > mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("cortex-m3"); > -- > 2.26.2 > >