Message ID | 20210131105918.228787-8-f4bug@amsat.org |
---|---|
State | New |
Headers | show |
Series | hw/arm: Misc trivial fixes/cleanups | expand |
On Sun, Jan 31, 2021 at 3:08 AM Philippe Mathieu-Daudé <f4bug@amsat.org> 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é <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> 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 = "Canon PowerShot A1100 IS"; > + mc->desc = "Canon PowerShot A1100 IS (ARM946)"; > mc->init = &canon_a1100_init; > mc->ignore_memory_transaction_failures = true; > mc->default_ram_size = 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 = MACHINE_CLASS(oc); > > - mc->desc = "BBC micro:bit"; > + mc->desc = "BBC micro:bit (Cortex-M0)"; > mc->init = microbit_init; > mc->max_cpus = 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 = "Netduino 2 Machine"; > + mc->desc = "Netduino 2 Machine (Cortex-M3)"; > mc->init = netduino2_init; > mc->ignore_memory_transaction_failures = 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 = "Netduino Plus 2 Machine"; > + mc->desc = "Netduino Plus 2 Machine (Cortex-M4)"; > mc->init = 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 = "Orange Pi PC"; > + mc->desc = "Orange Pi PC (Cortex-A7)"; > mc->init = orangepi_init; > mc->block_default_type = IF_SD; > mc->units_per_default_bus = 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 = MACHINE_CLASS(oc); > > - mc->desc = "Stellaris LM3S811EVB"; > + mc->desc = "Stellaris LM3S811EVB (Cortex-M3)"; > mc->init = lm3s811evb_init; > mc->ignore_memory_transaction_failures = true; > mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3"); > @@ -1554,7 +1554,7 @@ static void lm3s6965evb_class_init(ObjectClass *oc, void *data) > { > MachineClass *mc = MACHINE_CLASS(oc); > > - mc->desc = "Stellaris LM3S6965EVB"; > + mc->desc = "Stellaris LM3S6965EVB (Cortex-M3)"; > mc->init = lm3s6965evb_init; > mc->ignore_memory_transaction_failures = true; > mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3"); > -- > 2.26.2 > >
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 = "Canon PowerShot A1100 IS"; + mc->desc = "Canon PowerShot A1100 IS (ARM946)"; mc->init = &canon_a1100_init; mc->ignore_memory_transaction_failures = true; mc->default_ram_size = 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 = MACHINE_CLASS(oc); - mc->desc = "BBC micro:bit"; + mc->desc = "BBC micro:bit (Cortex-M0)"; mc->init = microbit_init; mc->max_cpus = 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 = "Netduino 2 Machine"; + mc->desc = "Netduino 2 Machine (Cortex-M3)"; mc->init = netduino2_init; mc->ignore_memory_transaction_failures = 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 = "Netduino Plus 2 Machine"; + mc->desc = "Netduino Plus 2 Machine (Cortex-M4)"; mc->init = 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 = "Orange Pi PC"; + mc->desc = "Orange Pi PC (Cortex-A7)"; mc->init = orangepi_init; mc->block_default_type = IF_SD; mc->units_per_default_bus = 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 = MACHINE_CLASS(oc); - mc->desc = "Stellaris LM3S811EVB"; + mc->desc = "Stellaris LM3S811EVB (Cortex-M3)"; mc->init = lm3s811evb_init; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3"); @@ -1554,7 +1554,7 @@ static void lm3s6965evb_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); - mc->desc = "Stellaris LM3S6965EVB"; + mc->desc = "Stellaris LM3S6965EVB (Cortex-M3)"; mc->init = lm3s6965evb_init; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3");
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é <f4bug@amsat.org> --- 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(-)