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=-7.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no 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 539BEC433E0 for ; Sun, 31 Jan 2021 21:54:01 +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 80BB664DDB for ; Sun, 31 Jan 2021 21:54:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 80BB664DDB 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]:53422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6KfP-000672-8R for qemu-devel@archiver.kernel.org; Sun, 31 Jan 2021 16:53:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6Kej-0005U2-1m; Sun, 31 Jan 2021 16:53:17 -0500 Received: from mail-io1-xd33.google.com ([2607:f8b0:4864:20::d33]:35141) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6Keg-00050x-S3; Sun, 31 Jan 2021 16:53:16 -0500 Received: by mail-io1-xd33.google.com with SMTP id y19so15352913iov.2; Sun, 31 Jan 2021 13:53:13 -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; bh=Gxsg+A4eqcnjuy62FJK3AkVQE52f/hHvAZknXUxQpyg=; b=f707zPr2Jy8PeIuNVNG3PVFoDFyg0MLtFSZA+p2eWpAOg9jScC9NZ+nMDR+kTPJ+0I 6SPajq18a6nL8WqnD9geqNNVqq5vlKc8pXTAvMvjWz2HUORJ5oacXLizUQbOTcQg7/Jy iWCFNttL9bswIqGFnc1NrTPgQAYBhLadC3d4DxGht83kbd3iXLID8yVIuZpNpAYWWLIT VjGt7WL0UuqiTvgxNqvoKjfBtmg1U4VOWxaygCbHn5TlCmCXnPPbZMVTJ/YFQzkSro0X aXlbHKLgmfonHbNMQL5Nr7yf+x9+nwT7wrIm4iEUyDMcadsN2tvUMa8C36bPGbZIgijp OJQg== 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; bh=Gxsg+A4eqcnjuy62FJK3AkVQE52f/hHvAZknXUxQpyg=; b=tHNRPFzQzUcHthTcdao+mzVcWpDi42KLXnLKlwbd2YyowwdWY6inEhb+cl4Rr6YOgQ EjPd5Mw7hl+tyDe0pnZYF6495+2bIv1TPz09JgpR7tvZK/TjOWNFH3Xz6MUOGtHGrdgV 9O2nCjZAsbXtZeo1pmfuqq06VVGVgoZrCBLxQNTLmpw9wQqgrzpca0sFIqBUZUcm5ah3 t5qMHfW7mtkS3JBe5/tILotI5hfXyDTu9/orUDeLvKOQjUccgiLtZtLgtt4rwHdtOErj zFHFmghjWT3jjJCHiEoLsj+pW74yJf23slQEv/QmEwljAcMIU+zTVID5FpOGqj+836xF wFkA== X-Gm-Message-State: AOAM531p7ij/u5FflARQ9kcJGj9efrKrTGhJhyD1Ad3o77UsM5LrRPJs sg7yt3Bxss6E/ScEo4MT33xHthqAm04+BlN5XUo= X-Google-Smtp-Source: ABdhPJwVZYhPzs2FlksPyT0xBJC5NlaUZWC7shjUkqZL/IPntFbkWvtLXgqE6XomQG/CT8hTwoWs0cfTKMi/5VGW118= X-Received: by 2002:a6b:d01a:: with SMTP id x26mr10959701ioa.11.1612129992572; Sun, 31 Jan 2021 13:53:12 -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: Niek Linnenbank Date: Sun, 31 Jan 2021 22:53:01 +0100 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: multipart/alternative; boundary="0000000000008a00b405ba39431a" Received-SPF: pass client-ip=2607:f8b0:4864:20::d33; envelope-from=nieklinnenbank@gmail.com; helo=mail-io1-xd33.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_FROM=0.001, HTML_MESSAGE=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@nongnu.org, Alistair Francis , Michael Tokarev , QEMU Developers , Laurent Vivier , qemu-arm@nongnu.org, Antony Pavlov , Joel Stanley Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --0000000000008a00b405ba39431a Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable For Orange Pi PC: Reviewed-by: Niek Linnenbank Op zo 31 jan. 2021 19:45 schreef Philippe Mathieu-Daud=C3=A9 : > 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 > --- > 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 > > --0000000000008a00b405ba39431a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
For Orange Pi PC:

= Reviewed-by: Niek Linnenbank <nieklinnenbank@gmail.com>

