[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 4/7] hw/arm/virt: Do not include 64-bit CPUs in 32-bit build
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 4/7] hw/arm/virt: Do not include 64-bit CPUs in 32-bit build |
Date: |
Sun, 31 Jan 2021 11:59:15 +0100 |
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(+)
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
- [PATCH v2 0/7] hw/arm: Misc trivial fixes/cleanups, Philippe Mathieu-Daudé, 2021/01/31
- [PATCH v2 1/7] hw/arm/stm32f405_soc: Add missing dependency on OR_IRQ, Philippe Mathieu-Daudé, 2021/01/31
- [PATCH v2 2/7] hw/arm/exynos4210: Add missing dependency on OR_IRQ, Philippe Mathieu-Daudé, 2021/01/31
- [PATCH v2 3/7] hw/arm/xlnx-versal: Versal SoC requires ZDMA, Philippe Mathieu-Daudé, 2021/01/31
- [PATCH v2 4/7] hw/arm/virt: Do not include 64-bit CPUs in 32-bit build,
Philippe Mathieu-Daudé <=
- [PATCH v2 5/7] hw/arm/sbsa-ref: Restrict SBSA-ref board to 64-bit build, Philippe Mathieu-Daudé, 2021/01/31
- [PATCH v2 6/7] hw/arm/xlnx-zcu102: Restrict ZynqMP ZCU102 board to 64-bit build, Philippe Mathieu-Daudé, 2021/01/31
- [PATCH v2 7/7] hw/arm: Display CPU type in machine description, Philippe Mathieu-Daudé, 2021/01/31