qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Thomas Huth" <thuth@redhat.com>,
	qemu-block@nongnu.org, "Andrew Jones" <drjones@redhat.com>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	qemu-arm@nongnu.org,
	"Alistair Francis" <alistair.francis@wdc.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"John Snow" <jsnow@redhat.com>
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	[thread overview]
Message-ID: <20210205144345.2068758-8-f4bug@amsat.org> (raw)
In-Reply-To: <20210205144345.2068758-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)

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



  parent reply	other threads:[~2021-02-05 14:50 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-05 14:43 [PATCH 0/9] hw/arm/virt: Improve CPU help and fix testing under KVM Philippe Mathieu-Daudé
2021-02-05 14:43 ` [PATCH 1/9] tests/qtest/arm-cpu-features: Remove Cortex-A15 check Philippe Mathieu-Daudé
2021-02-05 14:59   ` Andrew Jones
2021-02-05 15:15     ` Philippe Mathieu-Daudé
2021-02-05 15:33       ` Andrew Jones
2021-02-05 16:03         ` Philippe Mathieu-Daudé
2021-02-06 10:40           ` Andrew Jones
2021-02-08 14:22             ` John Snow
2021-02-05 14:43 ` [PATCH 2/9] tests/qtest: Restrict xlnx-can-test to TCG builds Philippe Mathieu-Daudé
2021-02-05 16:53   ` Alistair Francis
2021-02-05 16:57   ` Peter Maydell
2021-02-05 17:20     ` Philippe Mathieu-Daudé
2021-02-05 14:43 ` [PATCH 3/9] tests/qtest/boot-serial-test: Test Virt machine with 'max' Philippe Mathieu-Daudé
2021-02-05 15:02   ` Andrew Jones
2021-02-05 14:43 ` [PATCH 4/9] tests/qtest/cdrom-test: Only allow the Virt machine under KVM Philippe Mathieu-Daudé
2021-02-05 15:08   ` Andrew Jones
2021-02-05 15:15     ` Peter Maydell
2021-02-05 15:19     ` Philippe Mathieu-Daudé
2021-02-05 14:43 ` [PATCH 5/9] hw/arm/virt: Improve CPU name in help message Philippe Mathieu-Daudé
2021-02-05 14:58   ` Philippe Mathieu-Daudé
2021-02-05 15:09   ` Andrew Jones
2021-02-05 14:43 ` [PATCH 6/9] hw/arm/virt: Display list of valid CPUs for the Virt machine Philippe Mathieu-Daudé
2021-02-05 15:12   ` Andrew Jones
2021-02-05 15:27     ` Philippe Mathieu-Daudé
2021-02-05 14:43 ` Philippe Mathieu-Daudé [this message]
2021-02-05 15:14   ` [PATCH 7/9] hw/arm/virt: Do not include 64-bit CPUs in 32-bit build Andrew Jones
2021-02-05 14:43 ` [PATCH 8/9] hw/arm/virt: Restrict 32-bit CPUs to TCG Philippe Mathieu-Daudé
2021-02-05 15:19   ` Andrew Jones
2021-03-04 11:31     ` Claudio Fontana
2021-03-04 11:40   ` Peter Maydell
2021-02-05 14:43 ` [RFC PATCH 9/9] tests/qtest/arm-cpu-features: Restrict TCG-only tests Philippe Mathieu-Daudé
2021-02-05 15:20   ` Claudio Fontana
2021-02-05 15:30     ` Philippe Mathieu-Daudé
2021-02-05 15:44       ` Claudio Fontana
2021-02-05 15:27   ` Andrew Jones
2021-02-05 15:31 ` [PATCH 0/9] hw/arm/virt: Improve CPU help and fix testing under KVM Philippe Mathieu-Daudé
2021-03-04 11:13 ` Claudio Fontana

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=20210205144345.2068758-8-f4bug@amsat.org \
    --to=f4bug@amsat.org \
    --cc=alistair.francis@wdc.com \
    --cc=drjones@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).