[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/9] hw/arm/virt: Do not include 64-bit CPUs in 32-bit build
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 7/9] hw/arm/virt: Do not include 64-bit CPUs in 32-bit build |
Date: |
Fri, 5 Feb 2021 15:43:43 +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)
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
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 6ffe091804f..f5e4a6ec914 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 4/9] tests/qtest/cdrom-test: Only allow the Virt machine under KVM, (continued)
- [PATCH 4/9] tests/qtest/cdrom-test: Only allow the Virt machine under KVM, Philippe Mathieu-Daudé, 2021/02/05
- [PATCH 5/9] hw/arm/virt: Improve CPU name in help message, Philippe Mathieu-Daudé, 2021/02/05
- [PATCH 6/9] hw/arm/virt: Display list of valid CPUs for the Virt machine, Philippe Mathieu-Daudé, 2021/02/05
- [PATCH 7/9] hw/arm/virt: Do not include 64-bit CPUs in 32-bit build,
Philippe Mathieu-Daudé <=
- [PATCH 8/9] hw/arm/virt: Restrict 32-bit CPUs to TCG, Philippe Mathieu-Daudé, 2021/02/05
- [RFC PATCH 9/9] tests/qtest/arm-cpu-features: Restrict TCG-only tests, Philippe Mathieu-Daudé, 2021/02/05
- Re: [RFC PATCH 9/9] tests/qtest/arm-cpu-features: Restrict TCG-only tests, Andrew Jones, 2021/02/05
- Re: [PATCH 0/9] hw/arm/virt: Improve CPU help and fix testing under KVM, Philippe Mathieu-Daudé, 2021/02/05