From nobody Tue Nov 18 19:49:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1611971739; cv=none; d=zohomail.com; s=zohoarc; b=YdFAfClxHB6HpZXljyxDye9qZKQk9IVq1JkOmK7o/3PeJTMvtEOh+k8ntuS+KlGbMR1I8CWXRZViB6KypEGxf3IVH99tjiLHle9HGQpjXwbmNI+WsG5vKA4meqlDJPzaSg3RGOmE9eP5VfLcnx7gbNka+AgZdHDLdbMvMLMnJc0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611971739; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZTEQksi03h84QrtUmTk444gEe+iL7OPLaC2gCq3Rbc4=; b=VAhPwxAO46PbmFRqKe7NvODhxFqohGeWxtn/C7V/mT7qBNvrgvj5LQBkC24RMCCnPKI7W3tkgOIy73mrJ1sU/QHHHMTbO3kfhDh91I1e7vUyC8HibstBhOQtMRrx5XDDFwKlMlqul3Re1ERHKLqkF7DNKIKXEoSFt+tJo6lch8M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1611971739270640.8579392064207; Fri, 29 Jan 2021 17:55:39 -0800 (PST) Received: by mail-wr1-f45.google.com with SMTP id d16so10588174wro.11 for ; Fri, 29 Jan 2021 17:55:38 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id f17sm15861336wrv.0.2021.01.29.17.55.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jan 2021 17:55:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZTEQksi03h84QrtUmTk444gEe+iL7OPLaC2gCq3Rbc4=; b=WgnMZojyiZx5lKB4qw0pSqL5QpZH65Z4MwQDqUMZM2RWGZuS8sMWrtFuGc1fN3KRJg sNkeEjdUsh/SrkrIgOvXF4INgjLmXB6aIjAoKfGSOSocLcCT57BSyM2BLnE6BkEttZ1j jP8CNfcpWinztNrSi0CKiCxb/ct6hX19JL4vBWUTf8e36Nl8sfbSmCP4blkpXvreGBw7 w+A9hoe9ITYRaKwq+L0LHmSsvGdRFirk3gMT6R0PjZnZNVrw7npmu5W9pMUysT6OOqLp W7vswo4+kYSe+RX9bjPERa1OgmGGmJiH7vvLS1uzCX6/o9/LB9qpA8I7Gjpz6CpTk5XP UD5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ZTEQksi03h84QrtUmTk444gEe+iL7OPLaC2gCq3Rbc4=; b=e79CchKkC12pf16zzgn7k3D/pltrJGj2swENP7ly65b+O9xCnJNepsLfSWYpLMK6TA vs/48Vax55232xdgk+CYwNifhWds3SmQ2Zcn0XJYJokFZDmvUQNKRVH6DEswu5larOiB VgAz5DMlJkbla0VQEJuJRYl5664unBJzH1KYMb6fvqVstYV0K1N0XuxjnpbtbPqvrOX9 cLIz/FRZzdN8zPJrxA67FAh+rri16GgKSMJFvKh70VnshTaDmlbR69c4zJYHS9ZO2EbN 8rPTjbv6ce9lR0RoeTLvWjLH42AFy6FAurJ8jFJrcdGFb9pYhztKmhFr+JBwxqB/bA8b NLuQ== X-Gm-Message-State: AOAM533wjsGi6q6B8EiJVXgtfsYb1NSTYTSIDsGDIAfhUDar+XIDAoPL aMf33QIzav+uRS6QRqjQrGM= X-Google-Smtp-Source: ABdhPJwNDKiEtCsNKC4h5nbi85ikz6c+r19mxOIwcAsv4JOWkdlDVH6LMJvnFFPqPNw2qIfTu4RMrQ== X-Received: by 2002:adf:8464:: with SMTP id 91mr7164004wrf.188.1611971737537; Fri, 29 Jan 2021 17:55:37 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Joel Stanley , qemu-trivial@nongnu.org, Laurent Vivier , Peter Maydell , Antony Pavlov , Alistair Francis , Michael Tokarev , Niek Linnenbank , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/3] hw/arm: Display CPU type in machine description Date: Sat, 30 Jan 2021 02:55:19 +0100 Message-Id: <20210130015519.4072469-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210130015519.4072469-1-f4bug@amsat.org> References: <20210130015519.4072469-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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) =20 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); =20 - 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) =20 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) =20 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; } =20 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) =20 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, vo= id *data) { MachineClass *mc =3D MACHINE_CLASS(oc); =20 - 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, v= oid *data) { MachineClass *mc =3D MACHINE_CLASS(oc); =20 - 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"); --=20 2.26.2