| Message ID | 20210131105918.228787-5-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
On Sun, Jan 31, 2021 at 3:09 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > > Similarly to commit 210f47840dd, remove 64-bit CPUs (which have > never been available on 32-bit build, see commit d14d42f19bf), > to fix: > > $ make check-qtest-arm > ... > Running test qtest-arm/device-introspect-test > missing object type 'cortex-a53-arm-cpu' > Broken pipe > ../tests/qtest/libqtest.c:181: kill_qemu() detected QEMU death from signal 6 (Aborted) (core dumped) > ERROR qtest-arm/device-introspect-test - too few tests run (expected 6, got 5) > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/arm/virt.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 399da734548..f0e9d7dd7d8 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -199,9 +199,11 @@ static const int a15irqmap[] = { > static const char *valid_cpus[] = { > ARM_CPU_TYPE_NAME("cortex-a7"), > ARM_CPU_TYPE_NAME("cortex-a15"), > +#ifdef TARGET_AARCH64 > ARM_CPU_TYPE_NAME("cortex-a53"), > ARM_CPU_TYPE_NAME("cortex-a57"), > ARM_CPU_TYPE_NAME("cortex-a72"), > +#endif /* TARGET_AARCH64 */ > ARM_CPU_TYPE_NAME("host"), > ARM_CPU_TYPE_NAME("max"), > }; > -- > 2.26.2 > >
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 399da734548..f0e9d7dd7d8 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -199,9 +199,11 @@ static const int a15irqmap[] = { static const char *valid_cpus[] = { ARM_CPU_TYPE_NAME("cortex-a7"), ARM_CPU_TYPE_NAME("cortex-a15"), +#ifdef TARGET_AARCH64 ARM_CPU_TYPE_NAME("cortex-a53"), ARM_CPU_TYPE_NAME("cortex-a57"), ARM_CPU_TYPE_NAME("cortex-a72"), +#endif /* TARGET_AARCH64 */ ARM_CPU_TYPE_NAME("host"), ARM_CPU_TYPE_NAME("max"), };
Similarly to commit 210f47840dd, remove 64-bit CPUs (which have never been available on 32-bit build, see commit d14d42f19bf), to fix: $ make check-qtest-arm ... Running test qtest-arm/device-introspect-test missing object type 'cortex-a53-arm-cpu' Broken pipe ../tests/qtest/libqtest.c:181: kill_qemu() detected QEMU death from signal 6 (Aborted) (core dumped) ERROR qtest-arm/device-introspect-test - too few tests run (expected 6, got 5) Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/arm/virt.c | 2 ++ 1 file changed, 2 insertions(+)