All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	qemu-trivial@nongnu.org,
	"Alistair Francis" <alistair@alistair23.me>,
	"Michael Tokarev" <mjt@tls.msk.ru>,
	"Laurent Vivier" <laurent@vivier.eu>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Niek Linnenbank" <nieklinnenbank@gmail.com>,
	qemu-arm@nongnu.org, "Antony Pavlov" <antonynpavlov@gmail.com>,
	"Joel Stanley" <joel@jms.id.au>
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	[thread overview]
Message-ID: <20210131105918.228787-5-f4bug@amsat.org> (raw)
In-Reply-To: <20210131105918.228787-1-f4bug@amsat.org>

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



  parent reply	other threads:[~2021-01-31 11:10 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20210131105918.228787-1-f4bug@amsat.org>
2021-01-31 10:59 ` [PATCH v2 3/7] hw/arm/xlnx-versal: Versal SoC requires ZDMA Philippe Mathieu-Daudé
2021-02-01 15:17   ` Alistair Francis
2021-01-31 10:59 ` Philippe Mathieu-Daudé [this message]
2021-02-01 15:29   ` [PATCH v2 4/7] hw/arm/virt: Do not include 64-bit CPUs in 32-bit build Alistair Francis
2021-01-31 10:59 ` [PATCH v2 7/7] hw/arm: Display CPU type in machine description Philippe Mathieu-Daudé
2021-02-01 15:17   ` Alistair Francis
     [not found] ` <20210131105918.228787-7-f4bug@amsat.org>
     [not found]   ` <5cb160b9-f9a4-05af-9a94-ade51bf4beb7@amsat.org>
2021-01-31 15:30     ` [PATCH v2 6/7] hw/arm/xlnx-zcu102: Restrict ZynqMP ZCU102 board to 64-bit build Philippe Mathieu-Daudé
     [not found] ` <20210131105918.228787-6-f4bug@amsat.org>
     [not found]   ` <a741601e-8ad5-99ad-decf-14dc007900b8@amsat.org>
2021-01-31 15:31     ` [PATCH v2 5/7] hw/arm/sbsa-ref: Restrict SBSA-ref " Philippe Mathieu-Daudé
     [not found] ` <20210131105918.228787-2-f4bug@amsat.org>
2021-02-01 15:16   ` [PATCH v2 1/7] hw/arm/stm32f405_soc: Add missing dependency on OR_IRQ Alistair Francis

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210131105918.228787-5-f4bug@amsat.org \
    --to=f4bug@amsat.org \
    --cc=alistair@alistair23.me \
    --cc=antonynpavlov@gmail.com \
    --cc=joel@jms.id.au \
    --cc=laurent@vivier.eu \
    --cc=mjt@tls.msk.ru \
    --cc=nieklinnenbank@gmail.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.