Op zo 31 jan. 2021 19:45 schr= eef Philippe Mathieu-Daud=C3=A9 <f4bu= g@amsat.org>:
Most of ARM ma= chines 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 <f4bug@amsat.org>
---
=C2=A0hw/arm/digic_boards.c=C2=A0 | 2 +-
=C2=A0hw/arm/microbit.c=C2=A0 =C2=A0 =C2=A0 | 2 +-
=C2=A0hw/arm/netduino2.c=C2=A0 =C2=A0 =C2=A0| 2 +-
=C2=A0hw/arm/netduinoplus2.c | 2 +-
=C2=A0hw/arm/orangepi.c=C2=A0 =C2=A0 =C2=A0 | 2 +-
=C2=A0hw/arm/stellaris.c=C2=A0 =C2=A0 =C2=A0| 4 ++--
=C2=A06 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)

=C2=A0static void canon_a1100_machine_init(MachineClass *mc)
=C2=A0{
-=C2=A0 =C2=A0 mc->desc =3D "Canon PowerShot A1100 IS";
+=C2=A0 =C2=A0 mc->desc =3D "Canon PowerShot A1100 IS (ARM946)"= ;;
=C2=A0 =C2=A0 =C2=A0mc->init =3D &canon_a1100_init;
=C2=A0 =C2=A0 =C2=A0mc->ignore_memory_transaction_failures =3D true;
=C2=A0 =C2=A0 =C2=A0mc->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)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0MachineClass *mc =3D MACHINE_CLASS(oc);

-=C2=A0 =C2=A0 mc->desc =3D "BBC micro:bit";
+=C2=A0 =C2=A0 mc->desc =3D "BBC micro:bit (Cortex-M0)";
=C2=A0 =C2=A0 =C2=A0mc->init =3D microbit_init;
=C2=A0 =C2=A0 =C2=A0mc->max_cpus =3D 1;
=C2=A0}
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)

=C2=A0static void netduino2_machine_init(MachineClass *mc)
=C2=A0{
-=C2=A0 =C2=A0 mc->desc =3D "Netduino 2 Machine";
+=C2=A0 =C2=A0 mc->desc =3D "Netduino 2 Machine (Cortex-M3)";<= br> =C2=A0 =C2=A0 =C2=A0mc->init =3D netduino2_init;
=C2=A0 =C2=A0 =C2=A0mc->ignore_memory_transaction_failures =3D true;
=C2=A0}
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)

=C2=A0static void netduinoplus2_machine_init(MachineClass *mc)
=C2=A0{
-=C2=A0 =C2=A0 mc->desc =3D "Netduino Plus 2 Machine";
+=C2=A0 =C2=A0 mc->desc =3D "Netduino Plus 2 Machine (Cortex-M4)&qu= ot;;
=C2=A0 =C2=A0 =C2=A0mc->init =3D netduinoplus2_init;
=C2=A0}

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)

=C2=A0static void orangepi_machine_init(MachineClass *mc)
=C2=A0{
-=C2=A0 =C2=A0 mc->desc =3D "Orange Pi PC";
+=C2=A0 =C2=A0 mc->desc =3D "Orange Pi PC (Cortex-A7)";
=C2=A0 =C2=A0 =C2=A0mc->init =3D orangepi_init;
=C2=A0 =C2=A0 =C2=A0mc->block_default_type =3D IF_SD;
=C2=A0 =C2=A0 =C2=A0mc->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, vo= id *data)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0MachineClass *mc =3D MACHINE_CLASS(oc);

-=C2=A0 =C2=A0 mc->desc =3D "Stellaris LM3S811EVB";
+=C2=A0 =C2=A0 mc->desc =3D "Stellaris LM3S811EVB (Cortex-M3)"= ;
=C2=A0 =C2=A0 =C2=A0mc->init =3D lm3s811evb_init;
=C2=A0 =C2=A0 =C2=A0mc->ignore_memory_transaction_failures =3D true;
=C2=A0 =C2=A0 =C2=A0mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("cor= tex-m3");
@@ -1554,7 +1554,7 @@ static void lm3s6965evb_class_init(ObjectClass *oc, v= oid *data)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0MachineClass *mc =3D MACHINE_CLASS(oc);

-=C2=A0 =C2=A0 mc->desc =3D "Stellaris LM3S6965EVB";
+=C2=A0 =C2=A0 mc->desc =3D "Stellaris LM3S6965EVB (Cortex-M3)"= ;;
=C2=A0 =C2=A0 =C2=A0mc->init =3D lm3s6965evb_init;
=C2=A0 =C2=A0 =C2=A0mc->ignore_memory_transaction_failures =3D true;
=C2=A0 =C2=A0 =C2=A0mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("cor= tex-m3");
--
2.26.2

--0000000000008a00b405ba39431a--