| Message ID | 20210205144345.2068758-6-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/arm/virt: Improve CPU help and fix testing under KVM | expand |
On 2/5/21 3:43 PM, Philippe Mathieu-Daudé wrote: > When selecting an incorrect CPU, there is a mismatch between the > CPU name provided and the one displayed (which is some QEMU internal > name): > > $ qemu-system-aarch64 -M virt -cpu cortex-a8 > qemu-system-aarch64: mach-virt: CPU type cortex-a8-arm-cpu not supported > > Strip the suffix to display the correct CPU name: > > $ qemu-system-aarch64 -M virt -cpu cortex-a8 > qemu-system-aarch64: mach-virt: CPU type cortex-a8-arm Grrr wrong paste. Should be: qemu-system-aarch64: mach-virt: CPU type cortex-a8 not supported > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/arm/virt.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 399da734548..7802d3a66e8 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1829,7 +1829,10 @@ static void machvirt_init(MachineState *machine) > finalize_gic_version(vms); > > if (!cpu_type_valid(machine->cpu_type)) { > - error_report("mach-virt: CPU type %s not supported", machine->cpu_type); > + int len = strlen(machine->cpu_type) - strlen(ARM_CPU_TYPE_SUFFIX); > + > + error_report("mach-virt: CPU type %.*s not supported", > + len, machine->cpu_type); > exit(1); > } > >
On Fri, Feb 05, 2021 at 03:43:41PM +0100, Philippe Mathieu-Daudé wrote: > When selecting an incorrect CPU, there is a mismatch between the > CPU name provided and the one displayed (which is some QEMU internal > name): > > $ qemu-system-aarch64 -M virt -cpu cortex-a8 > qemu-system-aarch64: mach-virt: CPU type cortex-a8-arm-cpu not supported > > Strip the suffix to display the correct CPU name: > > $ qemu-system-aarch64 -M virt -cpu cortex-a8 > qemu-system-aarch64: mach-virt: CPU type cortex-a8-arm > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/arm/virt.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 399da734548..7802d3a66e8 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1829,7 +1829,10 @@ static void machvirt_init(MachineState *machine) > finalize_gic_version(vms); > > if (!cpu_type_valid(machine->cpu_type)) { > - error_report("mach-virt: CPU type %s not supported", machine->cpu_type); > + int len = strlen(machine->cpu_type) - strlen(ARM_CPU_TYPE_SUFFIX); > + > + error_report("mach-virt: CPU type %.*s not supported", > + len, machine->cpu_type); > exit(1); > } > > -- > 2.26.2 > Reviewed-by: Andrew Jones <drjones@redhat.com>
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 399da734548..7802d3a66e8 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1829,7 +1829,10 @@ static void machvirt_init(MachineState *machine) finalize_gic_version(vms); if (!cpu_type_valid(machine->cpu_type)) { - error_report("mach-virt: CPU type %s not supported", machine->cpu_type); + int len = strlen(machine->cpu_type) - strlen(ARM_CPU_TYPE_SUFFIX); + + error_report("mach-virt: CPU type %.*s not supported", + len, machine->cpu_type); exit(1); }
When selecting an incorrect CPU, there is a mismatch between the CPU name provided and the one displayed (which is some QEMU internal name): $ qemu-system-aarch64 -M virt -cpu cortex-a8 qemu-system-aarch64: mach-virt: CPU type cortex-a8-arm-cpu not supported Strip the suffix to display the correct CPU name: $ qemu-system-aarch64 -M virt -cpu cortex-a8 qemu-system-aarch64: mach-virt: CPU type cortex-a8-arm Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/arm/virt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)